From fafc3b93164dd25d4889852d726e2361718bdae3 Mon Sep 17 00:00:00 2001 From: rurban Date: Sun, 11 Apr 2004 10:42:03 +0000 Subject: [PATCH] pgsrc/CreatePagePlugin git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@3272 96ab9672-09ca-45d6-a79d-3d69d39ca109 --- index.php | 14 +++++++-- lib/WikiPlugin.php | 12 ++++---- lib/WikiUserNew.php | 15 ++++++---- lib/plugin/RateIt.php | 21 ++++++++++---- lib/ziplib.php | 3 +- pgsrc/CreatePagePlugin | 52 ++++++++++++++++++++++++++++++++++ themes/README | 14 +++++---- themes/Wordpress/themeinfo.php | 5 ++-- 8 files changed, 107 insertions(+), 29 deletions(-) create mode 100644 pgsrc/CreatePagePlugin diff --git a/index.php b/index.php index f82210b69..e380d8027 100644 --- a/index.php +++ b/index.php @@ -9,7 +9,8 @@ // index.php! /* -Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam = array( +Copyright 1999, 2000, 2001, 2002, 2003, 2004 $ThePhpWikiProgrammingTeam += array( "Steve Wainstead", "Clifford A. Adams", "Lawrence Akka", "Scott R. Anderson", "Jon Åslund", "Neil Brown", "Jeff Dairiki", "Stéphane Gourichon", "Jan Hidders", "Arno Hollosi", "John Jorgensen", @@ -74,7 +75,7 @@ define('JS_SEARCHREPLACE',true); // experimental edit feature define ('PHPWIKI_VERSION', '1.3.8'); require "lib/prepend.php"; -rcs_id('$Id: index.php,v 1.136 2004-04-10 04:14:13 rurban Exp $'); +rcs_id('$Id: index.php,v 1.137 2004-04-11 10:42:02 rurban Exp $'); ///////////////////////////////////////////////////////////////////// // @@ -652,11 +653,14 @@ if (!defined('ALLOW_USER_LOGIN')) define('ALLOW_USER_LOGIN', false); */ if (!defined('THEME')) { define('THEME', 'default'); +//define('THEME', 'smaller'); //define('THEME', 'Hawaiian'); //define('THEME', 'MacOSX'); //define('THEME', 'Portland'); //define('THEME', 'Sidebar'); //define('THEME', 'SpaceWiki'); +//define('THEME', 'wikilens'); +//define('THEME', 'Wordpress'); } // Select a valid charset name to be inserted into the xml/html pages, @@ -675,6 +679,7 @@ define('THEME', 'default'); // support the same charset, and of course the same is true for the // web browser. (Some work is in progress hopefully to allow more // flexibility in this area in the future). +// Japanese must define "utf-8". if (!defined('CHARSET')) define("CHARSET", "iso-8859-1"); // Select your language/locale - default language is "en" for English. @@ -691,6 +696,8 @@ if (!defined('CHARSET')) define("CHARSET", "iso-8859-1"); // If you set DEFAULT_LANGUAGE to the empty string, your system's // default language (as determined by the applicable environment // variables) will be used. +// Note: The users language will be defined in $GLOBALS['LANG'], +// which overrides the DEFAULT_LANGUAGE. See wiki. // if (!defined('DEFAULT_LANGUAGE')) define('DEFAULT_LANGUAGE', 'en'); @@ -943,6 +950,9 @@ if (defined('VIRTUAL_PATH') and defined('USE_PATH_INFO')) { //include "lib/main.php"; // $Log: not supported by cvs2svn $ +// Revision 1.136 2004/04/10 04:14:13 rurban +// sf.net 906436 Suggestion +// // Revision 1.135 2004/04/10 03:33:03 rurban // Oops revert // diff --git a/lib/WikiPlugin.php b/lib/WikiPlugin.php index a7c35e610..6c19aef06 100644 --- a/lib/WikiPlugin.php +++ b/lib/WikiPlugin.php @@ -1,5 +1,5 @@ $this->getName(), - 'linktext' => $this->getName(), + return array('targetpage' => $this->getName(), + 'linktext' => $this->getName(), 'description' => $this->getDescription(), - 'class' => 'wikiaction'); + 'class' => 'wikiaction'); } function makeLink($argstr, $request) { @@ -226,7 +226,7 @@ class WikiPlugin 'class' => 'wikiaction', 'method' => 'get', 'textinput' => 's', - 'description' => $this->getDescription(), + 'description'=> $this->getDescription(), 'formsize' => 30); } diff --git a/lib/WikiUserNew.php b/lib/WikiUserNew.php index 16257609a..65cd1b7e6 100644 --- a/lib/WikiUserNew.php +++ b/lib/WikiUserNew.php @@ -1,5 +1,5 @@ _get_pageid($userid); else return 0; - return 2.5; + return 0; if (defined('RATING_EXTERNAL')) { // how call suggest.exe? as CGI or natively @@ -413,9 +413,9 @@ function deleteRating(actionImg, page, dimension) { if (is_null($userid)) $userid = $this->userid; if (is_null($pagename)) $pagename = $this->pagename; if (RATING_STORAGE == 'SQL') { - $rating = 2.5; + $rating = 0; } else { - $rating = 2.5; + $rating = 0; } return $rating; } @@ -746,6 +746,15 @@ function deleteRating(actionImg, page, dimension) { // $Log: not supported by cvs2svn $ +// Revision 1.4 2004/04/06 20:00:11 rurban +// Cleanup of special PageList column types +// Added support of plugin and theme specific Pagelist Types +// Added support for theme specific UserPreferences +// Added session support for ip-based throttling +// sql table schema change: ALTER TABLE session ADD sess_ip CHAR(15); +// Enhanced postgres schema +// Added DB_Session_dba support +// // Revision 1.3 2004/04/01 06:29:51 rurban // better wording // RateIt also for ADODB diff --git a/lib/ziplib.php b/lib/ziplib.php index 173fcdb61..0ab455292 100644 --- a/lib/ziplib.php +++ b/lib/ziplib.php @@ -1,4 +1,4 @@ - $revision->get('author'), 'version' => $revision->getVersion(), 'lastmodified' => $revision->get('mtime')); - if ($page->get('mtime')) $params['created'] = $page->get('mtime'); diff --git a/pgsrc/CreatePagePlugin b/pgsrc/CreatePagePlugin new file mode 100644 index 000000000..18a894942 --- /dev/null +++ b/pgsrc/CreatePagePlugin @@ -0,0 +1,52 @@ +Date: Sat, 13 Mar 2004 11:26:41 +0100 +Mime-Version: 1.0 (Produced by PhpWiki 1.3.8) +X-Rcs-Id: $Id: CreatePagePlugin,v 1.1 2004-04-11 10:42:03 rurban Exp $ +Content-Type: application/x-phpwiki; + pagename=CreatePagePlugin; + pgsrc_version="2 $Revision: 1.1 $"; + flags=""; + markup=2; + charset=iso-8859-1 +Content-Transfer-Encoding: binary + +WikiPlugin to easily create new pages, optionally with default content. Since v1.3.8 + +This allows you to create a page geting the new pagename from a +forms-based interface, and optionally with the initial content from +some template. + +Put a "<~?plugin-form ~CreatePage ?~>" at some page, browse this page, +enter the name of the page to create, then click the button. + +!! Usage + + + + + +!! Plugin Arguments +__s__: | + The pagename, which will passed to the plugin. Default: "" +__initial_content__: | + The new page will be pre-filled with this content. Default: "" +__template__: | + The new page will be pre-filled with the content of this page. Default: "" + +!! Known Problems + +None + +!! Plans + +The content might hold some variables, which will be expanded on creation. +The syntax is not clear yet. + +!! Author + +Dan Frankowski + +!! Examples + + + +See also PhpWiki:EasilyCreateNewPages diff --git a/themes/README b/themes/README index 5a5397bbe..e3bf72ab6 100644 --- a/themes/README +++ b/themes/README @@ -2,11 +2,13 @@ Some files may be removed from this directory to save space, if needed: -272k Hawaiian -560k MacOSX -72k Portland -52k Sidebar -172k SpaceWiki +175k Hawaiian +235k MacOSX +17k Portland +151 Sidebar +115k SpaceWiki +21k wikilens +27k Wordpress *The default theme must always be present,* even when using another theme! Wherever a theme has no specific variant (override) of a @@ -15,7 +17,7 @@ template or image, PhpWiki will look for one in the default theme. See doc/Themes for more info on PhpWiki themes. -$Id: README,v 1.1 2003-09-14 23:40:50 carstenklapp Exp $ +$Id: README,v 1.2 2004-04-11 10:42:03 rurban Exp $ $Source: /var/cvs/phpwiki/phpwiki/themes/README,v $ (TODO: diff --git a/themes/Wordpress/themeinfo.php b/themes/Wordpress/themeinfo.php index 7b5162279..241739e7d 100644 --- a/themes/Wordpress/themeinfo.php +++ b/themes/Wordpress/themeinfo.php @@ -1,8 +1,9 @@