Menu
▾
▴
[phpwiki-checkins] CVS: phpwiki/lib HtmlElement.php,1.22,1.23 Request.php,1.14,1.15 Theme.php,1.50,1.51 WikiDB.php,1.12,1.13 interwiki.php,1.20,1.21 main.php,1.69,1.70 stdlib.php,1.114,1.115
|
From: Reini U. <ru...@us...> - 2002-08-24 13:19:00
|
Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv8419/lib
Modified Files:
HtmlElement.php Request.php Theme.php WikiDB.php interwiki.php
main.php stdlib.php
Log Message:
new PrevNext plugin with two buttons
more docs, the buttonfinder supports now gif also.
interwiki.map warning now removable.
Index: HtmlElement.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/HtmlElement.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -2 -b -p -d -r1.22 -r1.23
--- HtmlElement.php 22 Aug 2002 23:28:31 -0000 1.22
+++ HtmlElement.php 24 Aug 2002 13:18:56 -0000 1.23
@@ -411,6 +411,11 @@ function HiddenInputs ($query_args, $pfx
function HiddenGets ($exclude = array()) {
- global $request;
- HiddenInputs($request->getArgs(), false, $exclude);
+ global $HTTP_GET_VARS;
+ HiddenInputs($HTTP_GET_VARS, false, $exclude);
+}
+
+function HiddenPosts ($exclude = array()) {
+ global $HTTP_POST_VARS;
+ HiddenInputs($HTTP_POST_VARS, false, $exclude);
}
Index: Request.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Request.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -2 -b -p -d -r1.14 -r1.15
--- Request.php 22 Aug 2002 23:28:31 -0000 1.14
+++ Request.php 24 Aug 2002 13:18:56 -0000 1.15
@@ -67,4 +67,5 @@ class Request {
}
+ // Well oh well. Do we really want to pass POST params back as GET?
function getURLtoSelf($args = false) {
$get_args = $this->args;
Index: Theme.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Theme.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -2 -b -p -d -r1.50 -r1.51
--- Theme.php 22 Aug 2002 23:28:31 -0000 1.50
+++ Theme.php 24 Aug 2002 13:18:56 -0000 1.51
@@ -530,4 +530,10 @@ class Theme {
$url = preg_replace('|([^/]+)$|e', 'urlencode("\\1")', $url);
}
+ if (!$url) {// Jeff complained about png not supported everywhere. This is not PC
+ $url = $this->_findButton("$qtext.gif");
+ if ($url && strstr($url, '%')) {
+ $url = preg_replace('|([^/]+)$|e', 'urlencode("\\1")', $url);
+ }
+ }
return $url;
}
Index: WikiDB.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiDB.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -2 -b -p -d -r1.12 -r1.13
--- WikiDB.php 23 Aug 2002 18:29:29 -0000 1.12
+++ WikiDB.php 24 Aug 2002 13:18:56 -0000 1.13
@@ -660,6 +660,9 @@ class WikiDB_Page
* <dt>'locked'<dd> Is page locked?
* <dt>'hits' <dd> Page hit counter.
- * <dt>'user' <dd> User Homepage
- * <dt>'group' <dd> Group list
+ * <dt>'pref' <dd> Users preferences, stored in homepages.
+ * <dt>'owner' <dd> Default: first author_id. We might add a group with a dot here:
+ * E.g. "owner.users"
+ * <dt>'perm' <dd> Permission flag to authorize read/write/execution of
+ * page-headers and content.
* <dt>'score' <dd> Page score (not yet implement, do we need?)
* </dl>
Index: interwiki.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/interwiki.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -2 -b -p -d -r1.20 -r1.21
--- interwiki.php 8 Feb 2002 02:58:32 -0000 1.20
+++ interwiki.php 24 Aug 2002 13:18:56 -0000 1.21
@@ -86,6 +86,8 @@ class InterWikiMap {
function _getMapFromFile ($filename) {
+ if (defined('WARN_NONPUBLIC_INTERWIKIMAP') and WARN_NONPUBLIC_INTERWIKIMAP) {
$error_html = sprintf(_("Loading InterWikiMap from external file %s."), $filename);
trigger_error( $error_html, E_USER_NOTICE );
+ }
@$fd = fopen ($filename, "rb");
Index: main.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/main.php,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -2 -b -p -d -r1.69 -r1.70
--- main.php 23 Aug 2002 21:54:30 -0000 1.69
+++ main.php 24 Aug 2002 13:18:56 -0000 1.70
@@ -230,4 +230,5 @@ class WikiRequest extends Request {
'unlock' => _("unlock pages in this wiki"),
'upload' => _("upload a zip dump to this wiki"),
+ 'verify' => _("verify the current action"),
'viewsource' => _("view the source of pages in this wiki"),
'zip' => _("download a zip dump from this wiki"),
@@ -254,4 +255,5 @@ class WikiRequest extends Request {
'unlock' => _("Unlocking pages"),
'upload' => _("Uploading zip dumps"),
+ 'verify' => _("Verify the current action"),
'viewsource' => _("Viewing the source of pages"),
'zip' => _("Downloading zip dumps"),
@@ -267,5 +269,5 @@ class WikiRequest extends Request {
function requiredAuthority ($action) {
// FIXME: clean up.
- // Todo: Check individual page permissions.
+ // Todo: Check individual page permissions instead.
switch ($action) {
case 'browse':
Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -2 -b -p -d -r1.114 -r1.115
--- stdlib.php 22 Aug 2002 23:28:31 -0000 1.114
+++ stdlib.php 24 Aug 2002 13:18:56 -0000 1.115
@@ -54,4 +54,5 @@ function WikiURL($pagename, $args = '',
$enc_args = array();
foreach ($args as $key => $val) {
+ if (!is_array($val)) // ugly hack for getURLtoSelf() which also takes POST vars
$enc_args[] = urlencode($key) . '=' . urlencode($val);
}
|