phpwiki-talk

Re: [Phpwiki-talk] Separating create and destroy SQL

[Reini U. <ru...@x-...>]

Dan Frankowski schrieb:
> Reini Urban wrote:
>> More opinions on the sql separation into
>> <backend>-initialize.sql and <backend>-destroy.sql?
>>
>> looks fine to me. almost no costs and quite useful.
>> on the hand the separation is not used anywhere else,
>> and this might have a good reason.
> 
> Reini,
> Since you are to be gone and it's been a week with no reply, I will 
> assume I can make these changes. Thanks.

ok from me.
-- 
Reini Urban
http://xarch.tu-graz.ac.at/home/rurban/

[Phpwiki-talk] Can't get email notification for a page with / in its name

[Dan F. <dfr...@cs...>]

I filed the following bug at SourceForge:

http://sourceforge.net/tracker/index.php?func=detail&aid=994994&group_id=6121&atid=106121

"Can't get email notification for a page with / in its name"

I have a workaround: don't ask for such notifications.

Dan

One of my users registered to get page notifications
for "MovieLens/SearchProblems" and this caused the wiki
to be uneditable for anyone using IE 6 !!

When any user edited any page,

- in Firefox it would show:

lib/stdlib.php:1137: Warning[2]: Unknown modifier 'a'

- in IE 6.0 it would show an error saying (essentially)
"can't apply XSL to this XML"

I removed that page notification from the user's
preferences, and the problem went away.

Here is a stack trace:


/export/scratch/apache/htdocs/grplens/foo/phpwiki/lib/WikiDB.php:772:glob_match
/export/scratch/apache/htdocs/grplens/foo/phpwiki/lib/editpage.php:281:save
/export/scratch/apache/htdocs/grplens/foo/phpwiki/lib/editpage.php:91:savepage
/export/scratch/apache/htdocs/grplens/foo/phpwiki/lib/main.php:747:editpage
/export/scratch/apache/htdocs/grplens/foo/phpwiki/lib/main.php:488:action_edit
/export/scratch/apache/htdocs/grplens/foo/phpwiki/lib/main.php:932:handleaction
/export/scratch/apache/htdocs/grplens/foo/phpwiki/lib/main.php:940:main
/export/scratch/apache/htdocs/grplens/foo/phpwiki/index.php:972:include

This turned out to be in this function in stdlib.php:

function glob_match ($glob, $against, $case_sensitive =
true) {
return preg_match('/' . glob_to_pcre($glob) .
($case_sensitive ? '/' : '/i'\
), $against);
}

with these parameters:

glob MovieLens/SearchProblems against SandBox
case_sensitive 1

You can see that this function is probably not /-safe.

Re: [Phpwiki-talk] "Cannot instantiate non-existent class" error

[David C. <unc...@un...>]

On Jul 20, 2004, at 8:51 AM, David Catmull wrote:
> Thanks, that took care of that error.. but now I get this one:
> Fatal error: Failed opening required 'DB.php' (include_path='') in  
> /home/groups/v/vo/volleyserver/htdocs/wiki/lib/WikiDB/backend/ 
> PearDB.php on line 7

I also get this error instead sometimes, seemingly at random:

Fatal error: Call to undefined function: quote() in  
/home/groups/v/vo/volleyserver/htdocs/wiki/lib/DB_Session.php on line  
150

Fatal error: Call to undefined function: quote() in  
/home/groups/v/vo/volleyserver/htdocs/wiki/lib/DB_Session.php on line  
184

-- 
David Catmull
unc...@un...
http://www.uncommonplace.com/

Re: [Phpwiki-talk] Where to Document New Plugins?

[Arthaey A. <ar...@gm...>]

Mitch Aunger wrote:
> Hi... visited your Wiki - really like the 'skin' you've made for it...
> any plans to add that to the PHPWiki themes? I don't think i've ever
> seen it as an option... if not, sure would like to know how you made it
> (css?)

It's just Crao with the grays colorized to light blue-grays. The
modification is only in the css file. When I'm done tweaking
everything, I probably will add the theme somewhere official. :)

> my wiki is based on the Worldpress theme because i think it
> is nicer looking than all the other skins and I really use the sidebar
> that it has (which yours doesn't but I like the look of yours :)

Crao's bottom toolbar that floats and therefore is always available is
a large reason why I chose it to start my theme from. Similar idea to
a sidebar, just at the bottom instead of the side.

> Anyway - looks great! :)

