Menu
▾
▴
phpwiki-checkins — Automatic notification of CVS checkins on PhpWiki.
You can subscribe to this list here.
| 2000 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(43) |
Nov
(73) |
Dec
(10) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2001 |
Jan
(34) |
Feb
(110) |
Mar
(24) |
Apr
(44) |
May
(37) |
Jun
(22) |
Jul
(20) |
Aug
(28) |
Sep
(50) |
Oct
(11) |
Nov
(132) |
Dec
(595) |
| 2002 |
Jan
(1099) |
Feb
(579) |
Mar
(63) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(125) |
Sep
(101) |
Oct
(25) |
Nov
(34) |
Dec
(47) |
| 2003 |
Jan
(82) |
Feb
(182) |
Mar
(71) |
Apr
(3) |
May
(1) |
Jun
(3) |
Jul
|
Aug
|
Sep
(14) |
Oct
(6) |
Nov
(124) |
Dec
(68) |
| 2004 |
Jan
(64) |
Feb
(191) |
Mar
(199) |
Apr
(298) |
May
(252) |
Jun
(426) |
Jul
(134) |
Aug
(13) |
Sep
(96) |
Oct
(75) |
Nov
(232) |
Dec
(171) |
| 2005 |
Jan
(205) |
Feb
(165) |
Mar
(8) |
Apr
(74) |
May
(21) |
Jun
(19) |
Jul
(37) |
Aug
(69) |
Sep
(141) |
Oct
(118) |
Nov
(31) |
Dec
(7) |
| 2006 |
Jan
(5) |
Feb
(10) |
Mar
(35) |
Apr
(24) |
May
(34) |
Jun
(29) |
Jul
(5) |
Aug
(38) |
Sep
(30) |
Oct
(37) |
Nov
(30) |
Dec
(86) |
| 2007 |
Jan
(414) |
Feb
(40) |
Mar
(18) |
Apr
(10) |
May
(66) |
Jun
(60) |
Jul
(105) |
Aug
(55) |
Sep
(64) |
Oct
(7) |
Nov
(11) |
Dec
(5) |
| 2008 |
Jan
(26) |
Feb
(28) |
Mar
(79) |
Apr
(34) |
May
(61) |
Jun
(24) |
Jul
(29) |
Aug
(160) |
Sep
(62) |
Oct
(70) |
Nov
(32) |
Dec
(14) |
| 2009 |
Jan
(140) |
Feb
(135) |
Mar
(153) |
Apr
(53) |
May
(24) |
Jun
(138) |
Jul
(90) |
Aug
(46) |
Sep
(72) |
Oct
(84) |
Nov
(32) |
Dec
(4) |
| 2010 |
Jan
(13) |
Feb
(7) |
Mar
(14) |
Apr
(55) |
May
(89) |
Jun
(131) |
Jul
(41) |
Aug
(38) |
Sep
(42) |
Oct
(11) |
Nov
(27) |
Dec
(54) |
| 2011 |
Jan
(127) |
Feb
(16) |
Mar
(71) |
Apr
(52) |
May
(32) |
Jun
(31) |
Jul
(4) |
Aug
|
Sep
(45) |
Oct
(26) |
Nov
(36) |
Dec
(10) |
| 2012 |
Jan
(23) |
Feb
(6) |
Mar
(13) |
Apr
(18) |
May
(1) |
Jun
(4) |
Jul
(3) |
Aug
(12) |
Sep
(57) |
Oct
(96) |
Nov
(163) |
Dec
(124) |
| 2013 |
Jan
(11) |
Feb
(17) |
Mar
(7) |
Apr
(48) |
May
(15) |
Jun
(29) |
Jul
(12) |
Aug
|
Sep
(9) |
Oct
|
Nov
|
Dec
(3) |
| 2014 |
Jan
(4) |
Feb
(1) |
Mar
(2) |
Apr
(1) |
May
(8) |
Jun
(90) |
Jul
(104) |
Aug
(12) |
Sep
(81) |
Oct
(139) |
Nov
(111) |
Dec
(64) |
| 2015 |
Jan
(46) |
Feb
(74) |
Mar
(56) |
Apr
(61) |
May
(3) |
Jun
(7) |
Jul
(11) |
Aug
(5) |
Sep
(15) |
Oct
(1) |
Nov
(1) |
Dec
(15) |
| 2016 |
Jan
(25) |
Feb
(33) |
Mar
(24) |
Apr
(4) |
May
(24) |
Jun
(3) |
Jul
(75) |
Aug
|
Sep
(2) |
Oct
(38) |
Nov
(4) |
Dec
(18) |
| 2017 |
Jan
(8) |
Feb
(1) |
Mar
(1) |
Apr
|
May
(14) |
Jun
|
Jul
(5) |
Aug
(9) |
Sep
|
Oct
(23) |
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
(9) |
Apr
(60) |
May
(1) |
Jun
|
Jul
(13) |
Aug
|
Sep
(11) |
Oct
|
Nov
|
Dec
|
| 2020 |
Jan
|
Feb
|
Mar
(15) |
Apr
(4) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(47) |
| 2021 |
Jan
(24) |
Feb
(33) |
Mar
(1) |
Apr
|
May
(1) |
Jun
(64) |
Jul
(71) |
Aug
(114) |
Sep
(82) |
Oct
(32) |
Nov
(76) |
Dec
(86) |
| 2022 |
Jan
(162) |
Feb
(41) |
Mar
(11) |
Apr
(9) |
May
|
Jun
|
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
(7) |
| 2023 |
Jan
|
Feb
(1) |
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
(25) |
Aug
|
Sep
|
Oct
|
Nov
(7) |
Dec
|
| 2024 |
Jan
(7) |
Feb
(3) |
Mar
(3) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2025 |
Jan
|
Feb
(90) |
Mar
(19) |
Apr
|
May
(6) |
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Carsten K. <car...@us...> - 2002-01-10 21:46:41
|
Update of /cvsroot/phpwiki/phpwiki/locale/de/LC_MESSAGES
In directory usw-pr-cvs1:/tmp/cvs-serv360
Modified Files:
phpwiki.mo phpwiki.php
Log Message:
A few new translations.
Index: phpwiki.mo
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/LC_MESSAGES/phpwiki.mo,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
Binary files /tmp/cvslaJKLJ and /tmp/cvsqVNYdj differ
Index: phpwiki.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/LC_MESSAGES/phpwiki.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** phpwiki.php 2002/01/09 01:05:44 1.35
--- phpwiki.php 2002/01/10 21:46:38 1.36
***************
*** 15,18 ****
--- 15,20 ----
$locale["%s(%d): no such revision"] =
"Es gibt keine Revision als %s(%d)";
+ $locale["%s: %s"] =
+ "%s: %s";
$locale["%s: Can't open dba database"] =
"%s: Konnte dba Datenbank nich öffnen.";
***************
*** 93,96 ****
--- 95,100 ----
$locale["Complete."] =
"Fertig.";
+ $locale["Contents"] =
+ "Inhalt";
$locale["Copied to [%s]"] =
"Kopiert an %s";
***************
*** 149,152 ****
--- 153,158 ----
$locale["FindPage"] =
"SeiteFinden";
+ $locale["First"] =
+ "Erste";
$locale["Found [%s] in [%s]"] =
"[%s] in [%s] gefunden";
***************
*** 181,184 ****
--- 187,192 ----
$locale["Included from %s"] =
"Eingefügter Text von %s";
+ $locale["Last"] =
+ "Letzte";
$locale["Last edited on %s."] =
"Zuletzt am %s verändert.";
***************
*** 213,216 ****
--- 221,226 ----
$locale["Newer page:"] =
"Neuere Seite:";
+ $locale["Next"] =
+ "Nächste";
$locale["Next Month"] =
"Nächste Monat";
***************
*** 261,264 ****
--- 271,276 ----
$locale["Preview only! Changes not saved."] =
"Nur die Vorschau! Änderungen nicht gespeichert.";
+ $locale["Previous"] =
+ "Vorherige";
$locale["Previous Author"] =
"Vorherige Author";
|
|
From: Carsten K. <car...@us...> - 2002-01-10 21:46:38
|
Update of /cvsroot/phpwiki/phpwiki/locale/po In directory usw-pr-cvs1:/tmp/cvs-serv359 Modified Files: de.po Log Message: A few new translations. Index: de.po =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/locale/po/de.po,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -r1.39 -r1.40 *** de.po 2002/01/10 21:30:11 1.39 --- de.po 2002/01/10 21:46:35 1.40 *************** *** 474,478 **** #, fuzzy, c-format msgid "See %s" ! msgstr "Sehe" #: ../lib/plugin/text2png.php:89 --- 474,478 ---- #, fuzzy, c-format msgid "See %s" ! msgstr "Sehe %s" #: ../lib/plugin/text2png.php:89 *************** *** 508,535 **** #: ../lib/plugin/walkabout.php:42 ../lib/plugin/walkabout.php:90 msgid "Contents" ! msgstr "" #: ../lib/plugin/walkabout.php:88 msgid "Next" ! msgstr "" #: ../lib/plugin/walkabout.php:89 - #, fuzzy msgid "Previous" ! msgstr "Vorige Monat" #: ../lib/plugin/walkabout.php:91 msgid "First" ! msgstr "" #: ../lib/plugin/walkabout.php:92 msgid "Last" ! msgstr "" #: ../lib/plugin/walkabout.php:110 ../lib/plugin/walkabout.php:151 #: ../lib/plugin/walkabout.php:155 ! #, fuzzy, c-format msgid "%s: %s" ! msgstr "%s Tagen" #: ../lib/DbaDatabase.php:46 ../lib/ziplib.php:36 ../lib/ziplib.php:39 --- 508,534 ---- #: ../lib/plugin/walkabout.php:42 ../lib/plugin/walkabout.php:90 msgid "Contents" ! msgstr "Inhalt" #: ../lib/plugin/walkabout.php:88 msgid "Next" ! msgstr "Nächste" #: ../lib/plugin/walkabout.php:89 msgid "Previous" ! msgstr "Vorherige" #: ../lib/plugin/walkabout.php:91 msgid "First" ! msgstr "Erste" #: ../lib/plugin/walkabout.php:92 msgid "Last" ! msgstr "Letzte" #: ../lib/plugin/walkabout.php:110 ../lib/plugin/walkabout.php:151 #: ../lib/plugin/walkabout.php:155 ! #, c-format msgid "%s: %s" ! msgstr "%s: %s" #: ../lib/DbaDatabase.php:46 ../lib/ziplib.php:36 ../lib/ziplib.php:39 |
|
From: Carsten K. <car...@us...> - 2002-01-10 21:30:15
|
Update of /cvsroot/phpwiki/phpwiki/locale/po In directory usw-pr-cvs1:/tmp/cvs-serv26684 Modified Files: de.po es.po it.po nl.po phpwiki.pot sv.po Log Message: Rebuilt po files due to new plugin and changes with some plugin strings. Index: de.po =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/locale/po/de.po,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -r1.38 -r1.39 *** de.po 2002/01/09 01:07:37 1.38 --- de.po 2002/01/10 21:30:11 1.39 *************** *** 6,10 **** msgstr "" "Project-Id-Version: phpwiki 1.1.8\n" ! "POT-Creation-Date: 2002-01-08 19:04-0500\n" "PO-Revision-Date: 2000-10-31 02:23+0200\n" "Last-Translator: Carsten Klapp <car...@ma...>, Arno Hollosi " --- 6,10 ---- msgstr "" "Project-Id-Version: phpwiki 1.1.8\n" ! "POT-Creation-Date: 2002-01-10 16:25-0500\n" "PO-Revision-Date: 2000-10-31 02:23+0200\n" [...1022 lines suppressed...] msgstr "Fußnoten" ! #: ../lib/ziplib.php:666 #, c-format msgid "Can't parse %s" msgstr "Könnte %s nicht analysieren" ! #: ../lib/ziplib.php:721 #, c-format msgid "Unknown %s" *************** *** 1305,1311 **** #~ msgid "here" #~ msgstr "hier" - - #~ msgid "See" - #~ msgstr "Sehe" #~ msgid "Current page:" --- 1352,1355 ---- Index: es.po =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/locale/po/es.po,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -r1.31 -r1.32 *** es.po 2002/01/09 01:06:47 1.31 --- es.po 2002/01/10 21:30:11 1.32 *************** *** 13,17 **** msgstr "" "Project-Id-Version: phpwiki 1.2.0\n" ! "POT-Creation-Date: 2002-01-08 19:04-0500\n" "PO-Revision-Date: 2000-02-01 00:50-0500\n" "Last-Translator: Pablo Roca <pr...@cl...>\n" --- 13,17 ---- msgstr "" "Project-Id-Version: phpwiki 1.2.0\n" ! "POT-Creation-Date: 2002-01-10 16:25-0500\n" "PO-Revision-Date: 2000-02-01 00:50-0500\n" [...1020 lines suppressed...] msgstr "" ! #: ../lib/ziplib.php:636 #, c-format msgid "[%d] See [%s]" msgstr "" ! #: ../lib/ziplib.php:644 #, fuzzy msgid "References" msgstr "Referencias:" ! #: ../lib/ziplib.php:666 #, c-format msgid "Can't parse %s" msgstr "" ! #: ../lib/ziplib.php:721 #, c-format msgid "Unknown %s" Index: it.po =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/locale/po/it.po,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -r1.21 -r1.22 *** it.po 2002/01/09 01:06:47 1.21 --- it.po 2002/01/10 21:30:11 1.22 *************** *** 7,11 **** msgstr "" "Project-Id-Version: phpwiki 1.2.0\n" ! "POT-Creation-Date: 2002-01-08 19:04-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Marco Milanesi <kp...@ad...>\n" --- 7,11 ---- msgstr "" "Project-Id-Version: phpwiki 1.2.0\n" ! "POT-Creation-Date: 2002-01-10 16:25-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" [...1018 lines suppressed...] msgid "Uncompressed size mismatch" msgstr "" ! #: ../lib/ziplib.php:636 #, c-format msgid "[%d] See [%s]" msgstr "" ! #: ../lib/ziplib.php:644 msgid "References" msgstr "" ! #: ../lib/ziplib.php:666 #, c-format msgid "Can't parse %s" msgstr "" ! #: ../lib/ziplib.php:721 #, c-format msgid "Unknown %s" Index: nl.po =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/locale/po/nl.po,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -r1.31 -r1.32 *** nl.po 2002/01/09 01:06:47 1.31 --- nl.po 2002/01/10 21:30:11 1.32 *************** *** 11,15 **** msgstr "" "Project-Id-Version: phpwiki 1.1.7\n" ! "POT-Creation-Date: 2002-01-08 19:04-0500\n" "PO-Revision-Date: 2000-09-30 02:23+0200\n" "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n" --- 11,15 ---- msgstr "" "Project-Id-Version: phpwiki 1.1.7\n" ! "POT-Creation-Date: 2002-01-10 16:25-0500\n" "PO-Revision-Date: 2000-09-30 02:23+0200\n" [...1022 lines suppressed...] msgid "Uncompressed size mismatch" msgstr "" ! #: ../lib/ziplib.php:636 #, c-format msgid "[%d] See [%s]" msgstr "[%d] Zie [%s]" ! #: ../lib/ziplib.php:644 msgid "References" msgstr "Referenties" ! #: ../lib/ziplib.php:666 #, c-format msgid "Can't parse %s" msgstr "" ! #: ../lib/ziplib.php:721 #, c-format msgid "Unknown %s" Index: phpwiki.pot =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/locale/po/phpwiki.pot,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -r1.32 -r1.33 *** phpwiki.pot 2002/01/09 01:06:47 1.32 --- phpwiki.pot 2002/01/10 21:30:11 1.33 *************** *** 7,11 **** msgstr "" "Project-Id-Version: PACKAGE VERSION\n" ! "POT-Creation-Date: 2002-01-08 19:04-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" --- 7,11 ---- msgstr "" "Project-Id-Version: PACKAGE VERSION\n" ! "POT-Creation-Date: 2002-01-10 16:25-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" [...1003 lines suppressed...] msgid "Uncompressed size mismatch" msgstr "" ! #: ../lib/ziplib.php:636 #, c-format msgid "[%d] See [%s]" msgstr "" ! #: ../lib/ziplib.php:644 msgid "References" msgstr "" ! #: ../lib/ziplib.php:666 #, c-format msgid "Can't parse %s" msgstr "" ! #: ../lib/ziplib.php:721 #, c-format msgid "Unknown %s" Index: sv.po =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/locale/po/sv.po,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -r1.26 -r1.27 *** sv.po 2002/01/09 01:06:47 1.26 --- sv.po 2002/01/10 21:30:11 1.27 *************** *** 7,11 **** msgstr "" "Project-Id-Version: phpwiki 1.1.9\n" ! "POT-Creation-Date: 2002-01-08 19:04-0500\n" "PO-Revision-Date: 2001-01-27 01:58+0200\n" "Last-Translator: Jon Åslund <jo...@he...>\n" --- 7,11 ---- msgstr "" "Project-Id-Version: phpwiki 1.1.9\n" ! "POT-Creation-Date: 2002-01-10 16:25-0500\n" "PO-Revision-Date: 2001-01-27 01:58+0200\n" [...1015 lines suppressed...] msgid "Uncompressed size mismatch" msgstr "" ! #: ../lib/ziplib.php:636 #, c-format msgid "[%d] See [%s]" msgstr "" ! #: ../lib/ziplib.php:644 msgid "References" msgstr "" ! #: ../lib/ziplib.php:666 #, c-format msgid "Can't parse %s" msgstr "" ! #: ../lib/ziplib.php:721 #, c-format msgid "Unknown %s" |
|
From: Reini U. <ru...@us...> - 2002-01-10 21:15:49
|
Update of /cvsroot/phpwiki/phpwiki/locale/de/pgsrc In directory usw-pr-cvs1:/tmp/cvs-serv22482 Modified Files: GleicheSeiten GuterStil Log Message: German translation Index: GleicheSeiten =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/locale/de/pgsrc/GleicheSeiten,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** GleicheSeiten 2002/01/09 06:40:51 1.5 --- GleicheSeiten 2002/01/10 21:15:45 1.6 *************** *** 7,11 **** Content-Transfer-Encoding: binary ! GleicheSeiten haben ein identiches Wort im Namen. Besuche Wiki:LikePages und MeatBall:LikePages. ---- <?plugin LikePages?> --- 7,11 ---- Content-Transfer-Encoding: binary ! GleicheSeiten haben einen identischen Wortteil im Namen. Siehe Wiki:LikePages und MeatBall:LikePages. ---- <?plugin LikePages?> Index: GuterStil =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/locale/de/pgsrc/GuterStil,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** GuterStil 2002/01/09 05:21:48 1.4 --- GuterStil 2002/01/10 21:15:45 1.5 *************** *** 7,21 **** Content-Transfer-Encoding: binary ! "Young writers often suppose that style is a garnish for the meat of ! prose, a sauce by which a dull dish is made palatable. Style has no such ! separate entity; it is nondetachable, unfilterable. The beginner should ! approach style warily, realizing that it is himself he is approaching, no ! other; and he should begin by turning resolutely away from all devices ! that are popularly believed to indicate style--all mannerisms, tricks, ! adornments. The approach to style is by way of plainness, simplicity, ! orderliness, sincerity." ! --Strunk and White, "The Elements of Style" ! ''And thus an American textbook, typical required reading for 10th-grade English students, unknowingly extols some virtues of WabiSabi'' --scummings --- 7,13 ---- Content-Transfer-Encoding: binary ! "Junge Schreiber glauben oft, daß Stil die Sauce für das Fleisch der Prosa ist. Eine Sauce, die das fade Gericht erst schmackhaft macht. Stil besitzt aber nicht diese Qualität. Stil ist unteilbar, nicht filterbar. Der Anfänger sollte in seiner Suche nach seinem Stil vorsichtig vorgehen. Sich bewußt sein, daß er es ist dem er sich nähert und nicht seinem Stil. Und er sollte tunlichst eine großen Bogen um alle Eigenheiten machen, die gewöhnlicherweise Stil indizieren - alle Manierismen, Tricks und Verzierungen. Der richtig Zugang zu Stil ist über die Reduktion, Einfachheit, Ordnung und Aufrichtigkeit." --Strunk and White, "The Elements of Style" ! ''Und so zeigt ein amerikanisches Lehrbuch, ein typisches Pflichtbuch für Englischstudenten im 10. Jahrgang, unbewußterweise einige Tugenden des WabiSabi.'' --scummings |
|
From: Reini U. <ru...@us...> - 2002-01-10 21:00:09
|
Update of /cvsroot/phpwiki/phpwiki/locale/de/pgsrc In directory usw-pr-cvs1:/tmp/cvs-serv16954 Modified Files: DebugInfo Log Message: German translation Index: DebugInfo =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/locale/de/pgsrc/DebugInfo,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** DebugInfo 2002/01/09 05:31:58 1.2 --- DebugInfo 2002/01/10 21:00:05 1.3 *************** *** 7,10 **** Content-Transfer-Encoding: binary ! Detailed view of a page, which is probably more useful for debugging than anything else. <?plugin _BackendInfo page||='' ?> --- 7,10 ---- Content-Transfer-Encoding: binary ! Detailansicht der Seite. Das ist wahrscheinlich sinnvoller zum Debuggen als alles andere. <?plugin _BackendInfo page||='' ?> |
|
From: Carsten K. <car...@us...> - 2002-01-10 20:59:12
|
Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory usw-pr-cvs1:/tmp/cvs-serv16746
Modified Files:
Toolbar.php
Log Message:
fixed links to use VIRTUAL_PATH not BaseURL()
Index: Toolbar.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/Toolbar.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** Toolbar.php 2002/01/09 18:06:50 1.9
--- Toolbar.php 2002/01/10 20:59:09 1.10
***************
*** 55,59 ****
// ImageLinks would be helpful here
if ($imgurl)
! return "<a href=\"". BaseURL() .$action ."\"><img alt=\"" .$text ."\" src=\"" .($imgurl) ."\" border=\"0\"></a>";
else
return " ". $this->mklinks($text, 'phpwiki:' .$action) ." ";
--- 55,59 ----
// ImageLinks would be helpful here
if ($imgurl)
! return "<a href=\"". VIRTUAL_PATH ."/" .$action ."\"><img alt=\"" .$text ."\" src=\"" .($imgurl) ."\" border=\"0\"></a>";
else
return " ". $this->mklinks($text, 'phpwiki:' .$action) ." ";
|
|
From: Reini U. <ru...@us...> - 2002-01-10 20:03:41
|
Update of /cvsroot/phpwiki/phpwiki In directory usw-pr-cvs1:/tmp/cvs-serv479 Modified Files: index.php Log Message: Me too Index: index.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/index.php,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -r1.57 -r1.58 *** index.php 2002/01/10 01:03:51 1.57 --- index.php 2002/01/10 20:03:33 1.58 *************** *** 8,12 **** "Pablo Roca Rozas", "Scott R. Anderson", "Neil Brown", "Jan Hidders", "Antti Kaihola", "Jeremie Kass", "John Jorgensen", "Tim Voght", ! "Grant Morgan", "Clifford A. Adams"); This file is part of PhpWiki. --- 8,12 ---- "Pablo Roca Rozas", "Scott R. Anderson", "Neil Brown", "Jan Hidders", "Antti Kaihola", "Jeremie Kass", "John Jorgensen", "Tim Voght", ! "Grant Morgan", "Clifford A. Adams", "Reini Urban"); This file is part of PhpWiki. |
|
From: Reini U. <ru...@us...> - 2002-01-10 19:54:14
|
Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory usw-pr-cvs1:/tmp/cvs-serv30209
Modified Files:
Calendar.php
Log Message:
Mysql fix for subpage seperator with USE_PATH_INFO: "." instead of ":"
Index: Calendar.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/Calendar.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** Calendar.php 2002/01/09 17:40:29 1.5
--- Calendar.php 2002/01/10 19:54:09 1.6
***************
*** 31,35 ****
function getDefaultArguments() {
// FIXME: how to exclude multiple pages?
! return array('prefix' => '[pagename]:',
'date_format' => '%Y-%m-%d',
'year' => '',
--- 31,35 ----
function getDefaultArguments() {
// FIXME: how to exclude multiple pages?
! return array('prefix' => (USE_PATH_INFO) ? '[pagename].' : '[pagename]:',
'date_format' => '%Y-%m-%d',
'year' => '',
|
|
From: Carsten K. <car...@us...> - 2002-01-10 06:40:34
|
Update of /cvsroot/phpwiki/phpwiki/themes/MacOSX
In directory usw-pr-cvs1:/tmp/cvs-serv4292
Modified Files:
themeinfo.php
Log Message:
Turned on $URL_LINK_ICONS with the default images for testing.
Index: themeinfo.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/MacOSX/themeinfo.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** themeinfo.php 2002/01/08 22:54:29 1.11
--- themeinfo.php 2002/01/10 06:40:31 1.12
***************
*** 97,110 ****
// If this theme defines any custom link icons, they will completely
// override any link icon settings defined in index.php.
! /*
$URL_LINK_ICONS = array(
! 'http' => "themes/$theme/icons/http.png",
! 'https' => "themes/$theme/icons/https.png",
! 'ftp' => "themes/$theme/icons/ftp.png",
! 'mailto' => "themes/$theme/icons/mailto.png",
! 'interwiki' => "themes/$theme/icons/interwiki.png",
! '*' => "themes/$theme/icons/zapg.png"
);
- */
$ToolbarImages = array(
--- 97,109 ----
// If this theme defines any custom link icons, they will completely
// override any link icon settings defined in index.php.
!
$URL_LINK_ICONS = array(
! 'http' => "images/http.png",
! 'https' => "images/https.png",
! 'ftp' => "images/ftp.png",
! 'mailto' => "images/mailto.png",
! 'interwiki' => "images/interwiki.png",
! '*' => "images/zapg.png"
);
$ToolbarImages = array(
|
|
From: Carsten K. <car...@us...> - 2002-01-10 06:38:28
|
Update of /cvsroot/phpwiki/phpwiki.pbproj
In directory usw-pr-cvs1:/tmp/cvs-serv3650
Modified Files:
project.pbxproj
Log Message:
Added new files to project and adjusted a few files' settings to use project relative path references.
Index: project.pbxproj
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki.pbproj/project.pbxproj,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** project.pbxproj 2002/01/08 01:36:26 1.19
--- project.pbxproj 2002/01/10 06:38:25 1.20
***************
*** 6,9 ****
--- 6,82 ----
objectVersion = 34;
objects = {
+ F5003E4101EBAF6E0165507D = {
+ children = (
+ F5003E4201EBAF6E0165507D,
+ );
+ isa = PBXGroup;
+ name = toolbars;
+ path = phpwiki/themes/MacOSX/locale/en/toolbars;
+ refType = 2;
+ };
+ F5003E4201EBAF6E0165507D = {
+ children = (
+ F5003E4301EBAF6E0165507D,
+ F5003E4401EBAF6E0165507D,
+ F5003E4601EBAF6E0165507D,
+ F5003E4B01EBB0220165507D,
+ F5003E4701EBAF6E0165507D,
+ F5003E4501EBAF6E0165507D,
+ F5003E4801EBAF6E0165507D,
+ F5003E4901EBAF6E0165507D,
+ );
+ isa = PBXGroup;
+ name = RecentChanges;
+ path = phpwiki/themes/MacOSX/locale/en/toolbars/RecentChanges;
+ refType = 2;
+ };
+ F5003E4301EBAF6E0165507D = {
+ isa = PBXFileReference;
+ name = 1day.png;
+ path = phpwiki/themes/MacOSX/locale/en/toolbars/RecentChanges/1day.png;
+ refType = 2;
+ };
+ F5003E4401EBAF6E0165507D = {
+ isa = PBXFileReference;
+ name = 2days.png;
+ path = phpwiki/themes/MacOSX/locale/en/toolbars/RecentChanges/2days.png;
+ refType = 2;
+ };
+ F5003E4501EBAF6E0165507D = {
+ isa = PBXFileReference;
+ name = 30days.png;
+ path = phpwiki/themes/MacOSX/locale/en/toolbars/RecentChanges/30days.png;
+ refType = 2;
+ };
+ F5003E4601EBAF6E0165507D = {
+ isa = PBXFileReference;
+ name = 3days.png;
+ path = phpwiki/themes/MacOSX/locale/en/toolbars/RecentChanges/3days.png;
+ refType = 2;
+ };
+ F5003E4701EBAF6E0165507D = {
+ isa = PBXFileReference;
+ name = 7days.png;
+ path = phpwiki/themes/MacOSX/locale/en/toolbars/RecentChanges/7days.png;
+ refType = 2;
+ };
+ F5003E4801EBAF6E0165507D = {
+ isa = PBXFileReference;
+ name = 90days.png;
+ path = phpwiki/themes/MacOSX/locale/en/toolbars/RecentChanges/90days.png;
+ refType = 2;
+ };
+ F5003E4901EBAF6E0165507D = {
+ isa = PBXFileReference;
+ name = alltime.png;
+ path = phpwiki/themes/MacOSX/locale/en/toolbars/RecentChanges/alltime.png;
+ refType = 2;
+ };
+ F5003E4B01EBB0220165507D = {
+ isa = PBXFileReference;
+ name = 4days.png;
+ path = phpwiki/themes/MacOSX/locale/en/toolbars/RecentChanges/4days.png;
+ refType = 2;
+ };
F50212A801E00E380165507D = {
fileEncoding = 5;
***************
*** 45,53 ****
F52903F401E417B60165507D = {
children = (
F52903F501E417B60165507D,
);
isa = PBXGroup;
! path = en;
! refType = 4;
};
F52903F501E417B60165507D = {
--- 118,128 ----
F52903F401E417B60165507D = {
children = (
+ F5003E4101EBAF6E0165507D,
F52903F501E417B60165507D,
);
isa = PBXGroup;
! name = en;
! path = phpwiki/themes/MacOSX/locale/en;
! refType = 2;
};
F52903F501E417B60165507D = {
***************
*** 73,78 ****
);
isa = PBXGroup;
! path = buttons;
! refType = 4;
};
F52903FD01E4192C0165507D = {
--- 148,154 ----
);
isa = PBXGroup;
! name = buttons;
! path = phpwiki/themes/MacOSX/locale/en/buttons;
! refType = 2;
};
F52903FD01E4192C0165507D = {
***************
*** 244,254 ****
isa = PBXFileReference;
lineEnding = 0;
! path = MacOSX.css;
! refType = 4;
};
F579EFF101E542670165507D = {
isa = PBXFileReference;
! path = bgpaper8.png;
! refType = 4;
};
F579EFF201E542670165507D = {
--- 320,332 ----
isa = PBXFileReference;
lineEnding = 0;
! name = MacOSX.css;
! path = phpwiki/themes/MacOSX/MacOSX.css;
! refType = 2;
};
F579EFF101E542670165507D = {
isa = PBXFileReference;
! name = bgpaper8.png;
! path = phpwiki/themes/MacOSX/bgpaper8.png;
! refType = 2;
};
F579EFF201E542670165507D = {
***************
*** 256,261 ****
isa = PBXFileReference;
lineEnding = 0;
! path = "MacOSX-heavy.css";
! refType = 4;
};
F579EFF301E542740165507D = {
--- 334,340 ----
isa = PBXFileReference;
lineEnding = 0;
! name = "MacOSX-heavy.css";
! path = "phpwiki/themes/MacOSX/MacOSX-heavy.css";
! refType = 2;
};
F579EFF301E542740165507D = {
***************
*** 405,416 ****
refType = 2;
};
- F57C0A6A01DBCE250165507D = {
- fileEncoding = 5;
- isa = PBXFileReference;
- lineEnding = 0;
- name = Einstellungen;
- path = phpwiki/locale/de/pgsrc/Einstellungen;
- refType = 2;
- };
F57D140401D070600165507D = {
buildStyles = (
--- 484,487 ----
***************
*** 794,797 ****
--- 865,869 ----
F57D440501DB11970165507D,
F529C07301DC22D80165507D,
+ F583EC6B01ED57F00165507D,
);
isa = PBXGroup;
***************
*** 1247,1275 ****
F57D442D01DB11970165507D = {
children = (
! F57D443A01DB11970165507D,
! F57C0A6A01DBCE250165507D,
! F57D442F01DB11970165507D,
! F57D443001DB11970165507D,
! F57D443101DB11970165507D,
! F57D443201DB11970165507D,
! F57D443301DB11970165507D,
! F57D443401DB11970165507D,
! F57D443501DB11970165507D,
! F57D443601DB11970165507D,
! F57D443701DB11970165507D,
! F57D443801DB11970165507D,
! F57D443901DB11970165507D,
! F57D443B01DB11970165507D,
! F57D443C01DB11970165507D,
! F57D443D01DB11970165507D,
! F57D443E01DB11970165507D,
! F57D443F01DB11970165507D,
! F57D444001DB11970165507D,
! F57D444101DB11970165507D,
! F57D444201DB11970165507D,
! F57D444301DB11970165507D,
! F57D444401DB11970165507D,
! F57D444501DB11970165507D,
! F57D444601DB11970165507D,
);
isa = PBXGroup;
--- 1319,1348 ----
F57D442D01DB11970165507D = {
children = (
! F5F4524D01EC07030165507D,
! F5F4524C01EC07030165507D,
! F5F4524B01EC07030165507D,
! F5F4524A01EC07030165507D,
! F5F4524901EC07030165507D,
! F5F4524801EC07030165507D,
! F5F4524701EC07030165507D,
! F5F4524601EC07030165507D,
! F5F4524501EC07030165507D,
! F5F4524401EC07030165507D,
! F5F4524301EC07030165507D,
! F5F4524201EC07030165507D,
! F5F4524101EC07030165507D,
! F5F4524001EC07030165507D,
! F5F4523F01EC07030165507D,
! F5F4523E01EC07030165507D,
! F5F4523D01EC07030165507D,
! F5F4524E01EC1E510165507D,
! F5F4523C01EC07030165507D,
! F5F4523B01EC07030165507D,
! F5F4523901EC07030165507D,
! F5F4523701EC07030165507D,
! F5F4523801EC07030165507D,
! F5F4523A01EC07030165507D,
! F5F4523601EC07030165507D,
! F5F4523501EC07030165507D,
);
isa = PBXGroup;
***************
*** 1278,1473 ****
refType = 2;
};
- F57D442F01DB11970165507D = {
- fileEncoding = 5;
- isa = PBXFileReference;
- lineEnding = 0;
- name = DebugInfo;
- path = phpwiki/locale/de/pgsrc/DebugInfo;
- refType = 2;
- };
- F57D443001DB11970165507D = {
- fileEncoding = 5;
- isa = PBXFileReference;
- lineEnding = 0;
- name = EditiereText;
- path = phpwiki/locale/de/pgsrc/EditiereText;
- refType = 2;
- };
- F57D443101DB11970165507D = {
- fileEncoding = 5;
- isa = PBXFileReference;
- lineEnding = 0;
- name = FrischeSeiten;
- path = phpwiki/locale/de/pgsrc/FrischeSeiten;
- refType = 2;
- };
- F57D443201DB11970165507D = {
- fileEncoding = 5;
- isa = PBXFileReference;
- lineEnding = 0;
- name = "G%E4steBuch";
- path = "phpwiki/locale/de/pgsrc/G%E4steBuch";
- refType = 2;
- };
- F57D443301DB11970165507D = {
- fileEncoding = 5;
- isa = PBXFileReference;
- lineEnding = 0;
- name = "Geringe%C4nderungen";
- path = "phpwiki/locale/de/pgsrc/Geringe%C4nderungen";
- refType = 2;
- };
- F57D443401DB11970165507D = {
- fileEncoding = 5;
- isa = PBXFileReference;
- lineEnding = 0;
- name = GleicheSeiten;
- path = phpwiki/locale/de/pgsrc/GleicheSeiten;
- refType = 2;
- };
- F57D443501DB11970165507D = {
- fileEncoding = 5;
- isa = PBXFileReference;
- lineEnding = 0;
- name = GuterStil;
- path = phpwiki/locale/de/pgsrc/GuterStil;
- refType = 2;
- };
- F57D443601DB11970165507D = {
- fileEncoding = 5;
- isa = PBXFileReference;
- lineEnding = 0;
- name = KonvertiereLeerzeichenZuTabs;
- path = phpwiki/locale/de/pgsrc/KonvertiereLeerzeichenZuTabs;
- refType = 2;
- };
- F57D443701DB11970165507D = {
- fileEncoding = 5;
- isa = PBXFileReference;
- lineEnding = 0;
- name = MeistBesucht;
- path = phpwiki/locale/de/pgsrc/MeistBesucht;
- refType = 2;
- };
- F57D443801DB11970165507D = {
- fileEncoding = 5;
- isa = PBXFileReference;
- lineEnding = 0;
- name = PhpWiki;
- path = phpwiki/locale/de/pgsrc/PhpWiki;
- refType = 2;
- };
- F57D443901DB11970165507D = {
- fileEncoding = 5;
- isa = PBXFileReference;
- lineEnding = 0;
- name = PhpWikiSystemverwalten;
- path = phpwiki/locale/de/pgsrc/PhpWikiSystemverwalten;
- refType = 2;
- };
- F57D443A01DB11970165507D = {
- fileEncoding = 5;
- isa = PBXFileReference;
- lineEnding = 0;
- name = BackLinks;
- path = phpwiki/locale/de/pgsrc/BackLinks;
- refType = 2;
- };
- F57D443B01DB11970165507D = {
- fileEncoding = 5;
- isa = PBXFileReference;
- lineEnding = 0;
- name = SandKiste;
- path = phpwiki/locale/de/pgsrc/SandKiste;
- refType = 2;
- };
- F57D443C01DB11970165507D = {
- fileEncoding = 5;
- isa = PBXFileReference;
- lineEnding = 0;
- name = SeiteFinden;
- path = phpwiki/locale/de/pgsrc/SeiteFinden;
- refType = 2;
- };
- F57D443D01DB11970165507D = {
- fileEncoding = 5;
- isa = PBXFileReference;
- lineEnding = 0;
- name = SeitenErzeugen;
- path = phpwiki/locale/de/pgsrc/SeitenErzeugen;
- refType = 2;
- };
- F57D443E01DB11970165507D = {
- fileEncoding = 5;
- isa = PBXFileReference;
- lineEnding = 0;
- name = SeiteProtokoll;
- path = phpwiki/locale/de/pgsrc/SeiteProtokoll;
- refType = 2;
- };
- F57D443F01DB11970165507D = {
- fileEncoding = 5;
- isa = PBXFileReference;
- lineEnding = 0;
- name = StartSeite;
- path = phpwiki/locale/de/pgsrc/StartSeite;
- refType = 2;
- };
- F57D444001DB11970165507D = {
- fileEncoding = 5;
- isa = PBXFileReference;
- lineEnding = 0;
- name = TextFormatierungsRegeln;
- path = phpwiki/locale/de/pgsrc/TextFormatierungsRegeln;
- refType = 2;
- };
- F57D444101DB11970165507D = {
- fileEncoding = 5;
- isa = PBXFileReference;
- lineEnding = 0;
- name = Titelsuche;
- path = phpwiki/locale/de/pgsrc/Titelsuche;
- refType = 2;
- };
- F57D444201DB11970165507D = {
- fileEncoding = 5;
- isa = PBXFileReference;
- lineEnding = 0;
- name = Volltextsuche;
- path = phpwiki/locale/de/pgsrc/Volltextsuche;
- refType = 2;
- };
- F57D444301DB11970165507D = {
- fileEncoding = 5;
- isa = PBXFileReference;
- lineEnding = 0;
- name = WabiSabi;
- path = phpwiki/locale/de/pgsrc/WabiSabi;
- refType = 2;
- };
- F57D444401DB11970165507D = {
- fileEncoding = 5;
- isa = PBXFileReference;
- lineEnding = 0;
- name = WieManWikiBenutzt;
- path = phpwiki/locale/de/pgsrc/WieManWikiBenutzt;
- refType = 2;
- };
- F57D444501DB11970165507D = {
- fileEncoding = 5;
- isa = PBXFileReference;
- lineEnding = 0;
- name = WikiTechnik;
- path = phpwiki/locale/de/pgsrc/WikiTechnik;
- refType = 2;
- };
- F57D444601DB11970165507D = {
- fileEncoding = 5;
- isa = PBXFileReference;
- lineEnding = 0;
- name = WikiWikiWeb;
- path = phpwiki/locale/de/pgsrc/WikiWikiWeb;
- refType = 2;
- };
F57D444801DB11970165507D = {
children = (
--- 1351,1354 ----
***************
*** 2405,2408 ****
--- 2286,2290 ----
F57D44CA01DB11980165507D,
F57D44CB01DB11980165507D,
+ F5944FAA01EC93EA0165507D,
F57D44CC01DB11980165507D,
F57D44CD01DB11980165507D,
***************
*** 2984,2991 ****
refType = 2;
};
F59EC9A901E71A880165507D = {
isa = PBXFileReference;
! path = RSS.png;
! refType = 4;
};
F5A3126601E03A750165507D = {
--- 2866,2890 ----
refType = 2;
};
+ F583EC6B01ED57F00165507D = {
+ fileEncoding = 5;
+ isa = PBXFileReference;
+ lineEnding = 0;
+ name = walkabout.php;
+ path = phpwiki/lib/plugin/walkabout.php;
+ refType = 2;
+ };
+ F5944FAA01EC93EA0165507D = {
+ fileEncoding = 5;
+ isa = PBXFileReference;
+ lineEnding = 0;
+ name = LinkIcons;
+ path = phpwiki/pgsrc/LinkIcons;
+ refType = 2;
+ };
F59EC9A901E71A880165507D = {
isa = PBXFileReference;
! name = RSS.png;
! path = phpwiki/themes/MacOSX/RSS.png;
! refType = 2;
};
F5A3126601E03A750165507D = {
***************
*** 3159,3162 ****
--- 3058,3267 ----
name = Toolbar.php;
path = phpwiki/lib/Toolbar.php;
+ refType = 2;
+ };
+ F5F4523501EC07030165507D = {
+ fileEncoding = 5;
+ isa = PBXFileReference;
+ lineEnding = 0;
+ name = WikiWikiWeb;
+ path = phpwiki/locale/de/pgsrc/WikiWikiWeb;
+ refType = 2;
+ };
+ F5F4523601EC07030165507D = {
+ fileEncoding = 5;
+ isa = PBXFileReference;
+ lineEnding = 0;
+ name = WikiTechnik;
+ path = phpwiki/locale/de/pgsrc/WikiTechnik;
+ refType = 2;
+ };
+ F5F4523701EC07030165507D = {
+ fileEncoding = 5;
+ isa = PBXFileReference;
+ lineEnding = 0;
+ name = Volltextsuche;
+ path = phpwiki/locale/de/pgsrc/Volltextsuche;
+ refType = 2;
+ };
+ F5F4523801EC07030165507D = {
+ fileEncoding = 5;
+ isa = PBXFileReference;
+ lineEnding = 0;
+ name = WabiSabi;
+ path = phpwiki/locale/de/pgsrc/WabiSabi;
+ refType = 2;
+ };
+ F5F4523901EC07030165507D = {
+ fileEncoding = 5;
+ isa = PBXFileReference;
+ lineEnding = 0;
+ name = Titelsuche;
+ path = phpwiki/locale/de/pgsrc/Titelsuche;
+ refType = 2;
+ };
+ F5F4523A01EC07030165507D = {
+ fileEncoding = 5;
+ isa = PBXFileReference;
+ lineEnding = 0;
+ name = WieManWikiBenutzt;
+ path = phpwiki/locale/de/pgsrc/WieManWikiBenutzt;
+ refType = 2;
+ };
+ F5F4523B01EC07030165507D = {
+ fileEncoding = 5;
+ isa = PBXFileReference;
+ lineEnding = 0;
+ name = TextFormatierungsRegeln;
+ path = phpwiki/locale/de/pgsrc/TextFormatierungsRegeln;
+ refType = 2;
+ };
+ F5F4523C01EC07030165507D = {
+ fileEncoding = 5;
+ isa = PBXFileReference;
+ lineEnding = 0;
+ name = StartSeite;
+ path = phpwiki/locale/de/pgsrc/StartSeite;
+ refType = 2;
+ };
+ F5F4523D01EC07030165507D = {
+ fileEncoding = 5;
+ isa = PBXFileReference;
+ lineEnding = 0;
+ name = SeiteProtokoll;
+ path = phpwiki/locale/de/pgsrc/SeiteProtokoll;
+ refType = 2;
+ };
+ F5F4523E01EC07030165507D = {
+ fileEncoding = 5;
+ isa = PBXFileReference;
+ lineEnding = 0;
+ name = SeitenErzeugen;
+ path = phpwiki/locale/de/pgsrc/SeitenErzeugen;
+ refType = 2;
+ };
+ F5F4523F01EC07030165507D = {
+ fileEncoding = 5;
+ isa = PBXFileReference;
+ lineEnding = 0;
+ name = SeiteFinden;
+ path = phpwiki/locale/de/pgsrc/SeiteFinden;
+ refType = 2;
+ };
+ F5F4524001EC07030165507D = {
+ fileEncoding = 5;
+ isa = PBXFileReference;
+ lineEnding = 0;
+ name = SandKiste;
+ path = phpwiki/locale/de/pgsrc/SandKiste;
+ refType = 2;
+ };
+ F5F4524101EC07030165507D = {
+ fileEncoding = 5;
+ isa = PBXFileReference;
+ lineEnding = 0;
+ name = PhpWikiSystemverwalten;
+ path = phpwiki/locale/de/pgsrc/PhpWikiSystemverwalten;
+ refType = 2;
+ };
+ F5F4524201EC07030165507D = {
+ fileEncoding = 5;
+ isa = PBXFileReference;
+ lineEnding = 0;
+ name = PhpWiki;
+ path = phpwiki/locale/de/pgsrc/PhpWiki;
+ refType = 2;
+ };
+ F5F4524301EC07030165507D = {
+ fileEncoding = 5;
+ isa = PBXFileReference;
+ lineEnding = 0;
+ name = MeistBesucht;
+ path = phpwiki/locale/de/pgsrc/MeistBesucht;
+ refType = 2;
+ };
+ F5F4524401EC07030165507D = {
+ fileEncoding = 5;
+ isa = PBXFileReference;
+ lineEnding = 0;
+ name = KonvertiereLeerzeichenZuTabs;
+ path = phpwiki/locale/de/pgsrc/KonvertiereLeerzeichenZuTabs;
+ refType = 2;
+ };
+ F5F4524501EC07030165507D = {
+ fileEncoding = 5;
+ isa = PBXFileReference;
+ lineEnding = 0;
+ name = GuterStil;
+ path = phpwiki/locale/de/pgsrc/GuterStil;
+ refType = 2;
+ };
+ F5F4524601EC07030165507D = {
+ fileEncoding = 5;
+ isa = PBXFileReference;
+ lineEnding = 0;
+ name = GleicheSeiten;
+ path = phpwiki/locale/de/pgsrc/GleicheSeiten;
+ refType = 2;
+ };
+ F5F4524701EC07030165507D = {
+ fileEncoding = 5;
+ isa = PBXFileReference;
+ lineEnding = 0;
+ name = "Geringe%C4nderungen";
+ path = "phpwiki/locale/de/pgsrc/Geringe%C4nderungen";
+ refType = 2;
+ };
+ F5F4524801EC07030165507D = {
+ fileEncoding = 5;
+ isa = PBXFileReference;
+ lineEnding = 0;
+ name = "G%E4steBuch";
+ path = "phpwiki/locale/de/pgsrc/G%E4steBuch";
+ refType = 2;
+ };
+ F5F4524901EC07030165507D = {
+ fileEncoding = 5;
+ isa = PBXFileReference;
+ lineEnding = 0;
+ name = FrischeSeiten;
+ path = phpwiki/locale/de/pgsrc/FrischeSeiten;
+ refType = 2;
+ };
+ F5F4524A01EC07030165507D = {
+ fileEncoding = 5;
+ isa = PBXFileReference;
+ lineEnding = 0;
+ name = Einstellungen;
+ path = phpwiki/locale/de/pgsrc/Einstellungen;
+ refType = 2;
+ };
+ F5F4524B01EC07030165507D = {
+ fileEncoding = 5;
+ isa = PBXFileReference;
+ lineEnding = 0;
+ name = EditiereText;
+ path = phpwiki/locale/de/pgsrc/EditiereText;
+ refType = 2;
+ };
+ F5F4524C01EC07030165507D = {
+ fileEncoding = 5;
+ isa = PBXFileReference;
+ lineEnding = 0;
+ name = DebugInfo;
+ path = phpwiki/locale/de/pgsrc/DebugInfo;
+ refType = 2;
+ };
+ F5F4524D01EC07030165507D = {
+ fileEncoding = 5;
+ isa = PBXFileReference;
+ lineEnding = 0;
+ name = BackLinks;
+ path = phpwiki/locale/de/pgsrc/BackLinks;
+ refType = 2;
+ };
+ F5F4524E01EC1E510165507D = {
+ isa = PBXFileReference;
+ name = SchaueQuelltext;
+ path = phpwiki/locale/de/pgsrc/SchaueQuelltext;
refType = 2;
};
|
|
From: Carsten K. <car...@us...> - 2002-01-10 06:06:50
|
Update of /cvsroot/phpwiki/phpwiki/lib/plugin In directory usw-pr-cvs1:/tmp/cvs-serv30617 Modified Files: walkabout.php Log Message: This PageGrouping plugin actually works now but still needs some work. See http://phpwiki.sourceforge.net/phpwiki/PageGrouping. Index: walkabout.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/walkabout.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** walkabout.php 2002/01/10 05:04:45 1.1 --- walkabout.php 2002/01/10 06:06:48 1.2 *************** *** 16,28 **** - /////////////////////////////////////////////////////////////////////// - // This doesn't work completely yet - - - - - - - // (This is all in a state of flux, so don't count on any of this being // the same tomorrow...) --- 16,19 ---- *************** *** 48,51 **** --- 39,43 ---- return array( 'parent' => '', + 'rev' => false, 'section' => _("Contents"), 'sep' => '|', *************** *** 56,63 **** --- 48,73 ---- } + // Stolen from Toolbar.php function mklinks($text, $action) { return do_transform("[$text|$action]", 'LinkTransform'); } + // Stolen from IncludePage.php + function extractSection ($section, $content) { + $qsection = preg_replace('/\s+/', '\s+', preg_quote($section, '/')); + + if (preg_match("/ ^(!{1,})\\s*$qsection" // section header + . " \\s*$\\n?" // possible blank lines + . " ( (?: ^.*\\n? )*? )" // some lines + . " (?= ^\\1 | \\Z)/xm", // sec header (same or higher level) (or EOF) + implode("\n", $content), + $match)) { + // Strip trailing blanks lines and ---- <hr>s + $text = preg_replace("/\\s*^-{4,}\\s*$/m", "", $match[2]); + return explode("\n", $text); + } + return array(sprintf(_("<%s: no such section>"), $section)); + } + function run($dbi, $argstr, $request) { *************** *** 101,121 **** } ! // This is where the list extraction will occur from the named ! // $section on the $parent page. The ordered list will ! // determine the page ordering. ! ! ! ! ! ! ! ! $links = array( ! $directions['previous'] => $previous, ! $directions['next'] => $next ! ); //final assembly --- 111,161 ---- } ! // This is where the list extraction occurs from the named ! // $section on the $parent page. ! $p = $dbi->getPage($parent); ! if ($rev) { ! $r = $p->getRevision($rev); ! if (!$r) { ! $this->error(sprintf(_("%s(%d): no such revision"), $parent, ! $rev)); ! return ''; ! } ! } else { ! $r = $p->getCurrentRevision(); ! } + $c = $r->getContent(); + $c = $this->extractSection($section, $c); ! //debugging only ! //foreach ( $c as $line ) { ! // echo $line ."<br>"; ! //} ! ! $pagename = $request->getArg('pagename'); ! ! // The ordered list of page names determines the page ! // ordering. Right now it doesn't work with a WikiList, only ! // normal lines of text containing the page names. ! ! $thispage = array_search($pagename, $c); ! ! $go = array ('previous','next'); ! $links = array(); ! ! foreach ( $go as $go_item ) { ! ! //these are temp placeholders to test the output ! if ($go_item == 'previous') { ! $text = sprintf(_("%s: %s"), $directions[$go_item], '%s'); ! $action = $c[$thispage - 1]; ! } ! else if ($go_item == 'next') { ! $text = sprintf(_("%s: %s"), $directions[$go_item], '%s'); ! $action = $c[$thispage + 1]; ! } ! $links[] = sprintf($text, $this->mklinks($action, $action)); ! } //final assembly |
|
From: Carsten K. <car...@us...> - 2002-01-10 05:04:48
|
Update of /cvsroot/phpwiki/phpwiki/lib/plugin In directory usw-pr-cvs1:/tmp/cvs-serv19696 Added Files: walkabout.php Log Message: This is a preliminary plugin structure for PageGrouping, It doesn't do much yet. See http://phpwiki.sourceforge.net/phpwiki/PageGrouping. Also it needs a good name. ***** Error reading new file: [Errno 2] No such file or directory: 'walkabout.php' |
|
From: Carsten K. <car...@us...> - 2002-01-10 04:16:36
|
Update of /cvsroot/phpwiki/phpwiki/lib/plugin In directory usw-pr-cvs1:/tmp/cvs-serv11359 Modified Files: text2png.php Log Message: Fixed image creation which had broken after comments rewrapping in v 1.8. Added error checking to test whether PHP was compiled with PNG and GD support, previously an attempt was made to draw and then any errors were reported. Better error messages. Index: text2png.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/text2png.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** text2png.php 2002/01/09 18:06:49 1.8 --- text2png.php 2002/01/10 04:16:33 1.9 *************** *** 4,7 **** --- 4,14 ---- * File loading and saving diagnostic messages, to see whether an * image was saved to or loaded from the cache and what the path is + * + * PHP must be compiled with support for the GD library version 1.6 or + * later to create PNG image files: + * + * ./configure --with-gd + * + * See <http://www.php.net/manual/pl/ref.image.php> for more info. */ define('text2png_debug', true); *************** *** 22,27 **** function run($dbi, $argstr, $request) { ! extract($this->getArgs($argstr, $request)); ! return $this->text2png($text,$l); } --- 29,47 ---- function run($dbi, $argstr, $request) { ! if (ImageTypes() & IMG_PNG) { ! // we have gd & png so go ahead. ! extract($this->getArgs($argstr, $request)); ! return $this->text2png($text,$l); ! } else { ! // we don't have png and/or gd. ! $error_html = _("Sorry, this version of PHP cannot create PNG image files."); ! $link = QElement('a', ! array('href' => "http://www.php.net/manual/pl/ref.image.php", ! 'class' => 'rawurl'), ! "http://www.php.net/manual/pl/ref.image.php"); ! $error_html .= sprintf(_("See %s"), $link) ."."; ! trigger_error( $error_html, E_USER_NOTICE ); ! return; ! } } *************** *** 62,77 **** * * FIXME: needs a dynamic image size depending on text ! * width and height $im = @ImageCreate(150, 50); */ if (empty($im)) { ! $error_text = _("Unable to create a new GD image stream. PHP must be compiled with support for the GD library version 1.6 or later to create PNG image files."); // FIXME: Error manager does not transform URLs passed // through it. ! $error_text .= QElement('a', array('href' => "http://www.php.net/manual/en/function.imagecreate.php", 'class' => 'rawurl'), "PHP web page"); ! trigger_error( $error_text, E_USER_NOTICE ); } // get ready to draw --- 82,99 ---- * * FIXME: needs a dynamic image size depending on text ! * width and height */ + $im = @ImageCreate(150, 50); if (empty($im)) { ! $error_html = _("PHP was unable to create a new GD image stream. Read 'lib/plugin/text2png.php' for details."); // FIXME: Error manager does not transform URLs passed // through it. ! $error_html .= QElement('a', array('href' => "http://www.php.net/manual/en/function.imagecreate.php", 'class' => 'rawurl'), "PHP web page"); ! trigger_error( $error_html, E_USER_NOTICE ); ! return; } // get ready to draw |
|
From: Carsten K. <car...@us...> - 2002-01-10 04:03:15
|
Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv7708
Modified Files:
ErrorManager.php
Log Message:
Removed htmlspecialchars to allow urls in error messages (see text2png plugin for an example).
Index: ErrorManager.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/ErrorManager.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** ErrorManager.php 2002/01/09 17:28:26 1.6
--- ErrorManager.php 2002/01/10 04:03:12 1.7
***************
*** 313,317 ****
$lines = explode("\n", $this->errstr);
! $errstr = htmlspecialchars(array_shift($lines));
foreach ($lines as $key => $line)
$lines[$key] = "<li>" . htmlspecialchars($line) . "</li>";
--- 313,321 ----
$lines = explode("\n", $this->errstr);
! //$errstr = htmlspecialchars(array_shift($lines));
! // Quick hack: by removing htmlspecialchars urls can be used
! // in error messages. How will this affect other error
! // messages?
! $errstr = array_shift($lines);
foreach ($lines as $key => $line)
$lines[$key] = "<li>" . htmlspecialchars($line) . "</li>";
|
|
From: Carsten K. <car...@us...> - 2002-01-10 01:06:25
|
Update of /cvsroot/phpwiki/phpwiki/themes/Hawaiian/pictures
In directory usw-pr-cvs1:/tmp/cvs-serv28927
Modified Files:
random.php
Log Message:
Random signature now uses $InlineImages when selecting an image.
Index: random.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/Hawaiian/pictures/random.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** random.php 2002/01/05 06:17:02 1.5
--- random.php 2002/01/10 01:06:23 1.6
***************
*** 55,61 ****
if ($fn[0] == '.' || filetype("$dir/$fn") != 'file')
continue;
! // FIXME: Use $InlineImages instead of just ".jpg"
! // hardcoded.
! if (substr($fn,-4) == ".jpg")
array_push($imagelist, "$fn");
--- 55,61 ----
if ($fn[0] == '.' || filetype("$dir/$fn") != 'file')
continue;
! global $InlineImages;
! // Add any files with image suffixes as defined in index.php
! if (preg_match("/($InlineImages)$/i", $fn))
array_push($imagelist, "$fn");
***************
*** 105,107 ****
// indent-tabs-mode: nil
// End:
! ?>
--- 105,107 ----
// indent-tabs-mode: nil
// End:
! ?>
\ No newline at end of file
|
|
From: Carsten K. <car...@us...> - 2002-01-10 01:03:53
|
Update of /cvsroot/phpwiki/phpwiki
In directory usw-pr-cvs1:/tmp/cvs-serv28328
Modified Files:
index.php
Log Message:
Moved the theme hook lower in the file, so themes can have access to more vars like $InlineImages.
Index: index.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/index.php,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -r1.56 -r1.57
*** index.php 2002/01/09 15:52:14 1.56
--- index.php 2002/01/10 01:03:51 1.57
***************
*** 383,404 ****
"MESSAGE" => "templates/message.html");
- // The themeinfo file can be used to override default settings above this line
- // (i.e. templates, logo, signature etc.)
- // comment out the $theme= lines to revert to the standard interface
- // which defaults to /templates and /images
- //$theme="default";
- //$theme="Hawaiian";
- //$theme="MacOSX";
- //$theme="WikiTrek";
- if (!empty($theme)) {
- if (file_exists("themes/$theme/themeinfo.php")) {
- include "themes/$theme/themeinfo.php";
- } else {
- // FIXME: gettext doesn't work in index.php or themeinfo.php
- trigger_error(sprintf(("Unable to open file '%s' for reading"),
- "themes/$theme/themeinfo.php"), E_USER_NOTICE);
- }
- }
-
/* WIKI_PGSRC -- specifies the source for the initial page contents of
* the Wiki. The setting of WIKI_PGSRC only has effect when the wiki is
--- 383,386 ----
***************
*** 449,452 ****
--- 431,452 ----
// Leave this undefined to disable InterWiki linking.
define('INTERWIKI_MAP_FILE', "lib/interwiki.map");
+
+ // The themeinfo file can be used to override default settings above this line
+ // (i.e. templates, logo, signature etc.)
+ // comment out the $theme= lines to revert to the standard interface
+ // which defaults to /templates and /images
+ //$theme="default";
+ //$theme="Hawaiian";
+ //$theme="MacOSX";
+ //$theme="WikiTrek";
+ if (!empty($theme)) {
+ if (file_exists("themes/$theme/themeinfo.php")) {
+ include "themes/$theme/themeinfo.php";
+ } else {
+ // FIXME: gettext doesn't work in index.php or themeinfo.php
+ trigger_error(sprintf(("Unable to open file '%s' for reading"),
+ "themes/$theme/themeinfo.php"), E_USER_NOTICE);
+ }
+ }
/////////////////////////////////////////////////////////////////////
|
|
From: Carsten K. <car...@us...> - 2002-01-09 20:03:00
|
Update of /cvsroot/phpwiki/phpwiki/locale/de/pgsrc
In directory usw-pr-cvs1:/tmp/cvs-serv31646
Modified Files:
PhpWikiSystemverwalten
Log Message:
"Rake the SandBox" (Putze die SandKiste aus) adjusted to load the german page instead of the english one. New translation for Cleanup paragraph.
Index: PhpWikiSystemverwalten
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/pgsrc/PhpWikiSystemverwalten,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** PhpWikiSystemverwalten 2002/01/09 05:14:50 1.4
--- PhpWikiSystemverwalten 2002/01/09 20:02:56 1.5
***************
*** 4,8 ****
pagename=PhpWikiSystemverwalten;
flags=PAGE_LOCKED;
! lastmodified=1008918031;
Content-Transfer-Encoding: binary
--- 4,8 ----
pagename=PhpWikiSystemverwalten;
flags=PAGE_LOCKED;
! lastmodified=1008918032;
Content-Transfer-Encoding: binary
***************
*** 20,27 ****
----------
! !! Cleanup
! A Wiki SandBox is very easy to clean. Here you can restore it to pristine condition by loading the default from pgsrc:
!
! [ Rake the SandBox | phpwiki:?action=loadfile&source=pgsrc/SandBox ].
----------
--- 20,26 ----
----------
! !! Aufräumen
! Eine Wiki Sandkiste wird ganz einfach aufgeraümt. Hier kannst du es von locale/de/pgsrc erneut beladen wodurch es wieder unberührt gemacht würde:
! [ Putze die SandKiste aus | phpwiki:?action=loadfile&source=locale/de/pgsrc/SandKiste ].
----------
|
|
From: Carsten K. <car...@us...> - 2002-01-09 19:40:04
|
Update of /cvsroot/phpwiki/phpwiki/locale/de/pgsrc
In directory usw-pr-cvs1:/tmp/cvs-serv21674
Modified Files:
BackLinks
Log Message:
minor fix to improper iso-8859-1 char translation
Index: BackLinks
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/pgsrc/BackLinks,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** BackLinks 2002/01/09 05:21:48 1.4
--- BackLinks 2002/01/09 19:40:01 1.5
***************
*** 4,11 ****
pagename=BackLinks;
flags=PAGE_LOCKED;
! lastmodified=1009484848;
Content-Transfer-Encoding: binary
! Der Titel der aktuellen Seite ist mit einem Suchbefehl nach allen Seiten verbunden, die einen Link auf die aktuelle Seite enthalten. Die BackLinks Funktion beantwortet also die Frage: ªWo wird der Name dieser Seite verwendet?´.
----
<?plugin BackLinks include_self=1 page||='' ?>
--- 4,11 ----
pagename=BackLinks;
flags=PAGE_LOCKED;
! lastmodified=1009484849;
Content-Transfer-Encoding: binary
! Der Titel der aktuellen Seite ist mit einem Suchbefehl nach allen Seiten verbunden, die einen Link auf die aktuelle Seite enthalten. Die BackLinks Funktion beantwortet also die Frage: »Wo wird der Name dieser Seite verwendet?«.
----
<?plugin BackLinks include_self=1 page||='' ?>
|
|
From: Carsten K. <car...@us...> - 2002-01-09 18:58:13
|
Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv5188
Modified Files:
Toolbar.php
Log Message:
Added BackLinks to bottom of page. (Should BackLinks and LikePages be moved over next to Diff?)
Index: Toolbar.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Toolbar.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** Toolbar.php 2002/01/09 16:34:35 1.11
--- Toolbar.php 2002/01/09 18:58:10 1.12
***************
*** 123,128 ****
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
! // Template token: ${PAGE_ACTIONS} not working yet
// Requires:
// $pagelocked = $page->get('locked');
--- 123,130 ----
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
! // Template token: ${PAGE_ACTIONS}
+ // not working yet
+
// Requires:
// $pagelocked = $page->get('locked');
***************
*** 180,183 ****
--- 182,188 ----
//$html .= separator() ."<plugin-link BackLinks page=\"" .$pagename ."\"";
$html .= separator() ."<a class=\"wikiaction\" href=\""
+ . WikiURL(_("LikePages"), array('page' => $pagename)) ."\">"
+ ._("LikePages") ."</a>";
+ $html .= separator() ."<a class=\"wikiaction\" href=\""
. WikiURL(_("BackLinks"), array('page' => $pagename)) ."\">"
._("BackLinks") ."</a>";
***************
*** 217,220 ****
--- 222,228 ----
. WikiURL(_("LikePages"), array('page' => $pagename)) ."\">"
._("LikePages") ."</a>";
+ $html .= separator() ."<a class=\"wikiaction\" href=\""
+ . WikiURL(_("BackLinks"), array('page' => $pagename)) ."\">"
+ ._("BackLinks") ."</a>";
//$html .= "</form>";
|
|
From: Carsten K. <car...@us...> - 2002-01-09 18:48:06
|
Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv1570
Modified Files:
editpage.php
Log Message:
some preparations for adding ViewSource (ViewMarkup) plugin to the page when a user tries to edit a locked page.
Index: editpage.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/editpage.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** editpage.php 2001/12/28 09:45:55 1.19
--- editpage.php 2002/01/09 18:48:03 1.20
***************
*** 2,5 ****
--- 2,6 ----
rcs_id('$Id$');
+ require_once('lib/transform.php');
require_once('lib/Template.php');
***************
*** 7,13 ****
// editpage relies on $pagename, $version
$pagename = $request->getArg('pagename');
! $version = $request->getArg('version');
! $page = $dbi->getPage($pagename);
$current = $page->getCurrentRevision();
--- 8,14 ----
// editpage relies on $pagename, $version
$pagename = $request->getArg('pagename');
! $version = $request->getArg('version');
! $page = $dbi->getPage($pagename);
$current = $page->getCurrentRevision();
***************
*** 23,35 ****
global $user; // FIXME: make this non-global.
if ($page->get('locked') && !$user->is_admin()) {
! $html = QElement('p',
! _("This page has been locked by the administrator and cannot be edited."));
$html .= "\n";
! $html .= QElement('p', _("Sorry for the inconvenience.")) . "\n";
! echo GeneratePage('MESSAGE', $html,
! sprintf(_("Problem while editing %s"),
! $request->getArg('pagename')),
! $selected);
ExitWiki ("");
}
--- 24,59 ----
global $user; // FIXME: make this non-global.
if ($page->get('locked') && !$user->is_admin()) {
!
! $html = QElement('p');
! $html .= QElement('strong', _("Note:")) . " ";
! $html .= _("This page has been locked by the administrator and cannot be edited.");
$html .= "\n";
! //$html .= QElement('p', _("Sorry for the inconvenience.")) . "\n";
! //echo GeneratePage('MESSAGE', $html,
! // sprintf(_("Problem while editing %s"),
! // $request->getArg('pagename')),
! // $selected);
!
! //ExitWiki ("");
!
! // Page locked.
! // (This is a bit kludgy...)
!
! // This renders the page but the title and the links at the
! // bottom of the page don't draw:
! //
! // Fatal error: Call to a member function on a non-object
! //
! // FIXME: The ViewSource (ViewMarkup) plugin should be worked
! // into here somehow.
!
! $template = new WikiTemplate('BROWSE');
! $template->replace('TITLE', $pagename);
! $template->replace('EDIT_FAIL_MESSAGES', $html
! . QElement('hr', array('noshade' => 'noshade'))
! . "\n");
! $template->replace('CONTENT', do_transform($selected->getContent()));
! echo $template->getExpansion();
ExitWiki ("");
}
***************
*** 39,49 ****
$minor_edit = ( $age < MINOR_EDIT_TIMEOUT && $current->get('author') == $user->id() );
! $formvars = array('content' => htmlspecialchars($selected->getPackedContent()),
! 'minor_edit' => $minor_edit ? 'checked' : '',
! 'version' => $selected->getVersion(),
'editversion' => $current->getVersion(),
! 'summary' => '',
! 'convert' => '',
! 'pagename' => htmlspecialchars($pagename));
$template = new WikiTemplate('EDITPAGE');
--- 63,73 ----
$minor_edit = ( $age < MINOR_EDIT_TIMEOUT && $current->get('author') == $user->id() );
! $formvars = array('content' => htmlspecialchars($selected->getPackedContent()),
! 'minor_edit' => $minor_edit ? 'checked' : '',
! 'version' => $selected->getVersion(),
'editversion' => $current->getVersion(),
! 'summary' => '',
! 'convert' => '',
! 'pagename' => htmlspecialchars($pagename));
$template = new WikiTemplate('EDITPAGE');
|
|
From: Carsten K. <car...@us...> - 2002-01-09 18:06:52
|
Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory usw-pr-cvs1:/tmp/cvs-serv19010
Modified Files:
HelloWorld.php IncludePage.php LikePages.php MostPopular.php
text2png.php Toolbar.php UserPage.php
Log Message:
Minor reindenting & rewrapping.
Index: HelloWorld.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/HelloWorld.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** HelloWorld.php 2002/01/09 00:03:50 1.6
--- HelloWorld.php 2002/01/09 18:06:49 1.7
***************
*** 30,35 ****
// Establish default values for each of this plugin's arguments.
function getDefaultArguments() {
! return array('salutation' => "Hello,",
! 'name' => "World");
}
--- 30,35 ----
// Establish default values for each of this plugin's arguments.
function getDefaultArguments() {
! return array('salutation' => "Hello,",
! 'name' => "World");
}
***************
*** 40,44 ****
// so use html where necessary.
$html = Element('tt', sprintf('%s %s', $salutation,
! do_transform($name, 'LinkTransform'))
.THE_END);
return $html;
--- 40,44 ----
// so use html where necessary.
$html = Element('tt', sprintf('%s %s', $salutation,
! do_transform($name, 'LinkTransform'))
.THE_END);
return $html;
***************
*** 54,57 ****
// indent-tabs-mode: nil
// End:
-
?>
--- 54,56 ----
Index: IncludePage.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/IncludePage.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** IncludePage.php 2001/12/17 16:40:43 1.5
--- IncludePage.php 2002/01/09 18:06:49 1.6
***************
*** 15,36 ****
return _("IncludePage");
}
!
function getDefaultArguments() {
! return array( 'page' => false, // the page to include
! 'rev' => false, // the revision (defaults to most recent)
! 'quiet' => false, // if set, inclusion appears as normal content
! 'words' => false, // maximum number of words to include
! 'lines' => false, // maximum number of lines to include
! 'section'=> false // include a named section
! );
}
function firstNWordsOfContent( $n, $content ) {
! $wordcount = 0;
$new = array( );
foreach ($content as $line) {
$words = explode(' ', $line);
if ($wordcount + count($words) > $n) {
! $new[] = implode(' ', array_slice($words, 0, $n - $wordcount))
. "... (first $n words)";
return $new;
--- 15,36 ----
return _("IncludePage");
}
!
function getDefaultArguments() {
! return array( 'page' => false, // the page to include
! 'rev' => false, // the revision (defaults to most recent)
! 'quiet' => false, // if set, inclusion appears as normal content
! 'words' => false, // maximum number of words to include
! 'lines' => false, // maximum number of lines to include
! 'section' => false // include a named section
! );
}
function firstNWordsOfContent( $n, $content ) {
! $wordcount = 0;
$new = array( );
foreach ($content as $line) {
$words = explode(' ', $line);
if ($wordcount + count($words) > $n) {
! $new[] = implode(' ', array_slice($words, 0, $n - $wordcount))
. "... (first $n words)";
return $new;
***************
*** 58,70 ****
return array(sprintf(_("<%s: no such section>"), $section));
}
!
!
function error($msg) {
// FIXME: better error reporting?
trigger_error($msg, E_USER_NOTICE);
}
!
function run($dbi, $argstr, $request) {
!
extract($this->getArgs($argstr, $request));
--- 58,69 ----
return array(sprintf(_("<%s: no such section>"), $section));
}
!
function error($msg) {
// FIXME: better error reporting?
trigger_error($msg, E_USER_NOTICE);
}
!
function run($dbi, $argstr, $request) {
!
extract($this->getArgs($argstr, $request));
***************
*** 80,90 ****
return '';
}
!
! $p = $dbi->getPage($page);
!
if ($rev) {
$r = $p->getRevision($rev);
if (!$r) {
! $this->error(sprintf(_("%s(%d): no such revision"), $page, $rev));
return '';
}
--- 79,90 ----
return '';
}
!
! $p = $dbi->getPage($page);
!
if ($rev) {
$r = $p->getRevision($rev);
if (!$r) {
! $this->error(sprintf(_("%s(%d): no such revision"), $page,
! $rev));
return '';
}
***************
*** 99,103 ****
if ($lines)
$c = array_slice($c, 0, $lines);
! if ($words)
$c = $this->firstNWordsOfContent($words, $c);
--- 99,103 ----
if ($lines)
$c = array_slice($c, 0, $lines);
! if ($words)
$c = $this->firstNWordsOfContent($words, $c);
***************
*** 105,113 ****
$content = do_transform($c);
array_pop($included_pages);
!
if ($quiet) return $content;
return Element('p', array('class' => 'transclusion-title'),
! sprintf(_("Included from %s"), LinkExistingWikiWord($page)))
. Element('div', array('class' => 'transclusion'),
$content);
--- 105,114 ----
$content = do_transform($c);
array_pop($included_pages);
!
if ($quiet) return $content;
return Element('p', array('class' => 'transclusion-title'),
! sprintf(_("Included from %s"),
! LinkExistingWikiWord($page)))
. Element('div', array('class' => 'transclusion'),
$content);
***************
*** 122,133 ****
// text-decoration: underline;
// text-align: right;
! // }
//
! // DIV.transclusion {
// background: lightgreen;
// border: thin;
// border-style: solid;
! // padding-left: 0.8em;
! // padding-right: 0.8em;
// padding-top: 0px;
// padding-bottom: 0px;
--- 123,134 ----
// text-decoration: underline;
// text-align: right;
! // }
//
! // DIV.transclusion {
// background: lightgreen;
// border: thin;
// border-style: solid;
! // padding-left: 0.8em;
! // padding-right: 0.8em;
// padding-top: 0px;
// padding-bottom: 0px;
***************
*** 136,141 ****
// KNOWN ISSUES:
! // - line & word limit doesn't work if the included page itself includes a plugin
! // - we need an error reporting scheme
// For emacs users
--- 137,143 ----
// KNOWN ISSUES:
! // - line & word limit doesn't work if the included page itself
! // includes a plugin
! // - we need an error reporting scheme
// For emacs users
***************
*** 147,150 ****
// indent-tabs-mode: nil
// End:
!
! ?>
--- 149,151 ----
// indent-tabs-mode: nil
// End:
! ?>
\ No newline at end of file
Index: LikePages.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/LikePages.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** LikePages.php 2001/12/19 12:07:38 1.5
--- LikePages.php 2002/01/09 18:06:49 1.6
***************
*** 14,27 ****
function getDescription() {
! return sprintf(_("List LikePages for %s"),'[pagename]');
}
function getDefaultArguments() {
// FIXME: how to exclude multiple pages?
! return array('page' => false,
! 'prefix' => false,
! 'suffix' => false,
! 'exclude' => false,
! 'noheader' => false
);
}
--- 14,27 ----
function getDescription() {
! return sprintf(_("List LikePages for %s"), '[pagename]');
}
function getDefaultArguments() {
// FIXME: how to exclude multiple pages?
! return array('page' => false,
! 'prefix' => false,
! 'suffix' => false,
! 'exclude' => false,
! 'noheader' => false
);
}
***************
*** 37,46 ****
$suffix = false;
if (!$noheader)
! $html .= QElement('p', sprintf(_("Page names with prefix '%s'"),
$prefix));
}
elseif ($suffix) {
if (!$noheader)
! $html .= QElement('p', sprintf(_("Page names with suffix '%s'"),
$suffix));
}
--- 37,48 ----
$suffix = false;
if (!$noheader)
! $html .= QElement('p',
! sprintf(_("Page names with prefix '%s'"),
$prefix));
}
elseif ($suffix) {
if (!$noheader)
! $html .= QElement('p',
! sprintf(_("Page names with suffix '%s'"),
$suffix));
}
***************
*** 56,60 ****
if (!$noheader) {
$fs = _("These pages share an initial or final title word with '%s'");
! $html .= Element('p', sprintf(htmlspecialchars($fs), LinkWikiWord($page)));
}
}
--- 58,63 ----
if (!$noheader) {
$fs = _("These pages share an initial or final title word with '%s'");
! $html .= Element('p', sprintf(htmlspecialchars($fs),
! LinkWikiWord($page)));
}
}
***************
*** 64,72 ****
if (!empty($prefix)) {
$search[] = $this->_quote($prefix);
! $match[] = '^' . preg_quote($prefix, '/');
}
if (!empty($suffix)) {
$search[] = $this->_quote($suffix);
! $match[] = preg_quote($suffix, '/') . '$';
}
--- 67,75 ----
if (!empty($prefix)) {
$search[] = $this->_quote($prefix);
! $match[] = '^' . preg_quote($prefix, '/');
}
if (!empty($suffix)) {
$search[] = $this->_quote($suffix);
! $match[] = preg_quote($suffix, '/') . '$';
}
Index: MostPopular.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/MostPopular.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** MostPopular.php 2001/12/16 18:33:25 1.4
--- MostPopular.php 2002/01/09 18:06:49 1.5
***************
*** 10,31 ****
}
! function getDescription () {
return _("List the most popular pages");
}
!
function getDefaultArguments() {
// FIXME: how to exclude multiple pages?
! return array('limit' => 20,
! 'noheader' => 0);
}
function run($dbi, $argstr, $request) {
extract($this->getArgs($argstr, $request));
!
$pages = $dbi->mostPopular($limit);
$lines[] = $this->_tr(QElement('u', _("Hits")),
QElement('u', _("Page Name")));
!
while ($page = $pages->next()) {
$hits = $page->get('hits');
--- 10,31 ----
}
! function getDescription () {
return _("List the most popular pages");
}
!
function getDefaultArguments() {
// FIXME: how to exclude multiple pages?
! return array('limit' => 20,
! 'noheader' => 0);
}
function run($dbi, $argstr, $request) {
extract($this->getArgs($argstr, $request));
!
$pages = $dbi->mostPopular($limit);
$lines[] = $this->_tr(QElement('u', _("Hits")),
QElement('u', _("Page Name")));
!
while ($page = $pages->next()) {
$hits = $page->get('hits');
***************
*** 43,48 ****
$limit ? $limit : ''));
}
-
$html .= Element('blockquote',
Element('table', array('cellpadding' => 0,
--- 43,48 ----
$limit ? $limit : ''));
}
+
$html .= Element('blockquote',
Element('table', array('cellpadding' => 0,
***************
*** 58,62 ****
}
};
!
// Local Variables:
// mode: php
--- 58,62 ----
}
};
!
// Local Variables:
// mode: php
***************
*** 65,68 ****
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
! // End:
?>
--- 65,68 ----
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
! // End:
?>
Index: text2png.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/text2png.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** text2png.php 2001/12/27 18:11:28 1.7
--- text2png.php 2002/01/09 18:06:49 1.8
***************
*** 14,96 ****
return "text2png";
}
!
! function getDefaultArguments() {
global $LANG;
return array('text' => "Hello WikiWorld!",
'l' => $LANG );
}
-
- function run($dbi, $argstr, $request) {
- extract($this->getArgs($argstr, $request));
- return $this->text2png($text,$l);
- }
! function text2png($text,$l) {
- /**
- * Basic image creation and caching
- * You MUST delete the image cache yourself in /images if you change the
- * drawing routines!
- */
-
$filename = $text . ".png";
- /* FIXME: need something more elegant, and a way to gettext a different
- * language depending on any individual user's locale preferences.
- */
if ($l == "C") { $l = "en"; } //english=C
! $filepath = getcwd() . "/images/$l";
!
if (!file_exists($filepath ."/". $filename)) {
!
if (!file_exists($filepath)) {
! $oldumask = umask(0);
! // permissions affected by user the www server is running as
mkdir($filepath, 0777);
umask($oldumask);
}
!
! // add trailing slash to save some keystrokes later
$filepath .= "/";
!
! /* prepare a new image
! * FIXME: needs a dynamic image size depending on text width and height
! * $im = @ImageCreate(150, 50);
! */
if (empty($im)) {
$error_text = _("Unable to create a new GD image stream. PHP must be compiled with support for the GD library version 1.6 or later to create PNG image files.");
! // FIXME: Error manager does not transform URLs passed through it.
! $error_text .= QElement('a', array('href' => "http://www.php.net/manual/en/function.imagecreate.php",
! 'class' => 'rawurl'), "PHP web page");
trigger_error( $error_text, E_USER_NOTICE );
}
! // get ready to draw
$bg_color = ImageColorAllocate($im, 255, 255, 255);
$ttfont = "/System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Home/lib/fonts/LucidaSansRegular.ttf";
! /* http://download.php.net/manual/en/function.imagettftext.php
! * array imagettftext (int im, int size, int angle, int x, int y, int col,
! * string fontfile, string text)
! */
! // draw shadow
$text_color = ImageColorAllocate($im, 175, 175, 175);
! // shadow is 1 pixel down and 2 pixels right
ImageTTFText($im, 10, 0, 12, 31, $text_color, $ttfont, $text);
! // draw text
$text_color = ImageColorAllocate($im, 0, 0, 0);
ImageTTFText($im, 10, 0, 10, 30, $text_color, $ttfont, $text);
! /* An alternate text drawing method in case ImageTTFText
! * doesn't work.
! */
! #ImageString($im, 2, 10, 40, $text, $text_color);
!
! // To dump directly to browser:
! #header("Content-type: image/png");
! #ImagePng($im);
! // to save to file:
$success = ImagePng($im, $filepath . $filename);
--- 14,107 ----
return "text2png";
}
!
! function getDefaultArguments() {
global $LANG;
return array('text' => "Hello WikiWorld!",
'l' => $LANG );
}
! function run($dbi, $argstr, $request) {
! extract($this->getArgs($argstr, $request));
! return $this->text2png($text,$l);
! }
!
! function text2png($text,$l) {
!
! /**
! * Basic image creation and caching
! *
! * You MUST delete the image cache yourself in /images if you
! * change the drawing routines!
! */
$filename = $text . ".png";
+
+ /**
+ * FIXME: need something more elegant, and a way to gettext a
+ * different language depending on any individual
+ * user's locale preferences.
+ */
if ($l == "C") { $l = "en"; } //english=C
! $filepath = getcwd() . "/images/$l";
!
if (!file_exists($filepath ."/". $filename)) {
!
if (!file_exists($filepath)) {
! $oldumask = umask(0);
! // permissions affected by user the www server is running as
mkdir($filepath, 0777);
umask($oldumask);
}
!
! // add trailing slash to save some keystrokes later
$filepath .= "/";
!
! /**
! * prepare a new image
! *
! * FIXME: needs a dynamic image size depending on text
! * width and height $im = @ImageCreate(150, 50);
! */
!
if (empty($im)) {
$error_text = _("Unable to create a new GD image stream. PHP must be compiled with support for the GD library version 1.6 or later to create PNG image files.");
! // FIXME: Error manager does not transform URLs passed
! // through it.
! $error_text .= QElement('a',
! array('href' => "http://www.php.net/manual/en/function.imagecreate.php",
! 'class' => 'rawurl'),
! "PHP web page");
trigger_error( $error_text, E_USER_NOTICE );
}
! // get ready to draw
$bg_color = ImageColorAllocate($im, 255, 255, 255);
$ttfont = "/System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Home/lib/fonts/LucidaSansRegular.ttf";
! /* http://download.php.net/manual/en/function.imagettftext.php
! * array imagettftext (int im, int size, int angle, int x, int y,
! * int col, string fontfile, string text)
! */
! // draw shadow
$text_color = ImageColorAllocate($im, 175, 175, 175);
! // shadow is 1 pixel down and 2 pixels right
ImageTTFText($im, 10, 0, 12, 31, $text_color, $ttfont, $text);
! // draw text
$text_color = ImageColorAllocate($im, 0, 0, 0);
ImageTTFText($im, 10, 0, 10, 30, $text_color, $ttfont, $text);
! /**
! * An alternate text drawing method in case ImageTTFText
! * doesn't work.
! **/
! //ImageString($im, 2, 10, 40, $text, $text_color);
!
! // To dump directly to browser:
! //header("Content-type: image/png");
! //ImagePng($im);
! // to save to file:
$success = ImagePng($im, $filepath . $filename);
***************
*** 100,123 ****
}
! // create an <img src= tag to show the image!
$html = "";
if ($success > 0) {
if (defined('text2png_debug')) {
! switch($success) {
case 1:
trigger_error(sprintf(_("Image saved to cache file: %s"),
! $filepath . $filename), E_USER_NOTICE);
case 2:
trigger_error(sprintf(_("Image loaded from cache file: %s"),
! $filepath . $filename), E_USER_NOTICE);
}
}
$urlpath = DATA_PATH . "/images/$l/";
! $html .= Element('img', array('src' => $urlpath . $filename, 'alt' => $text));
} else {
trigger_error(sprintf(_("couldn't open file '%s' for writing"),
! $filepath . $filename), E_USER_NOTICE);
}
! return $html;
}
};
--- 111,137 ----
}
! // create an <img src= tag to show the image!
$html = "";
if ($success > 0) {
if (defined('text2png_debug')) {
! switch($success) {
case 1:
trigger_error(sprintf(_("Image saved to cache file: %s"),
! $filepath . $filename),
! E_USER_NOTICE);
case 2:
trigger_error(sprintf(_("Image loaded from cache file: %s"),
! $filepath . $filename),
! E_USER_NOTICE);
}
}
$urlpath = DATA_PATH . "/images/$l/";
! $html .= Element('img', array('src' => $urlpath . $filename,
! 'alt' => $text));
} else {
trigger_error(sprintf(_("couldn't open file '%s' for writing"),
! $filepath . $filename), E_USER_NOTICE);
}
! return $html;
}
};
Index: Toolbar.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/Toolbar.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** Toolbar.php 2002/01/08 23:20:55 1.8
--- Toolbar.php 2002/01/09 18:06:50 1.9
***************
*** 38,43 ****
function getDefaultArguments() {
return array('sep' => ',',
! 'label' => false,
! 'go' => false,
'style' => 'text',
'name' => '',
--- 38,43 ----
function getDefaultArguments() {
return array('sep' => ',',
! 'label' => '',
! 'go' => '',
'style' => 'text',
'name' => '',
***************
*** 133,141 ****
if ($style == "image") {
! $action = $name ."?days=" .$val;
! $imgurl = $rcimages[$text];
$links[] = $this->mkimglinks($text, $action, $imgurl);
} else {
! $action = 'phpwiki:' .$name ."?days=" .$val;
$links[] = $this->mklinks($text, $action);
}
--- 133,141 ----
if ($style == "image") {
! $action = $name ."?days=" .$val;
! $imgurl = $rcimages[$text];
$links[] = $this->mkimglinks($text, $action, $imgurl);
} else {
! $action = 'phpwiki:' .$name ."?days=" .$val;
$links[] = $this->mklinks($text, $action);
}
***************
*** 144,151 ****
if ($style == "image") {
$links = join("</td><td>", $links);
! $html = sprintf("<table summary=\"". $name ."\" border=0 cellspacing=0 cellpadding=0><tr valign=\"middle\"><td>" ._($label) ."</td>","<td>" .$links)."</tr></td>";
} else {
$links = join($sep, $links);
! $html = sprintf(_($label),$links);
}
--- 144,151 ----
if ($style == "image") {
$links = join("</td><td>", $links);
! $html = sprintf("<table summary=\"". $name ."\" border=0 cellspacing=0 cellpadding=0><tr valign=\"middle\"><td>" ._($label) ."</td>","<td>" .$links)."</tr></td>";
} else {
$links = join($sep, $links);
! $html = sprintf(_($label),$links);
}
***************
*** 153,157 ****
$links = "[" .str_replace(",", ("]" .$sep ."["), $go) ."]";
$links = do_transform($links, 'LinkTransform');
! $html = sprintf(_($label),$links);
}
--- 153,157 ----
$links = "[" .str_replace(",", ("]" .$sep ."["), $go) ."]";
$links = do_transform($links, 'LinkTransform');
! $html = sprintf(_($label),$links);
}
Index: UserPage.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/UserPage.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** UserPage.php 2001/12/28 11:12:21 1.3
--- UserPage.php 2002/01/09 18:06:50 1.4
***************
*** 95,98 ****
// indent-tabs-mode: nil
// End:
-
?>
--- 95,97 ----
|
|
From: Carsten K. <car...@us...> - 2002-01-09 17:40:31
|
Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory usw-pr-cvs1:/tmp/cvs-serv8188
Modified Files:
Calendar.php
Log Message:
Minor reindenting & rewrapping.
Index: Calendar.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/Calendar.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Calendar.php 2001/12/16 18:33:25 1.4
--- Calendar.php 2002/01/09 17:40:29 1.5
***************
*** 12,18 ****
// o Docs. Write a pgsrc/CalendarPlugin.
//
! // It would be nice to have some way to get from the individual
! // date pages back to the calendar page. (Subpage support might
! // make this easier.)
/**
--- 12,18 ----
// o Docs. Write a pgsrc/CalendarPlugin.
//
! // It would be nice to have some way to get from the individual date
! // pages back to the calendar page. (Subpage support might make this
! // easier.)
/**
***************
*** 28,32 ****
return _("Calendar");
}
!
function getDefaultArguments() {
// FIXME: how to exclude multiple pages?
--- 28,32 ----
return _("Calendar");
}
!
function getDefaultArguments() {
// FIXME: how to exclude multiple pages?
***************
*** 36,40 ****
'month' => '',
'month_offset' => 0,
!
'month_format' => '%B, %Y',
'wday_format' => '%a',
--- 36,40 ----
'month' => '',
'month_offset' => 0,
!
'month_format' => '%B, %Y',
'wday_format' => '%a',
***************
*** 42,61 ****
}
! function __header($pagename, $time) {
$args = &$this->args;
$t = localtime($time - SECONDS_PER_DAY, 1);
$prev_url = WikiURL($pagename, array('month' => $t['tm_mon'] + 1,
! 'year' => $t['tm_year'] + 1900));
!
$t = localtime($time + 32 * SECONDS_PER_DAY, 1);
$next_url = WikiURL($pagename, array('month' => $t['tm_mon'] + 1,
! 'year' => $t['tm_year'] + 1900));
! $prev = QElement('a', array('href' => $prev_url,
'class' => 'cal-arrow',
'title' => gettext("Previous Month")),
'<');
! $next = QElement('a', array('href' => $next_url,
'class' => 'cal-arrow',
'title' => gettext("Next Month")),
--- 42,61 ----
}
! function __header($pagename, $time) {
$args = &$this->args;
$t = localtime($time - SECONDS_PER_DAY, 1);
$prev_url = WikiURL($pagename, array('month' => $t['tm_mon'] + 1,
! 'year' => $t['tm_year'] + 1900));
!
$t = localtime($time + 32 * SECONDS_PER_DAY, 1);
$next_url = WikiURL($pagename, array('month' => $t['tm_mon'] + 1,
! 'year' => $t['tm_year'] + 1900));
! $prev = QElement('a', array('href' => $prev_url,
'class' => 'cal-arrow',
'title' => gettext("Previous Month")),
'<');
! $next = QElement('a', array('href' => $next_url,
'class' => 'cal-arrow',
'title' => gettext("Next Month")),
***************
*** 63,67 ****
! $row = Element('td', array('align' => 'left'), $prev);
$row .= Element('td', array('align' => 'center'),
QElement('b', array('class' => 'cal-header'),
--- 63,67 ----
! $row = Element('td', array('align' => 'left'), $prev);
$row .= Element('td', array('align' => 'center'),
QElement('b', array('class' => 'cal-header'),
***************
*** 73,89 ****
return Element('tr', Element('td', array('colspan' => 7,
! 'align' => 'center'),
$row));
}
!
function __daynames($start_wday) {
! $time = mktime(12, 0, 0, 1, 1, 2001);
! $t = localtime($time, 1);
$time += (7 + $start_wday - $t['tm_wday']) * SECONDS_PER_DAY;
$t = localtime($time, 1);
assert($t['tm_wday'] == $start_wday);
!
$fs = $this->args['wday_format'];
for ($i = 0; $i < 7; $i++) {
--- 73,89 ----
return Element('tr', Element('td', array('colspan' => 7,
! 'align' => 'center'),
$row));
}
!
function __daynames($start_wday) {
! $time = mktime(12, 0, 0, 1, 1, 2001);
! $t = localtime($time, 1);
$time += (7 + $start_wday - $t['tm_wday']) * SECONDS_PER_DAY;
$t = localtime($time, 1);
assert($t['tm_wday'] == $start_wday);
!
$fs = $this->args['wday_format'];
for ($i = 0; $i < 7; $i++) {
***************
*** 99,105 ****
$args = &$this->args;
! $page_for_date = $args['prefix'] . strftime($args['date_format'], $time);
$t = localtime($time, 1);
!
if ($dbi->isWikiPage($page_for_date)) {
$date = Element('a', array('class' => 'cal-day',
--- 99,106 ----
$args = &$this->args;
! $page_for_date = $args['prefix'] . strftime($args['date_format'],
! $time);
$t = localtime($time, 1);
!
if ($dbi->isWikiPage($page_for_date)) {
$date = Element('a', array('class' => 'cal-day',
***************
*** 109,116 ****
}
else {
! $date = QElement('a', array('class' => 'cal-hide',
! 'href' => WikiURL($page_for_date,
! array('action' => 'edit')),
! 'title' => sprintf(_("Edit %s"), $page_for_date)),
$t['tm_mday']);
}
--- 110,118 ----
}
else {
! $date = QElement('a',
! array('class' => 'cal-hide',
! 'href' => WikiURL($page_for_date,
! array('action' => 'edit')),
! 'title' => sprintf(_("Edit %s"), $page_for_date)),
$t['tm_mday']);
}
***************
*** 119,141 ****
" ${date} ");
}
!
function run($dbi, $argstr, $request) {
$this->args = $this->getArgs($argstr, $request);
! $args = &$this->args;
$now = localtime(time(), 1);
foreach ( array('month' => $now['tm_mon'] + 1,
! 'year' => $now['tm_year'] + 1900)
! as $param => $dflt) {
if (!($args[$param] = intval($args[$param])))
! $args[$param] = $dflt;
!
}
! $time = mktime(12, 0, 0, // hh, mm, ss,
$args['month'] + $args['month_offset'], // month (1-12)
! 1, // mday (1-31)
$args['year']);
!
$rows[] = $this->__header($request->getArg('pagename'), $time);
$rows[] = $this->__daynames($args['start_wday']);
--- 121,144 ----
" ${date} ");
}
!
function run($dbi, $argstr, $request) {
$this->args = $this->getArgs($argstr, $request);
! $args = &$this->args;
$now = localtime(time(), 1);
foreach ( array('month' => $now['tm_mon'] + 1,
! 'year' => $now['tm_year'] + 1900)
! as $param => $dflt ) {
!
if (!($args[$param] = intval($args[$param])))
! $args[$param] = $dflt;
!
}
! $time = mktime(12, 0, 0, // hh, mm, ss,
$args['month'] + $args['month_offset'], // month (1-12)
! 1, // mday (1-31)
$args['year']);
!
$rows[] = $this->__header($request->getArg('pagename'), $time);
$rows[] = $this->__daynames($args['start_wday']);
***************
*** 145,149 ****
$row = $col > 0 ? Element('td', array('colspan' => $col)) : '';
$done = false;
!
while (!$done) {
$row .= $this->__date($dbi, $time);
--- 148,152 ----
$row = $col > 0 ? Element('td', array('colspan' => $col)) : '';
$done = false;
!
while (!$done) {
$row .= $this->__date($dbi, $time);
***************
*** 151,171 ****
if (++$col % 7 == 0) {
$rows[] = Element('tr', $row);
! $col = 0;
! $row = '';
}
!
$time += SECONDS_PER_DAY;
! $t = localtime($time, 1);
! $done = $t['tm_mday'] == 1;
}
if ($row) {
! $row .= Element('td', array('colspan' => (42 - $col) % 7));
$rows[] = Element('tr', $row);
}
!
return Element('table', array('cellspacing' => 0,
'cellpadding' => 2,
! 'class' => 'cal'),
"\n" . join("\n", $rows) . "\n");
}
--- 154,174 ----
if (++$col % 7 == 0) {
$rows[] = Element('tr', $row);
! $col = 0;
! $row = '';
}
!
$time += SECONDS_PER_DAY;
! $t = localtime($time, 1);
! $done = $t['tm_mday'] == 1;
}
if ($row) {
! $row .= Element('td', array('colspan' => (42 - $col) % 7));
$rows[] = Element('tr', $row);
}
!
return Element('table', array('cellspacing' => 0,
'cellpadding' => 2,
! 'class' => 'cal'),
"\n" . join("\n", $rows) . "\n");
}
|
|
From: Carsten K. <car...@us...> - 2002-01-09 17:30:42
|
Update of /cvsroot/phpwiki/phpwiki/lib In directory usw-pr-cvs1:/tmp/cvs-serv4142 Modified Files: display.php Log Message: Minor reindenting & rewrapping. Index: display.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/display.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** display.php 2001/12/11 22:41:40 1.12 --- display.php 2002/01/09 17:30:39 1.13 *************** *** 15,19 **** * Alex Schroeder <ken...@ya...>. * ! * Use the first paragraph in the page which contains at least two sentences. * * @see http://www.usemod.com/cgi-bin/mb.pl?MeatballWikiSuggestions --- 15,20 ---- * Alex Schroeder <ken...@ya...>. * ! * Use the first paragraph in the page which contains at least two ! * sentences. * * @see http://www.usemod.com/cgi-bin/mb.pl?MeatballWikiSuggestions *************** *** 42,65 **** function displayPage($dbi, $request) { ! $pagename = $request->getArg('pagename'); ! $version = $request->getArg('version'); ! $page = $dbi->getPage($pagename); ! if ($version) { ! $revision = $page->getRevision($version); ! if (!$revision) ! NoSuchRevision($page, $version); ! } ! else { ! $revision = $page->getCurrentRevision(); ! } ! $template = new WikiTemplate('BROWSE'); ! $template->setPageRevisionTokens($revision); ! $template->replace('CONTENT', do_transform($revision->getContent())); ! $template->qreplace('PAGE_DESCRIPTION', GleanDescription($revision)); ! echo $template->getExpansion(); ! flush(); ! $page->increaseHitCount(); } --- 43,66 ---- function displayPage($dbi, $request) { ! $pagename = $request->getArg('pagename'); ! $version = $request->getArg('version'); ! $page = $dbi->getPage($pagename); ! if ($version) { ! $revision = $page->getRevision($version); ! if (!$revision) ! NoSuchRevision($page, $version); ! } ! else { ! $revision = $page->getCurrentRevision(); ! } ! $template = new WikiTemplate('BROWSE'); ! $template->setPageRevisionTokens($revision); ! $template->replace('CONTENT', do_transform($revision->getContent())); ! $template->qreplace('PAGE_DESCRIPTION', GleanDescription($revision)); ! echo $template->getExpansion(); ! flush(); ! $page->increaseHitCount(); } |
|
From: Carsten K. <car...@us...> - 2002-01-09 17:28:29
|
Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv2874
Modified Files:
ErrorManager.php
Log Message:
Rewrapped comments. Minor reindenting in emacs.
Index: ErrorManager.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/ErrorManager.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** ErrorManager.php 2001/12/28 09:53:06 1.5
--- ErrorManager.php 2002/01/09 17:28:26 1.6
***************
*** 12,16 ****
* A class which allows custom handling of PHP errors.
*
! * This is a singleton class. There should only be one instance
* of it --- you can access the one instance via $GLOBALS['ErrorManager'].
*
--- 12,16 ----
* A class which allows custom handling of PHP errors.
*
! * This is a singleton class. There should only be one instance
* of it --- you can access the one instance via $GLOBALS['ErrorManager'].
*
***************
*** 30,34 ****
$this->_postpone_mask = 0;
$this->_postponed_errors = array();
!
set_error_handler('ErrorManager_errorHandler');
}
--- 30,34 ----
$this->_postpone_mask = 0;
$this->_postponed_errors = array();
!
set_error_handler('ErrorManager_errorHandler');
}
***************
*** 70,98 ****
* Push a custom error handler on the handler stack.
*
! * Sometimes one is performing an operation where one expects certain errors
! * or warnings. In this case, one might not want these errors reported
! * in the normal manner. Installing a custom error handler via this method
! * allows one to intercept such errors.
*
* An error handler installed via this method should be either a
! * function or an object method taking one argument: a PhpError object.
*
* The error handler should return either:
* <dl>
! * <dt> False <dd> If it has not handled the error. In this case, error
! * processing will proceed as if the handler had never been called:
! * the error will be passed to the next handler in the stack,
! * or the default handler, if there are no more handlers in the stack.
! * <dt> True <dd> If the handler has handled the error. If the error was
! * a non-fatal one, no further processing will be done.
! * If it was a fatal error, the ErrorManager will still
! * terminate the PHP process (see setFatalHandler.)
! * <dt> A PhpError object
! * <dd> The error is not considered
! * handled, and will be passed on to the next handler(s) in the stack
! * (or the default handler).
! * The returned PhpError need not be the same as the one passed to the
! * handler. This allows the handler to "adjust" the error message.
! *
* @access public
* @param $handler WikiCallback Handler to call.
--- 70,107 ----
* Push a custom error handler on the handler stack.
*
! * Sometimes one is performing an operation where one expects
! * certain errors or warnings. In this case, one might not want
! * these errors reported in the normal manner. Installing a custom
! * error handler via this method allows one to intercept such
! * errors.
*
* An error handler installed via this method should be either a
! * function or an object method taking one argument: a PhpError
! * object.
*
* The error handler should return either:
* <dl>
! * <dt> False <dd> If it has not handled the error. In this case,
! * error processing will proceed as if the handler
! * had never been called: the error will be passed
! * to the next handler in the stack, or the
! * default handler, if there are no more handlers
! * in the stack.
! *
! * <dt> True <dd> If the handler has handled the error. If the
! * error was a non-fatal one, no further processing
! * will be done. If it was a fatal error, the
! * ErrorManager will still terminate the PHP
! * process (see setFatalHandler.)
! *
! * <dt> A PhpError object <dd> The error is not considered
! * handled, and will be passed on to
! * the next handler(s) in the stack
! * (or the default handler). The
! * returned PhpError need not be the
! * same as the one passed to the
! * handler. This allows the handler to
! * "adjust" the error message.
! * </dl>
* @access public
* @param $handler WikiCallback Handler to call.
***************
*** 113,118 ****
* Set a termination handler.
*
! * This handler will be called upon fatal errors. The handler gets passed
! * one argument: a PhpError object describing the fatal error.
*
* @access public
--- 122,128 ----
* Set a termination handler.
*
! * This handler will be called upon fatal errors. The handler
! * gets passed one argument: a PhpError object describing the
! * fatal error.
*
* @access public
***************
*** 126,131 ****
* Handle an error.
*
! * The error is passed through any registered error handlers,
! * and then either reported or postponed.
*
* @access public
--- 136,141 ----
* Handle an error.
*
! * The error is passed through any registered error handlers, and
! * then either reported or postponed.
*
* @access public
***************
*** 134,138 ****
function handleError($error) {
static $in_handler;
!
if (!empty($in_handler)) {
echo "<p>ErrorManager: "._("error while handling error:")."</p>\n";
--- 144,148 ----
function handleError($error) {
static $in_handler;
!
if (!empty($in_handler)) {
echo "<p>ErrorManager: "._("error while handling error:")."</p>\n";
***************
*** 141,145 ****
}
$in_handler = true;
!
foreach ($this->_handlers as $handler) {
$result = $handler->call($error);
--- 151,155 ----
}
$in_handler = true;
!
foreach ($this->_handlers as $handler) {
$result = $handler->call($error);
***************
*** 148,153 ****
}
elseif (is_object($result)) {
! // handler filtered the result. Still should pass to the
! // rest of the chain.
if ($error->isFatal()) {
// Don't let handlers make fatal errors non-fatal.
--- 158,163 ----
}
elseif (is_object($result)) {
! // handler filtered the result. Still should pass to
! // the rest of the chain.
if ($error->isFatal()) {
// Don't let handlers make fatal errors non-fatal.
***************
*** 172,176 ****
}
else if (($error->errno & error_reporting()) != 0) {
! if (($error->errno & $this->_postpone_mask) != 0) {
$this->_postponed_errors[] = $error;
}
--- 182,186 ----
}
else if (($error->errno & error_reporting()) != 0) {
! if (($error->errno & $this->_postpone_mask) != 0) {
$this->_postponed_errors[] = $error;
}
***************
*** 192,196 ****
exit -1;
}
!
/**
* @access private
--- 202,206 ----
exit -1;
}
!
/**
* @access private
***************
*** 210,215 ****
* Global error handler for class ErrorManager.
*
! * This is necessary since PHP's set_error_handler() does not allow one to
! * set an object method as a handler.
*
* @access private
--- 220,225 ----
* Global error handler for class ErrorManager.
*
! * This is necessary since PHP's set_error_handler() does not allow
! * one to set an object method as a handler.
*
* @access private
***************
*** 252,263 ****
/**
* Construct a new PhpError.
! * @param $errno int
! * @param $errstr string
* @param $errfile string
* @param $errline int
*/
function PhpError($errno, $errstr, $errfile, $errline) {
! $this->errno = $errno;
! $this->errstr = $errstr;
$this->errfile = $errfile;
$this->errline = $errline;
--- 262,273 ----
/**
* Construct a new PhpError.
! * @param $errno int
! * @param $errstr string
* @param $errfile string
* @param $errline int
*/
function PhpError($errno, $errstr, $errfile, $errline) {
! $this->errno = $errno;
! $this->errstr = $errstr;
$this->errfile = $errfile;
$this->errline = $errline;
***************
*** 335,338 ****
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
! // End:
?>
--- 345,348 ----
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
! // End:
?>
|
|
From: Carsten K. <car...@us...> - 2002-01-09 17:15:34
|
Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv30563
Modified Files:
FileFinder.php
Log Message:
Minor reindenting and rewrapping in emacs.
Index: FileFinder.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/FileFinder.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** FileFinder.php 2001/12/28 09:53:11 1.5
--- FileFinder.php 2002/01/09 17:15:31 1.6
***************
*** 36,46 ****
return $missing_okay ? false : $this->_not_found($file);
}
!
/**
* Try to include file.
*
* If file is found in the path, then the files directory is added
! * to PHP's include_path (if it's not already there.) Then
! * the file is include_once()'d.
*
* @param $file string File to include.
--- 36,46 ----
return $missing_okay ? false : $this->_not_found($file);
}
!
/**
* Try to include file.
*
* If file is found in the path, then the files directory is added
! * to PHP's include_path (if it's not already there.) Then the
! * file is include_once()'d.
*
* @param $file string File to include.
***************
*** 57,61 ****
}
}
!
return $this->_not_found($file);
}
--- 57,61 ----
}
}
!
return $this->_not_found($file);
}
***************
*** 71,75 ****
return ereg('^/', $path);
}
!
/**
* Report a "file not found" error.
--- 71,75 ----
return ereg('^/', $path);
}
!
/**
* Report a "file not found" error.
***************
*** 83,88 ****
return false;
}
!
!
/**
* Search our path for a file.
--- 83,88 ----
return false;
}
!
!
/**
* Search our path for a file.
***************
*** 101,105 ****
/**
! * The system-dependent path-separator character. On UNIX systems,
* this character is ':'; on Win32 systems it is ';'.
*
--- 101,105 ----
/**
! * The system-dependent path-separator character. On UNIX systems,
* this character is ':'; on Win32 systems it is ';'.
*
***************
*** 110,114 ****
return preg_match('/^Windows/', php_uname()) ? ';' : ':';
}
!
/**
* Get the value of PHP's include_path.
--- 110,114 ----
return preg_match('/^Windows/', php_uname()) ? ';' : ':';
}
!
/**
* Get the value of PHP's include_path.
***************
*** 123,132 ****
return explode($this->_get_path_separator(), $path);
}
!
/**
* Add a directory to the end of PHP's include_path.
*
! * The directory is appended only if it is not already listed
! * in the include_path.
*
* @access private
--- 123,132 ----
return explode($this->_get_path_separator(), $path);
}
!
/**
* Add a directory to the end of PHP's include_path.
*
! * The directory is appended only if it is not already listed in
! * the include_path.
*
* @access private
***************
*** 142,152 ****
* Some (buggy) PHP's (notable SourceForge's PHP 4.0.6)
* sometimes don't seem to heed their include_path.
! * I.e. sometimes a file is not found even though it seems
! * to be in the current include_path.
! * A simple ini_set('include_path', ini_get('include_path'))
! * seems to be enough to fix the problem
*
! * This following line should be in the above if-block,
! * but we put it here, as it seems to work-around the bug.
*/
ini_set('include_path', implode($this->_get_path_separator(), $path));
--- 142,152 ----
* Some (buggy) PHP's (notable SourceForge's PHP 4.0.6)
* sometimes don't seem to heed their include_path.
! * I.e. sometimes a file is not found even though it seems to
! * be in the current include_path. A simple
! * ini_set('include_path', ini_get('include_path')) seems to
! * be enough to fix the problem
*
! * This following line should be in the above if-block, but we
! * put it here, as it seems to work-around the bug.
*/
ini_set('include_path', implode($this->_get_path_separator(), $path));
***************
*** 157,171 ****
* A class for finding PEAR code.
*
! * This is a subclass of FileFinder which searches a standard list of directories
! * where PEAR code is likely to be installed.
*
* Example usage:
* <pre>
* $pearFinder = new PearFileFinder;
* $pearFinder->includeOnce('DB.php');
* </pre>
! * The above code will look for 'DB.php', if found, the directory in which it was
! * found will be added to PHP's include_path, and the file will be included.
! * (If the file is not found, and E_USER_ERROR will be thrown.)
*/
class PearFileFinder
--- 157,174 ----
* A class for finding PEAR code.
*
! * This is a subclass of FileFinder which searches a standard list of
! * directories where PEAR code is likely to be installed.
*
* Example usage:
+ *
* <pre>
* $pearFinder = new PearFileFinder;
* $pearFinder->includeOnce('DB.php');
* </pre>
! *
! * The above code will look for 'DB.php', if found, the directory in
! * which it was found will be added to PHP's include_path, and the
! * file will be included. (If the file is not found, and E_USER_ERROR
! * will be thrown.)
*/
class PearFileFinder
***************
*** 195,204 ****
* Find PhpWiki localized files.
*
! * This is a subclass of FileFinder which searches PHP's include_path for
! * files. It looks first for "locale/$LANG/$file", then for "$file".
*
* If $LANG is something like "de_DE.iso8859-1@euro", this class will
! * also search under various less specific variations like "de_DE.iso8859-1",
! * "de_DE" and "de".
*/
class LocalizedFileFinder
--- 198,208 ----
* Find PhpWiki localized files.
*
! * This is a subclass of FileFinder which searches PHP's include_path
! * for files. It looks first for "locale/$LANG/$file", then for
! * "$file".
*
* If $LANG is something like "de_DE.iso8859-1@euro", this class will
! * also search under various less specific variations like
! * "de_DE.iso8859-1", "de_DE" and "de".
*/
class LocalizedFileFinder
***************
*** 214,218 ****
$lang = $this->_get_lang();
assert(!empty($lang));
!
// A locale can be, e.g. de_DE.iso8859-1@euro.
// Try less specific versions of the locale:
--- 218,222 ----
$lang = $this->_get_lang();
assert(!empty($lang));
!
// A locale can be, e.g. de_DE.iso8859-1@euro.
// Try less specific versions of the locale:
***************
*** 247,256 ****
return $lang;
}
!
return "C";
}
}
!
// Local Variables:
// mode: php
--- 251,260 ----
return $lang;
}
!
return "C";
}
}
!
// Local Variables:
// mode: php
***************
*** 259,262 ****
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
! // End:
?>
--- 263,266 ----
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
! // End:
?>
|
286 messages has been excluded from this view by a project administrator.
