Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[7508] trunk
|
From: <ru...@us...> - 2010-06-09 10:34:13
|
Revision: 7508
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7508&view=rev
Author: rurban
Date: 2010-06-09 10:34:03 +0000 (Wed, 09 Jun 2010)
Log Message:
-----------
move lib/updateinterwikimap shell script to admin
index.php: gforge should symlink or copy the config, as everybody else
update TODO
Modified Paths:
--------------
trunk/TODO
trunk/favicon.ico
trunk/index.php
trunk/tests/unit/lib/SetupWiki.php
Added Paths:
-----------
trunk/admin/updateinterwikimap
Removed Paths:
-------------
trunk/lib/updateinterwikimap
Modified: trunk/TODO
===================================================================
--- trunk/TODO 2010-06-09 10:10:41 UTC (rev 7507)
+++ trunk/TODO 2010-06-09 10:34:03 UTC (rev 7508)
@@ -1,32 +1,20 @@
-1.3.15 2009-06-05 rurban:
-* finish new themes/Sidebar
-* check new mass rename
-* check for AJAX format=xml errors
-* beautify result of empty AJAX format=xml pages.
- no bordered div, which looks like <HR>
-
short-term TODO:
* rename should check existing subpages and rename these also.
* Sidebar: merge AVL theme (internal MonoBook derivate with customizable
box states) with Sidebar
* clarify issues with pagenames: "," breaks PageList. Escape with "~" or "\"?
+ or htmlencode forbidden chars.
* fix Wikiwys with prettyurl, link labels and killing plugin args
-* ImportMediaWiki, ImportRdf, ImportOwl, ExportMediaWiki, ExportRdf, ExportOwl
-* WikiUser/OpenID (from DokuWiki) - Status::in_work
-* more meta stuff: OpenSearch, format=dc (Dublin Core)
-* support missing REST interfaces (optional): action=remove => DELETE,
- action=editpage and minor updates (rating,...) => PUT.
- with fallbacks to POST
-* format=mm (FreeMind) for RecentChanges, SemanticWeb's and simple PageList's.
- See http://wikkawiki.org/FreeMind. Maybe format=mmap for the commercial MindMap.
-* format=printable (?) for non js/dom
* WatchList (?)
-* Spellcheck AJAX backend (see DokuWiki)
-* GeSHi Highlighter plugin
-TODO for 1.4.0:
+TODO:
architecture:
+* flush <head> before <body> to parallelize css/js requests
* Optimization: try template_lite or try simple regex replacements as before.
+* Evaluate some xml syntax for plugins (as in MediaWiki):
+ <IncludePages pages=<plugin-list BackLinks/> />
+ <BackLink include_self=false />
+4 And/or fix PLUGIN_MARKUP_MAP aliases which break the InlineParser.
* Fix postgresql stored procedures.
* Move serialized data from page_data / version_data to seperate SQL columns.
* WikiDB hooks. (?)
@@ -47,6 +35,16 @@
* lang: mapping
* fix ENABLE_MARKUP_DIVSPAN
* WikiUser/EMailConfirm (?)
+* ImportMediaWiki, ImportRdf, ImportOwl, ExportMediaWiki, ExportRdf, ExportOwl
+* WikiUser/OpenID (from DokuWiki) - Status::in_work
+* more meta stuff: OpenSearch, format=dc (Dublin Core)
+* support missing REST interfaces (optional): action=remove => DELETE,
+ action=editpage and minor updates (rating,...) => PUT.
+ with fallbacks to POST
+* format=mm (FreeMind) for RecentChanges, SemanticWeb's and simple PageList's.
+ See http://wikkawiki.org/FreeMind. Maybe format=mmap for the commercial MindMap.
+* Spellcheck AJAX backend (see DokuWiki)
+* GeSHi Highlighter plugin
fixes:
* fix pagelist nopage unification (store just key as names?)
@@ -54,6 +52,7 @@
* SQL textsearch with multiple words: AND
(the two new failing unit tests)
* fix textsearch optimize with "word -word -word"
+* format=printable (?) for non js/dom
OLDER TODO's:
Maybe (probably defer):
Copied: trunk/admin/updateinterwikimap (from rev 7497, trunk/lib/updateinterwikimap)
===================================================================
--- trunk/admin/updateinterwikimap (rev 0)
+++ trunk/admin/updateinterwikimap 2010-06-09 10:34:03 UTC (rev 7508)
@@ -0,0 +1,37 @@
+#!/bin/sh
+# cd lib
+# ../admin/updateinterwikimap
+currentfile=interwiki.map
+backupfile=/tmp/${currentfile}.bak
+downloadfile=/tmp/intermap.txt
+newfile=/tmp/${currentfile}
+tempfile=/tmp/intermap.tmp
+
+echo "Downloading latest InterWikiMap from PhpWiki SVN"
+svns up ${currentfile}
+
+echo "Downloading latest InterWikiMap from Usemod"
+curl http://usemod.com/intermap.txt -o ${downloadfile}
+
+echo "Backing up current ${currentfile} to ${backupfile}"
+cp -p ${currentfile} ${backupfile}
+
+echo "merging ${downloadfile} with installed ${currentfile}"
+cat ${downloadfile} > ${tempfile}
+cat ${backupfile} >> ${tempfile}
+cat ${tempfile} | sort -f | uniq > ${newfile}
+
+echo "Installing updated InterWikiMap"
+install -m 0644 ${newfile} ${currentfile}
+rm ${downloadfile} ${tempfile} ${newfile}
+
+echo "The following new InterWikiMap entries were found:"
+diff -u0 ${backupfile} ${currentfile}
+
+echo "Comparing with PhpWiki SVN:"
+svn diff ${currentfile}
+
+echo "*** You must check ${currentfile} for duplicates or other problems. ***"
+echo "*** The backup file is: ${backupfile}. ***"
+
+echo "Done."
Modified: trunk/favicon.ico
===================================================================
(Binary files differ)
Modified: trunk/index.php
===================================================================
--- trunk/index.php 2010-06-09 10:10:41 UTC (rev 7507)
+++ trunk/index.php 2010-06-09 10:34:03 UTC (rev 7508)
@@ -30,14 +30,10 @@
*/
require_once (dirname(__FILE__).'/lib/prepend.php');
-// rcs_id('$Id$');
+//rcs_id('$Id$');
require_once(dirname(__FILE__).'/lib/IniConfig.php');
-if (!defined('GFORGE') or !GFORGE) {
- IniConfig(dirname(__FILE__)."/config/config.ini");
-} else {
- IniConfig(dirname(__FILE__)."/config/config-default.ini");
-}
+IniConfig(dirname(__FILE__)."/config/config.ini");
////////////////////////////////////////////////////////////////
// PrettyWiki
Deleted: trunk/lib/updateinterwikimap
===================================================================
--- trunk/lib/updateinterwikimap 2010-06-09 10:10:41 UTC (rev 7507)
+++ trunk/lib/updateinterwikimap 2010-06-09 10:34:03 UTC (rev 7508)
@@ -1,36 +0,0 @@
-#!/bin/sh
-# updateinterwikimap
-currentfile=interwiki.map
-backupfile=/tmp/${currentfile}.bak
-downloadfile=/tmp/intermap.txt
-newfile=/tmp/${currentfile}
-tempfile=/tmp/intermap.tmp
-
-echo "Downloading latest InterWikiMap from PhpWiki CVS"
-cvs up ${currentfile}
-
-echo "Downloading latest InterWikiMap from Usemod"
-curl http://usemod.com/intermap.txt -o ${downloadfile}
-
-echo "Backing up current ${currentfile} to ${backupfile}"
-cp -p ${currentfile} ${backupfile}
-
-echo "merging ${downloadfile} with installed ${currentfile}"
-cat ${downloadfile} > ${tempfile}
-cat ${backupfile} >> ${tempfile}
-cat ${tempfile} | sort -f | uniq > ${newfile}
-
-echo "Installing updated InterWikiMap"
-install -m 0644 ${newfile} ${currentfile}
-rm ${downloadfile} ${tempfile} ${newfile}
-
-echo "The following new InterWikiMap entries were found:"
-diff -u0 ${backupfile} ${currentfile}
-
-echo "Comparing with PhpWiki CVS:"
-cvs diff ${currentfile}
-
-echo "*** You must check ${currentfile} for duplicates or other problems. ***"
-echo "*** The backup file is: ${backupfile}. ***"
-
-echo "Done."
Modified: trunk/tests/unit/lib/SetupWiki.php
===================================================================
--- trunk/tests/unit/lib/SetupWiki.php 2010-06-09 10:10:41 UTC (rev 7507)
+++ trunk/tests/unit/lib/SetupWiki.php 2010-06-09 10:34:03 UTC (rev 7508)
@@ -22,9 +22,11 @@
}
/* PCRE memory problem (crash) with such big pages and anchored blocks */
+ /*
+ // Broken since r.7418
function testOldMarkupTestPage() {
$this->_loadPage('Help/OldMarkupTestPage');
- }
+ }*/
/* ADODB set_links _id_cache error: IncludePagePlugin => HomePage */
function testIncludePagePlugin() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