Thanks! :)


-- 
AA

Re: [Phpwiki-talk] Where to Document New Plugins?

[Arthaey A. <ar...@gm...>]

Reini Urban wrote:
> phpwiki is open for discussion. You don't need permission from the
> mailinglist.

Great. And I suppose you can always admin-remove pages you really
don't think belong. I'll add the description to PhpWiki once we agree
on a name for the plugin.

> Just the name is not really clear to me.
> Maybe you like "LinguisticExplanation" or "LinguisticBreakdown" better?

Well, the linguistic term for it *is* interlinear... I googled for the
term to see what came up, but no sites called this kind of
presentation of sentences anything of than an interlinear
representation. Would "InterlinearTranslation" or "InterlinearText" be
clearer to non-linguists?

I've added a "linguistic-terms" boolean argument to the plugin, which
will give you non-technical terms for each line of the interlinear
when turned off. However, the options have been giving me trouble a
bit, not setting when it seems like they should. Are all name=value
pairs on the first line of the plugin automatically parsed?


--
AA

Re: [Phpwiki-talk] "Cannot instantiate non-existent class" error

[David C. <unc...@un...>]

On Jul 20, 2004, at 2:04 AM, Reini Urban wrote:
> SQL must be in uppercase.

Thanks, that took care of that error.. but now I get this one:
Fatal error: Failed opening required 'DB.php' (include_path='') in  
/home/groups/v/vo/volleyserver/htdocs/wiki/lib/WikiDB/backend/ 
PearDB.php on line 7

-- 
David Catmull
unc...@un...
http://www.uncommonplace.com/

Re: [Phpwiki-talk] 10 days absence

[Dan F. <dfr...@cs...>]

John Cole wrote:

>Reini,
>  Is there a doc somewhere that describes how to run the unit tests?  I'd be
>interested in trying to run them on my test machines.
>
>Thanks,
>
>John Cole
>  
>

John,

tests/unit/readme.html.

However, I must say I have not been able to run the tests completely 
successfully since Reini got his hands on them. :-) Seriously, I think 
he added some tests which fail for me. HOWEVER, it is possible that they 
are failing because of bugs he wishes to fix, so they may be working as 
designed.

Dan

>-----Original Message-----
>From: php...@li...
>[mailto:php...@li...]On Behalf Of Reini
>Urban
>Sent: Tuesday, July 20, 2004 3:10 AM
>To: php...@li...
>Subject: [Phpwiki-talk] 10 days absence
>
>
>Hi
> From 22.July to 1.August I'll be in Poland (Czieszyn), and will not be 
>able to react on any support request.
>
>Known problems:
>* unit tests: The current CVS version still crashes on certain special 
>operations, loading some old markup pages with dba and mysql.
>
>* mysql still uses far too much memory on 8M memory-limit systems.
>A pear system destructor hash was fixed recently (culprit #1), but there 
>must be more references to huge objects on page iterations around, which 
>prevent them from being garbage collected.
>
>Cheers,
>  
>

RE: [Phpwiki-talk] 10 days absence

[John C. <joh...@ua...>]

Reini,
  Is there a doc somewhere that describes how to run the unit tests?  I'd be
interested in trying to run them on my test machines.

Thanks,

John Cole

-----Original Message-----
From: php...@li...
[mailto:php...@li...]On Behalf Of Reini
Urban
Sent: Tuesday, July 20, 2004 3:10 AM
To: php...@li...
Subject: [Phpwiki-talk] 10 days absence


Hi
 From 22.July to 1.August I'll be in Poland (Czieszyn), and will not be 
able to react on any support request.

Known problems:
* unit tests: The current CVS version still crashes on certain special 
operations, loading some old markup pages with dba and mysql.

* mysql still uses far too much memory on 8M memory-limit systems.
A pear system destructor hash was fixed recently (culprit #1), but there 
must be more references to huge objects on page iterations around, which 
prevent them from being garbage collected.

Cheers,
-- 
Reini Urban
http://xarch.tu-graz.ac.at/home/rurban/




-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click
_______________________________________________
Phpwiki-talk mailing list
Php...@li...
https://lists.sourceforge.net/lists/listinfo/phpwiki-talk

-------------------------------------
This email and any files transmitted with it are confidential and intended solely for the use of the individual or entity to whom they are addressed. If you have received this email in error please notify the system manager. This message contains confidential information and is intended only for the individual named. If you are not the named addressee you should not disseminate, distribute or copy this e-mail.

[Phpwiki-talk] Add TransformTextPre ?

[Dan F. <dfr...@cs...>]

Reini,

For some of our work, I found the desire to grab the parse tree from 
BlockParser. This, I added a function TransformTextPre() that will give 
me the parse tree.

I submitted a patch 
(https://sourceforge.net/tracker/index.php?func=detail&aid=994487&group_id=6121&atid=306121), 
also shown below. I'd be happy to apply it if you approve.

Dan


This patch adds a function called TransformTextPre()
which returns a parse tree, suitable for climbing
around in.

diff -b -u -r1.1.1.2 BlockParser.php
--- BlockParser.php 14 Apr 2004 21:22:31 -0000
1.1.1.2
+++ BlockParser.php 20 Jul 2004 13:11:31 -0000
@@ -1013,7 +1013,10 @@
////////////////////////////////////////////////////////////////
//

-function TransformText ($text, $markup = 2.0,
$basepage=false) {
+/*
+ * Transform the text of a page, and return a parse tree.
+ */
+function TransformTextPre ($text, $markup = 2.0,
$basepage=false) {
if (isa($text, 'WikiDB_PageRevision')) {
$rev = $text;
$text = $rev->getPackedContent();
@@ -1035,6 +1038,16 @@
if (0 && DEBUG && check_php_version(5)) {
echo "<pre>"; var_dump($output); echo "</pre>";
}
+
+ return $output;
+}
+
+/*
+ * Transform the text of a page, and return an XmlContent,
+ * suitable for printXml()-ing.
+ */
+function TransformText ($text, $markup = 2.0,
$basepage=false) {
+ $output = TransformTextPre($text, $markup, $basepage);

if ($basepage) {
// This is for immediate consumption.

Re: [Phpwiki-talk] Separating create and destroy SQL

[Dan F. <dfr...@cs...>]

Reini Urban wrote:

> More opinions on the sql separation into
> <backend>-initialize.sql and <backend>-destroy.sql?
>
> looks fine to me. almost no costs and quite useful.
> on the hand the separation is not used anywhere else,
> and this might have a good reason.


Reini,

Since you are to be gone and it's been a week with no reply, I will 
assume I can make these changes. Thanks.

Dan

>
> Dan Frankowski schrieb:
>
>> A user of mine accidentally blew away his Wiki, and was sad. Long 
>> story, but suffice it to say that
>>
>> mysql -u user -D db -p password < mysql.sql
>
>
> no space after the -u and -p options!!!
>
>> doesn't apply mysql.sql to the "db" database, it applies it to the 
>> "password" database!!
>>
>> There are, of course, several safeguards one could take (e.g., don't 
>> have a database called "password"). However, another safeguard would 
>> be to separate the DROP statements and CREATE statements. Then he 
>> would've just applied the CREATE statements, it wouldn't have worked, 
>> and he'd have been puzzled but not sad.
>>
>> Thus, he submitted the attached files for phpwiki/schemas. I hope you 
>> will take these changes. If you do, then also
>>
>> cd phpwiki/schemas
>> rm minisql.sql mysql.sql psql.sql sqlite.sql
>> cvs rm minisql.sql mysql.sql psql.sql sqlite.sql
>> cvs commit minisql.sql mysql.sql psql.sql sqlite.sql
>>
>> Dan
>> ------------------------------------------------------------------------
>> -- $Id: mysql-destroy.sql,v 1.1 2004/07/12 15:24:24 riedl Exp $
>>
>> drop table if exists page;
>> drop table if exists version;
>> drop table if exists recent;
>> drop table if exists nonempty;
>> drop table if exists link;
>> drop table if exists session;
>>
>> -- upgrade from 1.3.7:
>>
>> drop table if exists pref;
>> drop table if exists user;
>> drop table if exists member;
>>
>> -- if you plan to use the wikilens theme
>> drop table if exists rating;
>>
>> ------------------------------------------------------------------------
>> -- $Id: mysql-initialize.sql,v 1.1 2004/07/12 15:24:24 riedl Exp $
>>
>> CREATE TABLE page (
>>     id              INT NOT NULL,
>>         pagename        VARCHAR(100) BINARY NOT NULL,
>>     hits            INT NOT NULL DEFAULT 0,
>>         pagedata        MEDIUMTEXT NOT NULL DEFAULT '',
>>         PRIMARY KEY (id),
>>     UNIQUE KEY (pagename)
>> );
>
> ...

Re: [Phpwiki-talk] Where to Document New Plugins?

[Reini U. <ru...@x-...>]

Arthaey Angosii schrieb:
> Where is the appropriate place to document new/work-in-progress
> plugins? I've written an interlinear plugin for myself, along with a
> documentation page. May I add it to the PhpWiki and tag it as
> CategoryNextWikiR&D? If not, could I at least get feedback through
> this list?

phpwiki is open for discussion. You don't need permission from the 
mailinglist.
   http://www.phpwiki.org/InterlinearPlugin

Add it under CategoryNextWikiSuggestions.
Just the name is not really clear to me.
Maybe you like "LinguisticExplanation" or "LinguisticBreakdown" better?

> Until I have permission to add info about my plugin to the official
> PhpWiki site, I'll be hosting it at my own wiki:
> 
>   http://arthaey.mine.nu:8080/wiki/index.php/InterlinearPlugin
-- 
Reini Urban
http://xarch.tu-graz.ac.at/home/rurban/

[Phpwiki-talk] Where to Document New Plugins?

[Arthaey A. <ar...@gm...>]

Where is the appropriate place to document new/work-in-progress
plugins? I've written an interlinear plugin for myself, along with a
documentation page. May I add it to the PhpWiki and tag it as
CategoryNextWikiR&D? If not, could I at least get feedback through
this list?

Until I have permission to add info about my plugin to the official
PhpWiki site, I'll be hosting it at my own wiki:

  http://arthaey.mine.nu:8080/wiki/index.php/InterlinearPlugin


-- 
AA

[Phpwiki-talk] 10 days absence

[Reini U. <ru...@x-...>]

Hi
 From 22.July to 1.August I'll be in Poland (Czieszyn), and will not be 
able to react on any support request.

Known problems:
* unit tests: The current CVS version still crashes on certain special 
operations, loading some old markup pages with dba and mysql.

* mysql still uses far too much memory on 8M memory-limit systems.
A pear system destructor hash was fixed recently (culprit #1), but there 
must be more references to huge objects on page iterations around, which 
prevent them from being garbage collected.

Cheers,
-- 
Reini Urban
http://xarch.tu-graz.ac.at/home/rurban/

Re: [Phpwiki-talk] "Cannot instantiate non-existent class" error

[Reini U. <ru...@x-...>]

David Catmull schrieb:

> (I just posted this to the support request tracker, before discovering 
> this list)
> 
> I'm getting this error:
> Fatal error: Cannot instantiate non-existent class: wikidb_sql in 
> /home/groups/v/vo/volleyserver/htdocs/wiki/lib/WikiDB.php on line 100
> 
> I installed the latest release (1.3.10) on a SourceForge project site, 
> following the official instructions (which don't mention the config.ini 
> file). At first I thought I had it working, but it kept getting into a 
> loop on the "virgin" initialization page. When I tried to edit a page, I 
> got a warning that the DBA data was being saved to /tmp.
> 
> It's supposed to be using SQL, not DBA, and I discovered that I had not 
> set the DATABASE_TYPE to SQL in config.ini. Once I did that, I started 
> getting the "fatal error" message above. I poked around and found that 
> the WikiDB_SQL class does exist in another file, but apparently that 
> file is not being read for some reason. Any suggestions?

SQL must be in uppercase.

The DATABASE_TYPE is case-sensitive on case-sensitive filesystems, and 
since php5 (case-sensitive class names)
-- 
Reini Urban
http://xarch.tu-graz.ac.at/home/rurban/

Re: [Phpwiki-talk] phpwiki & PHP 5

[Reini U. <ru...@x-...>]

Athon Solo schrieb:
> Has anyone successfully run phpwiki 1.3.10 on php 5.0.0?
> 
> The biggest problem I seem to be having is finding all the damn places 
> that phpwiki messes with the error_reporting level. My php.ini file has 
> it set to E_ERROR, confirmed by a phpinfo() in the phpwiki directory, 
> and I've already commented out the setting in 'lib/main.php', 
> 'lib/prepend.php' and the adodb files tho I don't think they are being 
> used), yet I'm still getting errors about 'lib/FileFinder.php:18: 
> Fatal[2048]: var: Deprecated. Please use the public/private/protected 
> modifiers', which as far as I know, is an E_STRICT level error.
> 
> I have already run the php5-patch.php file.

With the CVS version you don't need to patch it anymore.
It doesn't work out-of-the-box with any php5 version but 5.0.0rc2.
All others must set the E_STRICT bit off in the errorlevel.
-- 
Reini Urban
http://xarch.tu-graz.ac.at/home/rurban/

[Phpwiki-talk] "Cannot instantiate non-existent class" error

[David C. <unc...@un...>]

(I just posted this to the support request tracker, before discovering 
this list)

I'm getting this error:
Fatal error: Cannot instantiate non-existent class: wikidb_sql in 
/home/groups/v/vo/volleyserver/htdocs/wiki/lib/WikiDB.php on line 100

I installed the latest release (1.3.10) on a SourceForge project site, 
following the official instructions (which don't mention the config.ini 
file). At first I thought I had it working, but it kept getting into a 
loop on the "virgin" initialization page. When I tried to edit a page, 
I got a warning that the DBA data was being saved to /tmp.

It's supposed to be using SQL, not DBA, and I discovered that I had not 
set the DATABASE_TYPE to SQL in config.ini. Once I did that, I started 
getting the "fatal error" message above. I poked around and found that 
the WikiDB_SQL class does exist in another file, but apparently that 
file is not being read for some reason. Any suggestions?

Thanks,

-- 
David Catmull
unc...@un...
http://www.uncommonplace.com/

[Phpwiki-talk] phpwiki & PHP 5

[Athon S. <at...@at...>]

Hi all,

Has anyone successfully run phpwiki 1.3.10 on php 5.0.0?

The biggest problem I seem to be having is finding all the damn places 
that phpwiki messes with the error_reporting level. My php.ini file has 
it set to E_ERROR, confirmed by a phpinfo() in the phpwiki directory, 
and I've already commented out the setting in 'lib/main.php', 
'lib/prepend.php' and the adodb files tho I don't think they are being 
used), yet I'm still getting errors about 'lib/FileFinder.php:18: 
Fatal[2048]: var: Deprecated. Please use the public/private/protected 
modifiers', which as far as I know, is an E_STRICT level error.

I have already run the php5-patch.php file.

Can anyone help?

Thanks in advance

Athon Solo

[Phpwiki-talk] Extra <p> in <li>sts?

[Alson K. <ar...@ya...>]

All,
  I've been using PHPWiki for a week or so now and think that it's a
great package.  I do however have one question:

This: 
*test1
*test2
*test3
**test4
**test5
**test6
*** test7

gets marked up as:
<ul><li class="tightenable top bottom">test1</li>
<li class="tightenable top bottom">test2</li>
<li class="tightenable top"><p class="tightenable top bottom">test3</p>
<ul><li class="tightenable top bottom">test4</li>
<li class="tightenable top bottom">test5</li>
<li class="tightenable top bottom"><p class="tightenable top
bottom">test6</p>
<ul><li class="tightenable top bottom"><u>test7</u></li>
</ul>

  The extra <p> tags create odd breaks in the list structure and I
would like to get rid of them.  At present, I've modified the CSS to
remove the border around <p>, but that's not a clean solution.  Where
in the PHP code would I modify this behavior?  I've looked around, but
haven't been able to find it.

  Version info follows.

  Thank you,
   Alson

PHP 4.1.2
PHPWiki v1.3.10 May, 13 2004
using the DBM/db2 backend
Wordpress theme


		
__________________________________
Do you Yahoo!?
Vote for the stars of Yahoo!'s next ad campaign!
http://advision.webevents.yahoo.com/yahoo/votelifeengine/

[Phpwiki-talk] Correction and a bug fix

[Paul H. <he...@ma...>]

First the bug. Got an error when using PluginManager with the IncludeSiteMap plugin, when listed. Fixed:

--- /home/clyde/soft/phpwiki-1.3.10/lib/plugin/IncludeSiteMap.php	2004-03-09 07:26:20.000000000 -0500
+++ IncludeSiteMap.php	2004-07-16 23:22:29.000000000 -0400
@@ -53,8 +53,8 @@
   }

   function getDescription () {
-    return sprintf(_("Include recursively all linked pages starting at %s"),
-		   $this->_pagename);
+    return sprintf(_("Include recursively all linked pages starting at %s."),
+		   '[pagename]');
   }
   function getDefaultArguments() {
       return array('exclude'        => '',


Then the cosmetic change. Changed use of ' ' in LikePages for consistency with other descriptions, also using PluginManager:

--- /home/clyde/soft/phpwiki-1.3.10/lib/plugin/LikePages.php	2004-02-17 07:11:36.000000000 -0500
+++ LikePages.php	2004-07-15 23:10:08.000000000 -0400
@@ -33,7 +33,7 @@
     }

     function getDescription() {
-        return sprintf(_("List page names which share an initial or final title word with '%s'."),
+        return sprintf(_("List page names which share an initial or final title word with %s."),
                        '[pagename]');
     }

[Phpwiki-talk] Using personal pages for security

[Frederik De B. <fre...@pa...>]

Hi,

I've been following up on the whole PhpWikiUserNew story, and reading 
all the documentation over and over, but still haven't been able to 
figure out how to user personal home pages to do security.

My setup: only a limited set of users should be able to edit pages on 
my wiki. Ideally, user management should be as simple as possible.

How do I create those homepages? Do I do that as an admin? Then, later 
on, how do I add a password to these homepages? (the sparse 
documentation talks about storing a password in the page's metadata, 
but doesn't explain how) Is creating a homepage enough for a user to 
gain access to the system, or do I need to do something else?

Kind regards,

Frederik 

[Phpwiki-talk] fpdf problem

[620 <an...@gm...>]

Hi,

I'm not a developer. If problems about using phpwiki are inappropriate
here, please let me know, thanks.

I just begun using fpdf plugin but has some trouble with it.

When I try to load a page with parameters: action=pdf and download.
I get a message indicating the following line in fpdf.php can not open
a file. To fix it, I added a '../'. before $file. It has no more complain about
not able to open the file now but I can not see anything in the generated
pdf file except "Php WiKi" logo. Did anybody meet this before?

By the way, I don't have a "PDF" that can be clicked on the page. I have
to type it in the URL to get this working. How could I turn it on?

    function _parsepng($file) {
        //Extract info from a PNG file
        $f=fopen('../'.$file,'rb');
        //$f=fopen($file,'rb');
        if (!$f)
            $this->Error('Can\'t open image file: '.$file);

Re: [Phpwiki-talk] Bug in InterWikiMap page display

[Dan F. <dfr...@cs...>]

Dan Frankowski wrote:

> Anyway, while I was looking at it, I got very confused about how it's 
> displayed, and that's because if you save version N of InterWikiMap, 
> it displays version N-1. This is a bug, no? I have caching NONE, and 
> furthermore I instrumented WikiDB_Page::save() to print "wikitext" 
> (the actual text of the page) and "type" (the 
> PageType_InterWikiMap-interpreted version, which turns out to be N-1). 
> I include it below my sig, and you can see that the wikitext doesn't 
> match the type.
>
> Note: I'm running phpwiki 1.3.9+ with a 'SQL' backend on Linux with 
> Apache.
>
> ** Question: Should I be filing these as bugs @ SourceForge, or is it 
> sufficient to email phpwiki-talk?
>
> I am currently trying to figure out where the interpretation happens. 
> For some reason, I find InlineParser, BlockParser, etc. incredibly 
> time consuming to figure out.
>
> Dan


I attach a patch that fixes this bug. The basic idea is to pass the 
pagetext itself for getting the map while rendering, instead of having 
it go to the database (which has not yet been updated). If no pagetext 
is passed, it falls back to the DB page.

PageType.php has the only substantial changes. The other files just 
change the call not to pass the request object. I changed

   function PageType_interwikimap($request = false)

to

   function PageType_interwikimap($pagetext = false)

since the request object wasn't being used (or was being pulled up 
through "global $request;" instead) and I needed the $pagetext parameter.

Please advise on what to do with the patch.

Dan

Files affected:

lib/CachedMarkup.php
lib/InlineParser.php
lib/PageType.php
lib/stdlib.php
lib/plugin/ExternalSearch.php

==========================

diff -b -u -r1.4 CachedMarkup.php
--- lib/CachedMarkup.php        16 Jun 2004 19:26:06 -0000      1.4
+++ lib/CachedMarkup.php        15 Jul 2004 18:57:51 -0000
@@ -412,7 +412,7 @@

     function expand($basepage, &$markup) {
         //include_once('lib/interwiki.php');
-       $intermap = PageType_interwikimap::GetMap($GLOBALS['request']);
+       $intermap = PageType_interwikimap::GetMap();
        $label = isset($this->_label) ? $this->_label : false;
        return $intermap->link($this->_link, $label);
     }

==========================

diff -b -u -r1.5 InlineParser.php
--- lib/InlineParser.php        3 Jun 2004 18:23:48 -0000       1.5
+++ lib/InlineParser.php        15 Jul 2004 18:58:17 -0000
@@ -286,7 +286,7 @@
     global $request, $AllowedProtocols, $InlineImages;

     //include_once("lib/interwiki.php");
-    $intermap = PageType_interwikimap::GetMap($request);
+    $intermap = PageType_interwikimap::GetMap();

     // $bracketlink will start and end with brackets; in between will
     // be either a page name, a URL or both separated by a pipe.
@@ -423,13 +423,13 @@
 {
     function getMatchRegexp () {
         global $request;
-        $map = PageType_interwikimap::GetMap($request);
+        $map = PageType_interwikimap::GetMap();
         return "(?<! [[:alnum:]])" . $map->getRegexp(). ": \S+ (?<![ 
,.?;! \] \) \" \' ])";
     }

     function markup ($match) {
         global $request;
-        $map = PageType_interwikimap::GetMap($request);
+        $map = PageType_interwikimap::GetMap();
         return new Cached_InterwikiLink(UnWikiEscape($match));
     }
 }

==========================

diff -b -u -r1.2 PageType.php
--- lib/PageType.php    7 Jul 2004 19:07:20 -0000       1.2
+++ lib/PageType.php    15 Jul 2004 19:09:28 -0000
@@ -128,10 +128,21 @@

 class PageType_interwikimap extends PageType
 {
-    function PageType_interwikimap() {
+    function PageType_interwikimap($pagetext = false) {
         global $request;
         $dbi = $request->getDbh();
-        $intermap = 
$this->_getMapFromWikiPage($dbi->getPage(_("InterWikiMap")));
+
+        if (!$pagetext) {
+            $page = $dbi->getPage(_("InterWikiMap"));
+            if ($page->get('locked')) {
+                $current = $page->getCurrentRevision();
+                $pagetext = $current->getPackedContent();
+            }
+            else {
+                trigger_error(_("WARNING: InterWikiMap page is 
unlocked, so not using those links."));
+            }
+        }
+        $intermap = $this->_getMapFromWikiPageText($pagetext);
         if (!$intermap && defined('INTERWIKI_MAP_FILE'))
             $intermap = $this->_getMapFromFile(INTERWIKI_MAP_FILE);

@@ -139,13 +150,8 @@
         $this->_regexp = $this->_getRegexp();
     }

-    function GetMap ($request = false) {
-        if (empty($this->_map)) {
-            $map = new PageType_interwikimap();
-            return $map;
-        } else {
-            return $this;
-        }
+    function GetMap ($pagetext = false) {
+        return new PageType_interwikimap($pagetext);
     }

     function getRegexp() {
@@ -153,7 +159,6 @@
     }

     function link ($link, $linktext = false) {
-
         list ($moniker, $page) = split (":", $link, 2);

         if (!isset($this->_map[$moniker])) {
@@ -201,14 +206,9 @@
         return $map;
     }

-    function _getMapFromWikiPage ($page) {
-        if (! $page->get('locked'))
-            return false;
-
-        $current = $page->getCurrentRevision();
-
+    function _getMapFromWikiPageText ($pagetext) {
         if (preg_match('|^<verbatim>\n(.*)^</verbatim>|ms',
-                       $current->getPackedContent(), $m)) {
+                       $pagetext, $m)) {
             return $m[1];
         }
         return false;
@@ -287,7 +287,7 @@
     function format($text) {
        return HTML::div(array('class' => 'wikitext'),
                         $this->_transform($this->_getHeader($text)),
-                        $this->_formatMap(),
+                        $this->_formatMap($text),
                         $this->_transform($this->_getFooter($text)));
     }

@@ -299,13 +299,13 @@
        return preg_replace('@.*?(</verbatim>|\Z)@s', '', $text, 1);
     }

-    function _getMap() {
-        $map = PageType_interwikimap::getMap();
+    function _getMap($pagetext) {
+        $map = PageType_interwikimap::getMap($pagetext);
         return $map->_map;
     }

-    function _formatMap() {
-       $map = $this->_getMap();
+    function _formatMap($pagetext) {
+       $map = $this->_getMap($pagetext);
        if (!$map)
            return HTML::p("<No map found>"); // Shouldn't happen.

diff -b -u -r1.1.1.2 stdlib.php
--- lib/stdlib.php      14 Apr 2004 21:22:35 -0000      1.1.1.2
+++ lib/stdlib.php      15 Jul 2004 18:58:48 -0000
@@ -559,7 +559,7 @@
         // change ! escapes to ~'s.
         global $AllowedProtocols, $WikiNameRegexp, $request;
         //include_once('lib/interwiki.php');
-        $map = PageType_interwikimap::GetMap($request);
+        $map = PageType_interwikimap::GetMap();
         $bang_esc[] = 
"(?:$AllowedProtocols):[^\s<>\[\]\"'()]*[^\s<>\[\]\"'(),.?]";
         $bang_esc[] = $map->getRegexp() . ":[^\\s.,;?()]+"; // FIXME: 
is this really needed?
         $bang_esc[] = $WikiNameRegexp;
@@ -1375,6 +1375,26 @@
     }
     return $a;
 }

==========================

diff -b -u -r1.1.1.2 ExternalSearch.php
--- lib/plugin/ExternalSearch.php       14 Apr 2004 21:22:39 -0000      
1.1.1.2
+++ lib/plugin/ExternalSearch.php       15 Jul 2004 18:59:07 -0000
@@ -42,7 +42,7 @@
     }

     function _getInterWikiUrl(&$request) {
-        $intermap = PageType_interwikimap::GetMap($request);
+        $intermap = PageType_interwikimap::GetMap();
         $map = $intermap->_map;

         if (in_array($this->_url, array_keys($map))) {

Re: [Phpwiki-talk] Bug in InterWikiMap page display

[Dan F. <dfr...@cs...>]

Reini Urban wrote:

> >Dan:
>
>>> ** Question: Should I be filing these as bugs @ SourceForge, or is 
>>> it sufficient to email phpwiki-talk?
>>
>
> Please file a bug report. Most of the people don't bother subscribing 
> to the mailinglist, and look at the trackers and forums first.
>
> I'm glad you found one.


I filed it. Request # 991676.

> PS: I'm still fighting with some dirty crashes, but at least the new 
> unit tests make them reproducable.


Glad the tests are helping.

Dan

RE: [Phpwiki-talk] patch for UnfoldSubpages plugin...

[John C. <joh...@ua...>]

Reini,
  I see that.  The problem is that the $section, $lines, etc... are using
the $c variable, so their output isn't getting used with the current cvs
version.  The effect is that you cannot use the section, lines, words or
bytes attributes.

  Moving the $ct = implode("\n", $c); line below the 4 'if' statements does
fix that, but I see now that it bypasses the recursive plugin preg_match.

  I moved the preg_match below the implode line but my blog page doesn't
show the recursive include :-) (BTW, that's a bug in the blog plugin)
because the sortby=-mtime doesn't appear to be working ;-(

  Looking at the sortby, I see that it's in the db handlers, so I changed
mine form SQL to ADODB, and it still isn't working.

  Here is another stab at the patch that fixes the words attribute (I have
not tested section, lines or bytes) but the sortby=[+-]mtime does not work.

Thanks,

John Cole

-----Original Message-----
From: php...@li...
[mailto:php...@li...]On Behalf Of Reini
Urban
Sent: Thursday, July 15, 2004 4:08 AM
To: php...@li...
Subject: Re: [Phpwiki-talk] patch for UnfoldSubpages plugin...


John Cole schrieb:
>   Here is a patch for UnfoldSubpages.  I just moved one line so that the
> arguments would get processed.

John, your patch is not correct. $ct is needed for preg_match.
What was the problem?

-- 
Reini Urban
http://xarch.tu-graz.ac.at/home/rurban/



-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click
_______________________________________________
Phpwiki-talk mailing list
Php...@li...
https://lists.sourceforge.net/lists/listinfo/phpwiki-talk


-------------------------------------
This email and any files transmitted with it are confidential and intended solely for the use of the individual or entity to whom they are addressed. If you have received this email in error please notify the system manager. This message contains confidential information and is intended only for the individual named. If you are not the named addressee you should not disseminate, distribute or copy this e-mail.

Re: [Phpwiki-talk] patch for UnfoldSubpages plugin...

[Reini U. <ru...@x-...>]

John Cole schrieb:
>   Here is a patch for UnfoldSubpages.  I just moved one line so that the
> arguments would get processed.

John, your patch is not correct. $ct is needed for preg_match.
What was the problem?

-- 
Reini Urban
http://xarch.tu-graz.ac.at/home/rurban/