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: <var...@us...> - 2014-10-07 12:17:01
|
Revision: 9212
http://sourceforge.net/p/phpwiki/code/9212
Author: vargenau
Date: 2014-10-07 12:16:54 +0000 (Tue, 07 Oct 2014)
Log Message:
-----------
Add protected function getMap, getHtml
Modified Paths:
--------------
trunk/lib/plugin/CacheTest.php
trunk/lib/plugin/GraphViz.php
trunk/lib/plugin/Ploticus.php
trunk/lib/plugin/TexToPng.php
Modified: trunk/lib/plugin/CacheTest.php
===================================================================
--- trunk/lib/plugin/CacheTest.php 2014-10-07 11:43:50 UTC (rev 9211)
+++ trunk/lib/plugin/CacheTest.php 2014-10-07 12:16:54 UTC (rev 9212)
@@ -89,6 +89,16 @@
// return $this->lazy_produceGraphics($text,$font);
} // getImage
+ protected function getMap($dbi, $argarray, $request)
+ {
+ trigger_error('pure virtual', E_USER_ERROR);
+ }
+
+ protected function getHtml($dbi, $argarray, $request, $basepage)
+ {
+ trigger_error('pure virtual', E_USER_ERROR);
+ }
+
function getImageType($dbi, $argarray, $request)
{
extract($argarray);
Modified: trunk/lib/plugin/GraphViz.php
===================================================================
--- trunk/lib/plugin/GraphViz.php 2014-10-07 11:43:50 UTC (rev 9211)
+++ trunk/lib/plugin/GraphViz.php 2014-10-07 12:16:54 UTC (rev 9212)
@@ -319,6 +319,11 @@
return $outfile;
}
+ protected function getHtml($dbi, $argarray, $request, $basepage)
+ {
+ trigger_error('pure virtual', E_USER_ERROR);
+ }
+
/**
* Which argument must be set to 'png', for the fallback image when svg
* will fail on the client.
Modified: trunk/lib/plugin/Ploticus.php
===================================================================
--- trunk/lib/plugin/Ploticus.php 2014-10-07 11:43:50 UTC (rev 9211)
+++ trunk/lib/plugin/Ploticus.php 2014-10-07 12:16:54 UTC (rev 9212)
@@ -147,6 +147,11 @@
return $argarray['device'];
}
+ protected function getHtml($dbi, $argarray, $request, $basepage)
+ {
+ trigger_error('pure virtual', E_USER_ERROR);
+ }
+
/**
* This gives an alternative text description of
* the image.
Modified: trunk/lib/plugin/TexToPng.php
===================================================================
--- trunk/lib/plugin/TexToPng.php 2014-10-07 11:43:50 UTC (rev 9211)
+++ trunk/lib/plugin/TexToPng.php 2014-10-07 12:16:54 UTC (rev 9212)
@@ -124,8 +124,14 @@
protected function getMap($dbi, $argarray, $request)
{
+ trigger_error('pure virtual', E_USER_ERROR);
}
+ protected function getHtml($dbi, $argarray, $request, $basepage)
+ {
+ trigger_error('pure virtual', E_USER_ERROR);
+ }
+
function getExpire($dbi, $argarray, $request)
{
return '0';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-10-07 11:43:58
|
Revision: 9211
http://sourceforge.net/p/phpwiki/code/9211
Author: vargenau
Date: 2014-10-07 11:43:50 +0000 (Tue, 07 Oct 2014)
Log Message:
-----------
We are in PHP >= 5.3
Modified Paths:
--------------
trunk/index.php
trunk/lib/ErrorManager.php
trunk/lib/Request.php
trunk/lib/config.php
trunk/lib/font/chinese.php
trunk/lib/font/japanese.php
trunk/lib/main.php
trunk/lib/prepend.php
Modified: trunk/index.php
===================================================================
--- trunk/index.php 2014-10-07 09:21:41 UTC (rev 9210)
+++ trunk/index.php 2014-10-07 11:43:50 UTC (rev 9211)
@@ -32,8 +32,8 @@
require_once(dirname(__FILE__) . '/lib/IniConfig.php');
IniConfig(dirname(__FILE__) . "/config/config.ini");
-if (version_compare(PHP_VERSION, '5.2', '<')) {
- exit(_("Your PHP version is too old. You must have at least PHP 5.2."));
+if (version_compare(PHP_VERSION, '5.3', '<')) {
+ exit(_("Your PHP version is too old. You must have at least PHP 5.3."));
}
////////////////////////////////////////////////////////////////
Modified: trunk/lib/ErrorManager.php
===================================================================
--- trunk/lib/ErrorManager.php 2014-10-07 09:21:41 UTC (rev 9210)
+++ trunk/lib/ErrorManager.php 2014-10-07 11:43:50 UTC (rev 9211)
@@ -12,9 +12,9 @@
error_reporting(E_ALL & ~E_STRICT);
}
*/
-define ('EM_FATAL_ERRORS', E_ERROR | E_PARSE | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR | ~2048 & ((check_php_version(5, 3)) ? ~E_DEPRECATED : ~0));
+define ('EM_FATAL_ERRORS', E_ERROR | E_PARSE | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR | ~2048 & (~E_DEPRECATED));
define ('EM_WARNING_ERRORS',
- E_WARNING | E_CORE_WARNING | E_COMPILE_WARNING | E_USER_WARNING | ((check_php_version(5, 3)) ? E_DEPRECATED : 0));
+ E_WARNING | E_CORE_WARNING | E_COMPILE_WARNING | E_USER_WARNING | E_DEPRECATED);
define ('EM_NOTICE_ERRORS', E_NOTICE | E_USER_NOTICE);
/* It is recommended to leave assertions on.
@@ -22,7 +22,6 @@
Only where absolute speed is necessary you might want to turn
them off.
*/
-//also turn it on if phpwiki_version notes no release
if (defined('DEBUG') and DEBUG)
assert_options(ASSERT_ACTIVE, 1);
else
Modified: trunk/lib/Request.php
===================================================================
--- trunk/lib/Request.php 2014-10-07 09:21:41 UTC (rev 9210)
+++ trunk/lib/Request.php 2014-10-07 11:43:50 UTC (rev 9211)
@@ -609,8 +609,6 @@
$vars[$key] = $val;
if (isset($_SESSION)) // php-5.2
$_SESSION[$key] = $val;
- if (!check_php_version(5, 3))
- session_register($key);
}
function delete($key)
@@ -622,8 +620,6 @@
unset($vars[$key]);
if (isset($_SESSION)) // php-5.2
unset($_SESSION[$key]);
- if (!check_php_version(5, 3))
- session_unregister($key);
}
}
Modified: trunk/lib/config.php
===================================================================
--- trunk/lib/config.php 2014-10-07 09:21:41 UTC (rev 9210)
+++ trunk/lib/config.php 2014-10-07 11:43:50 UTC (rev 9211)
@@ -30,11 +30,6 @@
@preg_match('/CGI/', $GLOBALS['HTTP_ENV_VARS']['GATEWAY_INTERFACE']));
}
-// essential internal stuff
-if (!check_php_version(5, 3)) {
- set_magic_quotes_runtime(0);
-}
-
/**
* Browser Detection Functions
*
@@ -315,21 +310,6 @@
return preg_match("%^${requri}[^/]*$%", $GLOBALS['HTTP_SERVER_VARS']['SCRIPT_NAME']);
}
-/**
- * safe php4 definition for clone.
- * php5 copies objects by reference, but we need to clone "deep copy" in some places.
- * (BlockParser)
- * We need to eval it as workaround for the php5 parser.
- * See http://www.acko.net/node/54
- */
-if (!check_php_version(5)) {
- eval('
- function clone($object) {
- return $object;
- }
- ');
-}
-
function getUploadFilePath()
{
Modified: trunk/lib/font/chinese.php
===================================================================
--- trunk/lib/font/chinese.php 2014-10-07 09:21:41 UTC (rev 9210)
+++ trunk/lib/font/chinese.php 2014-10-07 11:43:50 UTC (rev 9211)
@@ -323,10 +323,6 @@
$this->_out('endobj');
}
- if (!check_php_version(5,3)) {
- $mqr=get_magic_quotes_runtime();
- set_magic_quotes_runtime(0);
- }
foreach($this->FontFiles as $file=>$info)
{
//Font file embedding
@@ -349,9 +345,6 @@
fclose($f);
$this->_out('endobj');
}
- if (!check_php_version(5,3)) {
- set_magic_quotes_runtime($mqr);
- }
foreach($this->fonts as $k=>$font)
{
//Font objects
Modified: trunk/lib/font/japanese.php
===================================================================
--- trunk/lib/font/japanese.php 2014-10-07 09:21:41 UTC (rev 9210)
+++ trunk/lib/font/japanese.php 2014-10-07 11:43:50 UTC (rev 9211)
@@ -302,10 +302,6 @@
$this->_out('<</Type /Encoding /BaseEncoding /WinAnsiEncoding /Differences ['.$diff.']>>');
$this->_out('endobj');
}
- if (!check_php_version(5,3)) {
- $mqr=get_magic_quotes_runtime();
- set_magic_quotes_runtime(0);
- }
foreach($this->FontFiles as $file=>$info) {
//Font file embedding
$this->_newobj();
@@ -327,9 +323,6 @@
fclose($f);
$this->_out('endobj');
}
- if (!check_php_version(5,3)) {
- set_magic_quotes_runtime($mqr);
- }
foreach($this->fonts as $k=>$font) {
//Font objects
$this->_newobj();
Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php 2014-10-07 09:21:41 UTC (rev 9210)
+++ trunk/lib/main.php 2014-10-07 11:43:50 UTC (rev 9211)
@@ -1399,7 +1399,7 @@
// Postpone warnings
global $ErrorManager;
if (defined('E_STRICT')) // and (E_ALL & E_STRICT)) // strict php5?
- $ErrorManager->setPostponedErrorMask(E_NOTICE | E_USER_NOTICE | E_USER_WARNING | E_WARNING | E_STRICT | ((check_php_version(5, 3)) ? E_DEPRECATED : 0));
+ $ErrorManager->setPostponedErrorMask(E_NOTICE | E_USER_NOTICE | E_USER_WARNING | E_WARNING | E_STRICT | E_DEPRECATED);
else
$ErrorManager->setPostponedErrorMask(E_NOTICE | E_USER_NOTICE | E_USER_WARNING | E_WARNING);
$request = new WikiRequest();
Modified: trunk/lib/prepend.php
===================================================================
--- trunk/lib/prepend.php 2014-10-07 09:21:41 UTC (rev 9210)
+++ trunk/lib/prepend.php 2014-10-07 11:43:50 UTC (rev 9211)
@@ -7,18 +7,6 @@
// see lib/stdlib.php: phpwiki_version()
define('PHPWIKI_VERSION', '1.5.1');
-/**
- * Returns true if current php version is at mimimum a.b.c
- * Called: check_php_version(5,3)
- */
-function check_php_version($a = '0', $b = '0', $c = '0')
-{
- static $PHP_VERSION;
- if (!isset($PHP_VERSION))
- $PHP_VERSION = substr(str_pad(preg_replace('/\D/', '', PHP_VERSION), 3, '0'), 0, 3);
- return ($PHP_VERSION >= ($a . $b . $c));
-}
-
/** PHP5 deprecated old-style globals if !(bool)ini_get('register_long_arrays').
* See Bug #1180115
* We want to work with those old ones instead of the new superglobals,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-10-07 09:21:49
|
Revision: 9210
http://sourceforge.net/p/phpwiki/code/9210
Author: vargenau
Date: 2014-10-07 09:21:41 +0000 (Tue, 07 Oct 2014)
Log Message:
-----------
Update translations
Modified Paths:
--------------
trunk/locale/de/LC_MESSAGES/phpwiki.mo
trunk/locale/es/LC_MESSAGES/phpwiki.mo
trunk/locale/fr/LC_MESSAGES/phpwiki.mo
trunk/locale/it/LC_MESSAGES/phpwiki.mo
trunk/locale/ja/LC_MESSAGES/phpwiki.mo
trunk/locale/nl/LC_MESSAGES/phpwiki.mo
trunk/locale/po/de.po
trunk/locale/po/es.po
trunk/locale/po/fr.po
trunk/locale/po/it.po
trunk/locale/po/ja.po
trunk/locale/po/nl.po
trunk/locale/po/phpwiki.pot
trunk/locale/po/sv.po
trunk/locale/po/zh.po
trunk/locale/sv/LC_MESSAGES/phpwiki.mo
trunk/locale/zh/LC_MESSAGES/phpwiki.mo
Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po 2014-10-07 08:38:45 UTC (rev 9209)
+++ trunk/locale/po/de.po 2014-10-07 09:21:41 UTC (rev 9210)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-06 14:25+0200\n"
+"POT-Creation-Date: 2014-10-07 11:20+0200\n"
"PO-Revision-Date: 2000-10-31 02:23+0200\n"
"Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
"<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -4910,9 +4910,6 @@
msgid "Could not create image file from imagehandle."
msgstr ""
-msgid "This plugin has no description."
-msgstr ""
-
#, php-format
msgid "trailing cruft in plugin args: “%s”"
msgstr "Überflüssiger Müll in den Zusatzprogramm Argumenten: »%s«"
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po 2014-10-07 08:38:45 UTC (rev 9209)
+++ trunk/locale/po/es.po 2014-10-07 09:21:41 UTC (rev 9210)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-06 14:25+0200\n"
+"POT-Creation-Date: 2014-10-07 11:20+0200\n"
"PO-Revision-Date: 2000-02-01 00:50-0500\n"
"Last-Translator: Pablo Roca <pr...@cl...>\n"
"Language-Team: \n"
@@ -4788,9 +4788,6 @@
msgid "Could not create image file from imagehandle."
msgstr ""
-msgid "This plugin has no description."
-msgstr ""
-
#, php-format
msgid "trailing cruft in plugin args: “%s”"
msgstr "absurdo que se arrastra en parámetros plugin: “%s”"
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po 2014-10-07 08:38:45 UTC (rev 9209)
+++ trunk/locale/po/fr.po 2014-10-07 09:21:41 UTC (rev 9210)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-06 14:25+0200\n"
+"POT-Creation-Date: 2014-10-07 11:20+0200\n"
"PO-Revision-Date: 2004-06-22 21:10+0200\n"
"Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
"Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -4847,9 +4847,6 @@
msgid "Could not create image file from imagehandle."
msgstr ""
-msgid "This plugin has no description."
-msgstr "Ce greffon n'a pas de description."
-
#, php-format
msgid "trailing cruft in plugin args: “%s”"
msgstr "cochonneries terminant les arguments du greffon : « %s »"
@@ -5946,6 +5943,9 @@
msgid "Edit this page"
msgstr "Modifier cette page"
+#~ msgid "This plugin has no description."
+#~ msgstr "Ce greffon n'a pas de description."
+
#~ msgid "Can't inflate data: zlib support not enabled in this PHP"
#~ msgstr ""
#~ "Impossible de décompresser les données : le support de zlib n'a pas été "
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po 2014-10-07 08:38:45 UTC (rev 9209)
+++ trunk/locale/po/it.po 2014-10-07 09:21:41 UTC (rev 9210)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-06 14:25+0200\n"
+"POT-Creation-Date: 2014-10-07 11:20+0200\n"
"PO-Revision-Date: 2005-02-12 16:23+0100\n"
"Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
"Language-Team: \n"
@@ -4746,9 +4746,6 @@
msgid "Could not create image file from imagehandle."
msgstr ""
-msgid "This plugin has no description."
-msgstr ""
-
#, php-format
msgid "trailing cruft in plugin args: “%s”"
msgstr ""
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po 2014-10-07 08:38:45 UTC (rev 9209)
+++ trunk/locale/po/ja.po 2014-10-07 09:21:41 UTC (rev 9210)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-06 14:25+0200\n"
+"POT-Creation-Date: 2014-10-07 11:20+0200\n"
"PO-Revision-Date: 2003-06-07 09:01+0900\n"
"Last-Translator: Tadashi Jokagi <web...@el...>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -4889,9 +4889,6 @@
msgid "Could not create image file from imagehandle."
msgstr ""
-msgid "This plugin has no description."
-msgstr ""
-
#, php-format
msgid "trailing cruft in plugin args: “%s”"
msgstr ""
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po 2014-10-07 08:38:45 UTC (rev 9209)
+++ trunk/locale/po/nl.po 2014-10-07 09:21:41 UTC (rev 9210)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-06 14:25+0200\n"
+"POT-Creation-Date: 2014-10-07 11:20+0200\n"
"PO-Revision-Date: 2000-09-30 02:23+0200\n"
"Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
"Language-Team: Dutch <nl...@li...>\n"
@@ -4738,9 +4738,6 @@
msgid "Could not create image file from imagehandle."
msgstr ""
-msgid "This plugin has no description."
-msgstr ""
-
#, php-format
msgid "trailing cruft in plugin args: “%s”"
msgstr ""
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot 2014-10-07 08:38:45 UTC (rev 9209)
+++ trunk/locale/po/phpwiki.pot 2014-10-07 09:21:41 UTC (rev 9210)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki-1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-06 14:25+0200\n"
+"POT-Creation-Date: 2014-10-07 11:20+0200\n"
"PO-Revision-Date: 2002-12-14 17:51-0500\n"
"Last-Translator: Reini Urban <ru...@us...>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -4730,9 +4730,6 @@
msgid "Could not create image file from imagehandle."
msgstr ""
-msgid "This plugin has no description."
-msgstr ""
-
#, php-format
msgid "trailing cruft in plugin args: “%s”"
msgstr ""
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po 2014-10-07 08:38:45 UTC (rev 9209)
+++ trunk/locale/po/sv.po 2014-10-07 09:21:41 UTC (rev 9210)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-06 14:25+0200\n"
+"POT-Creation-Date: 2014-10-07 11:20+0200\n"
"PO-Revision-Date: 2001-01-27 01:58+0200\n"
"Last-Translator: Jon Åslund <jo...@he...>\n"
"Language-Team: \n"
@@ -4731,9 +4731,6 @@
msgid "Could not create image file from imagehandle."
msgstr ""
-msgid "This plugin has no description."
-msgstr ""
-
#, php-format
msgid "trailing cruft in plugin args: “%s”"
msgstr ""
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po 2014-10-07 08:38:45 UTC (rev 9209)
+++ trunk/locale/po/zh.po 2014-10-07 09:21:41 UTC (rev 9210)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-06 14:25+0200\n"
+"POT-Creation-Date: 2014-10-07 11:20+0200\n"
"PO-Revision-Date: 2004-04-21 10:08+0800\n"
"Last-Translator: DruryL <dr...@us...>\n"
"Language-Team: DruryL <dr...@us...>\n"
@@ -4974,9 +4974,6 @@
msgid "Could not create image file from imagehandle."
msgstr ""
-msgid "This plugin has no description."
-msgstr ""
-
#, php-format
msgid "trailing cruft in plugin args: “%s”"
msgstr "trailing cruft in plugin args: “%s”"
Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-10-07 08:38:48
|
Revision: 9209
http://sourceforge.net/p/phpwiki/code/9209
Author: vargenau
Date: 2014-10-07 08:38:45 +0000 (Tue, 07 Oct 2014)
Log Message:
-----------
Remove useless function getMemoryUsage
Modified Paths:
--------------
trunk/lib/stdlib.php
trunk/tests/unit/test.php
trunk/themes/Sidebar/templates/debug.tmpl
trunk/themes/default/templates/debug.tmpl
trunk/themes/fusionforge/templates/debug.tmpl
trunk/themes/shamino_com/templates/debug.tmpl
Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php 2014-10-07 08:31:56 UTC (rev 9208)
+++ trunk/lib/stdlib.php 2014-10-07 08:38:45 UTC (rev 9209)
@@ -84,7 +84,6 @@
array_remove($arr,$value)
longer_timeout($secs=30)
printSimpleTrace($bt)
- getMemoryUsage()
binary_search($needle, $haystack)
is_localhost()
javascript_quote_string($s)
@@ -1979,14 +1978,6 @@
}
/**
- * Return the used process memory, in bytes.
- */
-function getMemoryUsage()
-{
- return memory_get_usage();
-}
-
-/**
* @param var $needle
* @param array $haystack one-dimensional numeric array only, no hash
* @return integer
Modified: trunk/tests/unit/test.php
===================================================================
--- trunk/tests/unit/test.php 2014-10-07 08:31:56 UTC (rev 9208)
+++ trunk/tests/unit/test.php 2014-10-07 08:38:45 UTC (rev 9209)
@@ -120,7 +120,7 @@
require_once 'lib/stdlib.php';
echo "-- MEMORY USAGE: ";
$oldmem = $mem;
- $mem = getMemoryUsage();
+ $mem = memory_get_usage();
if (!$initmem) $initmem = $mem;
// old libc on sf.net server doesn't understand "%+4d"
echo sprintf("%8d\t[%s%4d]\t[+%4d]\n", $mem, $mem > $oldmem ? "+" : ($mem == $oldmem ? " " : ""),
Modified: trunk/themes/Sidebar/templates/debug.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/debug.tmpl 2014-10-07 08:31:56 UTC (rev 9208)
+++ trunk/themes/Sidebar/templates/debug.tmpl 2014-10-07 08:38:45 UTC (rev 9209)
@@ -12,7 +12,7 @@
</div>
</td><td>
<span class="debug"><?php echo fmt("Page Execution took %s seconds", $RUNTIMER->getStats())?>
-<?php if (substr(PHP_OS,0,3) != 'WIN') { $mem = @getMemoryUsage(); PrintXml(fmt(", Memory: %s", $mem)); } ?>
+<?php if (substr(PHP_OS,0,3) != 'WIN') { $mem = @memory_get_usage(); PrintXml(fmt(", Memory: %s", $mem)); } ?>
</span>
</td></tr></table>
<br class="clear-floats" />
Modified: trunk/themes/default/templates/debug.tmpl
===================================================================
--- trunk/themes/default/templates/debug.tmpl 2014-10-07 08:31:56 UTC (rev 9208)
+++ trunk/themes/default/templates/debug.tmpl 2014-10-07 08:38:45 UTC (rev 9209)
@@ -13,7 +13,7 @@
</div>
</td><td>
<span class="debug"><?php echo fmt("Page Execution took %s seconds", $RUNTIMER->getStats())?>
-<?php $mem = @getMemoryUsage(); if ($mem) { ?>
+<?php $mem = @memory_get_usage(); if ($mem) { ?>
<?php echo fmt(", Memory: %s", $mem) ?>
<?php } ?>
</span>
Modified: trunk/themes/fusionforge/templates/debug.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/debug.tmpl 2014-10-07 08:31:56 UTC (rev 9208)
+++ trunk/themes/fusionforge/templates/debug.tmpl 2014-10-07 08:38:45 UTC (rev 9209)
@@ -2,7 +2,7 @@
<?php
global $RUNTIMER;
echo fmt("Page Execution took %s seconds", $RUNTIMER->getStats());
-$mem = @getMemoryUsage();
+$mem = @memory_get_usage();
if ($mem) {
echo fmt(", Memory: %s", $mem);
}
Modified: trunk/themes/shamino_com/templates/debug.tmpl
===================================================================
--- trunk/themes/shamino_com/templates/debug.tmpl 2014-10-07 08:31:56 UTC (rev 9208)
+++ trunk/themes/shamino_com/templates/debug.tmpl 2014-10-07 08:38:45 UTC (rev 9209)
@@ -4,7 +4,7 @@
<span id="xhtml-validator"><a class="wikilink" href="http://validator.w3.org/check/referer">Valid XHTML 1.0</a> <a class="wikilink" href="http://jigsaw.w3.org/css-validator/check/referer">Valid CSS</a>
</span>
<span><?php echo fmt("Page Execution took %s seconds", $RUNTIMER->getStats()) ?>
-<?php $mem = @getMemoryUsage(); if ($mem) { ?>
+<?php $mem = @memory_get_usage(); if ($mem) { ?>
<?php echo fmt(", Memory: %s", $mem) ?>
<?php } ?></span></div>
<br class="clear-floats" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-10-07 08:31:59
|
Revision: 9208
http://sourceforge.net/p/phpwiki/code/9208
Author: vargenau
Date: 2014-10-07 08:31:56 +0000 (Tue, 07 Oct 2014)
Log Message:
-----------
Remove useless function fixTitleEncoding
Modified Paths:
--------------
trunk/lib/main.php
trunk/lib/stdlib.php
Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php 2014-10-07 08:27:17 UTC (rev 9207)
+++ trunk/lib/main.php 2014-10-07 08:31:56 UTC (rev 9208)
@@ -865,8 +865,6 @@
/**
* Generally pagename is rawurlencoded for older browsers or mozilla.
- * Typing a pagename into the IE bar will utf-8 encode it, so we have to
- * fix that with fixTitleEncoding().
* If USE_PATH_INFO = true, the pagename is stripped from the "/DATA_PATH/PageName&arg=value" line.
* If false, we support either "/index.php?pagename=PageName&arg=value",
* or the first arg (1.2.x style): "/index.php?PageName&arg=value"
@@ -874,7 +872,7 @@
function _deducePagename()
{
if (trim(rawurldecode($this->getArg('pagename'))))
- return fixTitleEncoding(rawurldecode($this->getArg('pagename')));
+ return rawurldecode($this->getArg('pagename'));
if (USE_PATH_INFO) {
$pathinfo = $this->get('PATH_INFO');
@@ -887,7 +885,7 @@
$tail = substr($pathinfo, strlen(PATH_INFO_PREFIX));
if (trim($tail) != '' and $pathinfo == PATH_INFO_PREFIX . $tail) {
- return fixTitleEncoding($tail);
+ return $tail;
}
} elseif ($this->isPost()) {
/*
@@ -904,7 +902,7 @@
*/
global $HTTP_GET_VARS;
if (isset($HTTP_GET_VARS['pagename']) and trim($HTTP_GET_VARS['pagename'])) {
- return fixTitleEncoding(rawurldecode($HTTP_GET_VARS['pagename']));
+ return rawurldecode($HTTP_GET_VARS['pagename']);
}
}
@@ -914,10 +912,10 @@
*/
$query_string = $this->get('QUERY_STRING');
if (trim(rawurldecode($query_string)) and preg_match('/^([^&=]+)(&.+)?$/', $query_string, $m)) {
- return fixTitleEncoding(rawurldecode($m[1]));
+ return rawurldecode($m[1]);
}
- return fixTitleEncoding(HOME_PAGE);
+ return HOME_PAGE;
}
function _deduceAction()
Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php 2014-10-07 08:27:17 UTC (rev 9207)
+++ trunk/lib/stdlib.php 2014-10-07 08:31:56 UTC (rev 9208)
@@ -73,7 +73,6 @@
phpwiki_version ()
isWikiWord ($word)
obj2hash ($obj, $exclude = false, $fields = false)
- fixTitleEncoding ($s)
url_get_contents ($uri)
GenerateId ($name)
firstNWordsOfContent ($n, $content)
@@ -1776,19 +1775,6 @@
}
/**
- * Check for UTF-8 URLs; Internet Explorer produces these if you
- * type non-ASCII chars in the URL bar or follow unescaped links.
- * Requires urldecoded pagename.
- * Fixes sf.net bug #953949
- *
- * src: languages/Language.php:checkTitleEncoding() from mediawiki
- */
-function fixTitleEncoding($s)
-{
- return $s;
-}
-
-/**
* Workaround for allow_url_fopen, to get the content of an external URI.
* It returns the contents in one slurp. Parsers might want to check for allow_url_fopen
* and use fopen, fread chunkwise. (see lib/XmlParser.php)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-10-07 08:27:20
|
Revision: 9207
http://sourceforge.net/p/phpwiki/code/9207
Author: vargenau
Date: 2014-10-07 08:27:17 +0000 (Tue, 07 Oct 2014)
Log Message:
-----------
Remove unused function isUtf8String
Modified Paths:
--------------
trunk/lib/stdlib.php
Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php 2014-10-07 08:05:55 UTC (rev 9206)
+++ trunk/lib/stdlib.php 2014-10-07 08:27:17 UTC (rev 9207)
@@ -63,7 +63,6 @@
glob_match ($glob, $against, $case_sensitive = true)
explodePageList ($input, $perm = false)
isa ($object, $class)
- can ($object, $method)
function_usable ($function_name)
wikihash ($x)
count_all ($arg)
@@ -74,7 +73,6 @@
phpwiki_version ()
isWikiWord ($word)
obj2hash ($obj, $exclude = false, $fields = false)
- isUtf8String ($s)
fixTitleEncoding ($s)
url_get_contents ($uri)
GenerateId ($name)
@@ -1778,24 +1776,6 @@
}
/**
- * isUtf8String($string) - cheap utf-8 detection
- *
- * segfaults for strings longer than 10kb!
- * Use http://www.phpdiscuss.com/article.php?id=565&group=php.i18n or
- * checkTitleEncoding() at http://cvs.sourceforge.net/viewcvs.py/wikipedia/phase3/languages/Language.php
- */
-function isUtf8String($s)
-{
- $ptrASCII = '[\x00-\x7F]';
- $ptr2Octet = '[\xC2-\xDF][\x80-\xBF]';
- $ptr3Octet = '[\xE0-\xEF][\x80-\xBF]{2}';
- $ptr4Octet = '[\xF0-\xF4][\x80-\xBF]{3}';
- $ptr5Octet = '[\xF8-\xFB][\x80-\xBF]{4}';
- $ptr6Octet = '[\xFC-\xFD][\x80-\xBF]{5}';
- return preg_match("/^($ptrASCII|$ptr2Octet|$ptr3Octet|$ptr4Octet|$ptr5Octet|$ptr6Octet)*$/s", $s);
-}
-
-/**
* Check for UTF-8 URLs; Internet Explorer produces these if you
* type non-ASCII chars in the URL bar or follow unescaped links.
* Requires urldecoded pagename.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-10-07 08:06:04
|
Revision: 9206
http://sourceforge.net/p/phpwiki/code/9206
Author: vargenau
Date: 2014-10-07 08:05:55 +0000 (Tue, 07 Oct 2014)
Log Message:
-----------
Remove unused function explodeList
Modified Paths:
--------------
trunk/lib/PageList.php
trunk/lib/stdlib.php
Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php 2014-10-07 07:54:52 UTC (rev 9205)
+++ trunk/lib/PageList.php 2014-10-07 08:05:55 UTC (rev 9206)
@@ -1112,8 +1112,6 @@
* Test* or Test1,Test2
* Limitation: Doesn't split into comma-sep and then expand wildcards.
* "Test1*,Test2*" is expanded into TextSearch "Test1* Test2*"
- *
- * echo implode(":",explodeList("Test*",array("xx","Test1","Test2")));
*/
function explodePageList($input, $include_empty = false, $sortby = '',
$limit = '', $exclude = '')
Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php 2014-10-07 07:54:52 UTC (rev 9205)
+++ trunk/lib/stdlib.php 2014-10-07 08:05:55 UTC (rev 9206)
@@ -61,7 +61,6 @@
glob_to_pcre ($glob)
glob_match ($glob, $against, $case_sensitive = true)
- explodeList ($input, $allnames, $glob_style = true, $case_sensitive = true)
explodePageList ($input, $perm = false)
isa ($object, $class)
can ($object, $method)
@@ -1512,27 +1511,6 @@
$against);
}
-function explodeList($input, $allnames, $glob_style = true, $case_sensitive = true)
-{
- $list = explode(',', $input);
- // expand wildcards from list of $allnames
- if (preg_match('/[\?\*]/', $input)) {
- // Optimizing loop invariants:
- // http://phplens.com/lens/php-book/optimizing-debugging-php.php
- for ($i = 0, $max = sizeof($list); $i < $max; $i++) {
- $f = $list[$i];
- if (preg_match('/[\?\*]/', $f)) {
- reset($allnames);
- $expand = new ListRegexExpand($list,
- $glob_style ? glob_to_pcre($f) : $f, $case_sensitive);
- $expand->expandRegex($i, $allnames);
- }
- }
- }
- return $list;
-}
-
-// echo implode(":",explodeList("Test*",array("xx","Test1","Test2")));
function explodePageList($input, $include_empty = false, $sortby = 'pagename',
$limit = '', $exclude = '')
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-10-07 07:55:00
|
Revision: 9205
http://sourceforge.net/p/phpwiki/code/9205
Author: vargenau
Date: 2014-10-07 07:54:52 +0000 (Tue, 07 Oct 2014)
Log Message:
-----------
Remove unused function charset_convert
Modified Paths:
--------------
trunk/lib/stdlib.php
Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php 2014-10-06 17:17:24 UTC (rev 9204)
+++ trunk/lib/stdlib.php 2014-10-07 07:54:52 UTC (rev 9205)
@@ -83,7 +83,6 @@
extractSection ($section, $content, $page, $quiet = false, $sectionhead = false)
isExternalReferrer()
- charset_convert($from, $to, $data)
string_starts_with($string, $prefix)
string_ends_with($string, $suffix)
array_remove($arr,$value)
@@ -2000,25 +1999,6 @@
return extension_loaded($extension);
}
-function charset_convert($from, $to, $data)
-{
- if (strtolower($from) == 'utf-8' and strtolower($to) == 'iso-8859-1')
- return utf8_decode($data);
- if (strtolower($to) == 'utf-8' and strtolower($from) == 'iso-8859-1')
- return utf8_encode($data);
-
- if (loadPhpExtension("iconv")) {
- $tmpdata = iconv($from, $to, $data);
- if (!$tmpdata)
- trigger_error("charset conversion $from => $to failed. Wrong source charset?", E_USER_WARNING);
- else
- $data = $tmpdata;
- } else {
- trigger_error("The iconv extension cannot be loaded", E_USER_WARNING);
- }
- return $data;
-}
-
function string_starts_with($string, $prefix)
{
return (substr($string, 0, strlen($prefix)) == $prefix);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-10-06 17:17:27
|
Revision: 9204
http://sourceforge.net/p/phpwiki/code/9204
Author: vargenau
Date: 2014-10-06 17:17:24 +0000 (Mon, 06 Oct 2014)
Log Message:
-----------
Let us put some abstraction
Modified Paths:
--------------
trunk/lib/BlockParser.php
trunk/lib/CachedMarkup.php
trunk/lib/InlineParser.php
trunk/lib/PageType.php
trunk/lib/WikiCallback.php
trunk/lib/WikiPlugin.php
trunk/lib/WikiPluginCached.php
trunk/lib/WysiwygEdit.php
trunk/lib/difflib.php
trunk/lib/plugin/CacheTest.php
trunk/lib/plugin/GraphViz.php
trunk/lib/plugin/LinkDatabase.php
trunk/lib/plugin/Ploticus.php
trunk/lib/plugin/RecentChangesCached.php
trunk/lib/plugin/SystemInfo.php
trunk/lib/plugin/TexToPng.php
trunk/lib/plugin/VisualWiki.php
Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php 2014-10-06 17:15:30 UTC (rev 9203)
+++ trunk/lib/BlockParser.php 2014-10-06 17:17:24 UTC (rev 9204)
@@ -501,14 +501,11 @@
}
}
-class BlockMarkup
+abstract class BlockMarkup
{
public $_re;
- function _match(&$input, $match)
- {
- trigger_error('pure virtual', E_USER_ERROR);
- }
+ abstract function _match(&$input, $match);
function _setTightness($top, $bot)
{
Modified: trunk/lib/CachedMarkup.php
===================================================================
--- trunk/lib/CachedMarkup.php 2014-10-06 17:15:30 UTC (rev 9203)
+++ trunk/lib/CachedMarkup.php 2014-10-06 17:17:24 UTC (rev 9204)
@@ -243,7 +243,7 @@
* Dynamic content is anything that can change even when the original
* wiki-text from which it was parsed is unchanged.
*/
-class Cached_DynamicContent
+abstract class Cached_DynamicContent
{
function cache(&$cache)
@@ -251,10 +251,7 @@
$cache[] = $this;
}
- function expand($basepage, &$obj)
- {
- trigger_error("Pure virtual", E_USER_ERROR);
- }
+ abstract protected function expand($basepage, &$obj);
function getWikiPageLinks($basepage)
{
@@ -274,7 +271,7 @@
}
}
-class Cached_Link extends Cached_DynamicContent
+abstract class Cached_Link extends Cached_DynamicContent
{
function isInlineElement()
Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php 2014-10-06 17:15:30 UTC (rev 9203)
+++ trunk/lib/InlineParser.php 2014-10-06 17:17:24 UTC (rev 9204)
@@ -234,7 +234,7 @@
* When a match is found for the regexp, the matching text is replaced.
* The replacement content is obtained by calling the SimpleMarkup::markup method.
*/
-class SimpleMarkup
+abstract class SimpleMarkup
{
public $_match_regexp;
@@ -254,10 +254,7 @@
*
* @return mixed The expansion of the matched text.
*/
- function markup($match /*, $body */)
- {
- trigger_error("pure virtual", E_USER_ERROR);
- }
+ abstract function markup($match /*, $body */);
}
/**
@@ -265,7 +262,7 @@
*
* These are defined by a start regexp, and an end regexp.
*/
-class BalancedMarkup
+abstract class BalancedMarkup
{
public $_start_regexp;
@@ -298,10 +295,7 @@
*
* @return mixed The expansion of the matched text.
*/
- function markup($match, $body)
- {
- trigger_error("pure virtual", E_USER_ERROR);
- }
+ abstract function markup($match, $body);
}
class Markup_escape extends SimpleMarkup
Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php 2014-10-06 17:15:30 UTC (rev 9203)
+++ trunk/lib/PageType.php 2014-10-06 17:17:24 UTC (rev 9204)
@@ -359,7 +359,7 @@
/** How to transform text.
*/
-class PageFormatter
+abstract class PageFormatter
{
/**
* @param WikiDB_Page $page
@@ -382,10 +382,7 @@
* @param string $text The raw page content (e.g. wiki-text).
* @return XmlContent Transformed content.
*/
- function format($text)
- {
- trigger_error("pure virtual", E_USER_ERROR);
- }
+ abstract function format($text);
}
class PageFormatter_wikitext extends PageFormatter
Modified: trunk/lib/WikiCallback.php
===================================================================
--- trunk/lib/WikiCallback.php 2014-10-06 17:15:30 UTC (rev 9203)
+++ trunk/lib/WikiCallback.php 2014-10-06 17:17:24 UTC (rev 9204)
@@ -10,7 +10,7 @@
*
* @see WikiFunctionCb, WikiMethodCb.
*/
-class WikiCallback
+abstract class WikiCallback
{
/**
* Convert from Pear-style callback specification to a WikiCallback.
@@ -55,10 +55,7 @@
* @return mixed The return value of the callback.
* @see call_user_func_array.
*/
- public function call_array($args)
- {
- trigger_error('pure virtual', E_USER_ERROR);
- }
+ abstract public function call_array($args);
/**
* Convert to Pear callback.
@@ -67,10 +64,7 @@
* (This value is suitable for passing as the callback parameter
* to a number of different Pear functions and methods.)
*/
- public function toPearCb()
- {
- trigger_error('pure virtual', E_USER_ERROR);
- }
+ abstract public function toPearCb();
}
/**
Modified: trunk/lib/WikiPlugin.php
===================================================================
--- trunk/lib/WikiPlugin.php 2014-10-06 17:15:30 UTC (rev 9203)
+++ trunk/lib/WikiPlugin.php 2014-10-06 17:17:24 UTC (rev 9204)
@@ -1,6 +1,6 @@
<?php
-class WikiPlugin
+abstract class WikiPlugin
{
public $_pi;
@@ -39,11 +39,7 @@
* @param string $basepage
* @return mixed
*/
- function run($dbi, $argstr, &$request, $basepage)
- {
- trigger_error("WikiPlugin::run: pure virtual function", E_USER_ERROR);
- return false;
- }
+ abstract public function run($dbi, $argstr, &$request, $basepage);
/** Get wiki-pages linked to by plugin invocation.
*
@@ -102,10 +98,7 @@
* @return string plugin description
*/
- function getDescription()
- {
- return _('This plugin has no description.');
- }
+ abstract protected function getDescription();
/**
* @param string $argstr
Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php 2014-10-06 17:15:30 UTC (rev 9203)
+++ trunk/lib/WikiPluginCached.php 2014-10-06 17:17:24 UTC (rev 9204)
@@ -55,7 +55,7 @@
*
* @author Johannes Große, Reini Urban
*/
-class WikiPluginCached extends WikiPlugin
+abstract class WikiPluginCached extends WikiPlugin
{
public $_static;
@@ -251,7 +251,7 @@
return HTML();
} // run
- /* --------------------- virtual or abstract functions ----------- */
+ /* --------------------- abstract functions ----------- */
/**
* Sets the type of the plugin to html, image or map
@@ -267,10 +267,7 @@
* <li>PLUGIN_CACHED_MAP</li>
* </ul>
*/
- protected function getPluginType()
- {
- return PLUGIN_CACHED_IMG_ONDEMAND;
- }
+ abstract protected function getPluginType();
/**
* Creates an image handle from the given user arguments.
@@ -286,12 +283,7 @@
* @return mixed imagehandle image handle if successful
* false if an error occured
*/
- protected function getImage($dbi, $argarray, $request)
- {
- trigger_error('WikiPluginCached::getImage: pure virtual function in file '
- . __FILE__ . ' line ' . __LINE__, E_USER_ERROR);
- return false;
- }
+ abstract protected function getImage($dbi, $argarray, $request);
/**
* Sets the life time of a cache entry in seconds.
@@ -363,11 +355,7 @@
* @return string html to be printed in place of the plugin command
* false if an error occured
*/
- protected function getHtml($dbi, $argarray, $request, $basepage)
- {
- trigger_error('WikiPluginCached::getHtml: pure virtual function in file '
- . __FILE__ . ' line ' . __LINE__, E_USER_ERROR);
- }
+ abstract protected function getHtml($dbi, $argarray, $request, $basepage);
/**
* Creates HTML output to be cached.
@@ -385,11 +373,7 @@
* image.
* array(false,false) if an error occured
*/
- protected function getMap($dbi, $argarray, $request)
- {
- trigger_error('WikiPluginCached::getHtml: pure virtual function in file '
- . __FILE__ . ' line ' . __LINE__, E_USER_ERROR);
- }
+ abstract protected function getMap($dbi, $argarray, $request);
/* --------------------- produce Html ----------------------------- */
Modified: trunk/lib/WysiwygEdit.php
===================================================================
--- trunk/lib/WysiwygEdit.php 2014-10-06 17:15:30 UTC (rev 9203)
+++ trunk/lib/WysiwygEdit.php 2014-10-06 17:17:24 UTC (rev 9204)
@@ -23,7 +23,7 @@
require_once 'lib/InlineParser.php';
-class WysiwygEdit
+abstract class WysiwygEdit
{
function WysiwygEdit()
@@ -31,16 +31,10 @@
$this->_transformer_tags = false;
}
- function Head($name = 'edit[content]')
- {
- trigger_error("virtual", E_USER_ERROR);
- }
+ abstract function Head($name = 'edit[content]');
// to be called after </textarea>
- function Textarea($textarea, $wikitext, $name = 'edit[content]')
- {
- trigger_error("virtual", E_USER_ERROR);
- }
+ abstract function Textarea($textarea, $wikitext, $name = 'edit[content]');
/**
* Handler to convert the Wiki Markup to HTML before editing.
Modified: trunk/lib/difflib.php
===================================================================
--- trunk/lib/difflib.php 2014-10-06 17:15:30 UTC (rev 9203)
+++ trunk/lib/difflib.php 2014-10-06 17:17:24 UTC (rev 9204)
@@ -8,16 +8,13 @@
// You may copy this code freely under the conditions of the GPL.
//
-class _DiffOp
+abstract class _DiffOp
{
public $type;
public $orig;
public $final;
- function reverse()
- {
- trigger_error("pure virtual", E_USER_ERROR);
- }
+ abstract function reverse();
function norig()
{
Modified: trunk/lib/plugin/CacheTest.php
===================================================================
--- trunk/lib/plugin/CacheTest.php 2014-10-06 17:15:30 UTC (rev 9203)
+++ trunk/lib/plugin/CacheTest.php 2014-10-06 17:17:24 UTC (rev 9204)
@@ -54,7 +54,7 @@
class WikiPlugin_CacheTest
extends WikiPluginCached
{
- /* --------- overwrite virtual or abstract methods ---------------- */
+ /* --------- overwrite abstract methods ---------------- */
function getPluginType()
{
@@ -80,7 +80,7 @@
// image handle to an error image if you do not,
// WikiPluginImageCache will do so.
- function getImage($dbi, $argarray, $request)
+ protected function getImage($dbi, $argarray, $request)
{
extract($argarray);
return $this->produceGraphics($text, $font);
Modified: trunk/lib/plugin/GraphViz.php
===================================================================
--- trunk/lib/plugin/GraphViz.php 2014-10-06 17:15:30 UTC (rev 9203)
+++ trunk/lib/plugin/GraphViz.php 2014-10-06 17:17:24 UTC (rev 9204)
@@ -261,7 +261,7 @@
return $ok ? $tempfile : false;
}
- function getImage($dbi, $argarray, $request)
+ protected function getImage($dbi, $argarray, $request)
{
$dotbin = GRAPHVIZ_EXE;
$tempfiles = $this->tempnam($this->getName());
@@ -331,7 +331,7 @@
return 'imgtype';
}
- function getMap($dbi, $argarray, $request)
+ protected function getMap($dbi, $argarray, $request)
{
$result = $this->invokeDot($argarray);
if (isa($result, 'HtmlElement'))
Modified: trunk/lib/plugin/LinkDatabase.php
===================================================================
--- trunk/lib/plugin/LinkDatabase.php 2014-10-06 17:15:30 UTC (rev 9203)
+++ trunk/lib/plugin/LinkDatabase.php 2014-10-06 17:17:24 UTC (rev 9204)
@@ -74,11 +74,21 @@
* @param string $basepage
* @return mixed
*/
- function getHtml($dbi, $argarray, $request, $basepage)
+ protected function getHtml($dbi, $argarray, $request, $basepage)
{
$this->run($dbi, WikiPluginCached::glueArgs($argarray), $request, $basepage);
}
+ protected function getImage($dbi, $argarray, $request)
+ {
+ trigger_error('pure virtual', E_USER_ERROR);
+ }
+
+ protected function getMap($dbi, $argarray, $request)
+ {
+ trigger_error('pure virtual', E_USER_ERROR);
+ }
+
/**
* @param WikiDB $dbi
* @param string $argstr
Modified: trunk/lib/plugin/Ploticus.php
===================================================================
--- trunk/lib/plugin/Ploticus.php 2014-10-06 17:15:30 UTC (rev 9203)
+++ trunk/lib/plugin/Ploticus.php 2014-10-06 17:17:24 UTC (rev 9204)
@@ -202,7 +202,7 @@
return 1;
}
- function getImage($dbi, $argarray, $request)
+ protected function getImage($dbi, $argarray, $request)
{
$source =& $this->source;
if (empty($source)) {
@@ -289,7 +289,7 @@
return 'device';
}
- function getMap($dbi, $argarray, $request)
+ protected function getMap($dbi, $argarray, $request)
{
$img = $this->getImage($dbi, $argarray, $request);
return array($this->_mapfile, $img);
Modified: trunk/lib/plugin/RecentChangesCached.php
===================================================================
--- trunk/lib/plugin/RecentChangesCached.php 2014-10-06 17:15:30 UTC (rev 9203)
+++ trunk/lib/plugin/RecentChangesCached.php 2014-10-06 17:17:24 UTC (rev 9204)
@@ -63,7 +63,7 @@
* @param string $basepage
* @return mixed
*/
- function getHtml($dbi, $args, $request, $basepage)
+ protected function getHtml($dbi, $args, $request, $basepage)
{
$plugin = new WikiPlugin_RecentChanges();
$changes = $plugin->getChanges($dbi, $args);
@@ -76,6 +76,16 @@
*/
}
+ protected function getImage($dbi, $argarray, $request)
+ {
+ trigger_error('pure virtual', E_USER_ERROR);
+ }
+
+ protected function getMap($dbi, $argarray, $request)
+ {
+ trigger_error('pure virtual', E_USER_ERROR);
+ }
+
// ->box is used to display a fixed-width, narrow version with common header.
// Just a limited list of pagenames, without date.
// This does not use ->run, to avoid pi construction and deconstruction
Modified: trunk/lib/plugin/SystemInfo.php
===================================================================
--- trunk/lib/plugin/SystemInfo.php 2014-10-06 17:15:30 UTC (rev 9203)
+++ trunk/lib/plugin/SystemInfo.php 2014-10-06 17:17:24 UTC (rev 9204)
@@ -78,7 +78,7 @@
* @param string $basepage
* @return mixed
*/
- function getHtml($dbi, $argarray, $request, $basepage)
+ protected function getHtml($dbi, $argarray, $request, $basepage)
{
$loader = new WikiPluginLoader();
return $loader->expandPI('<<SystemInfo '
@@ -86,6 +86,16 @@
. ' ?>', $request, $this, $basepage);
}
+ protected function getImage($dbi, $argarray, $request)
+ {
+ trigger_error('pure virtual', E_USER_ERROR);
+ }
+
+ protected function getMap($dbi, $argarray, $request)
+ {
+ trigger_error('pure virtual', E_USER_ERROR);
+ }
+
function getDefaultArguments()
{
return array( // 'seperator' => ' ', // on multiple args
Modified: trunk/lib/plugin/TexToPng.php
===================================================================
--- trunk/lib/plugin/TexToPng.php 2014-10-06 17:15:30 UTC (rev 9203)
+++ trunk/lib/plugin/TexToPng.php 2014-10-06 17:17:24 UTC (rev 9204)
@@ -115,13 +115,17 @@
'center' => 'off');
}
- function getImage($dbi, $argarray, $request)
+ protected function getImage($dbi, $argarray, $request)
{
extract($argarray);
$this->checkParams($tex, $magstep, $subslash, $antialias, $transparent);
return $this->TexToImg($tex, $magstep, $antialias, $transparent);
- } // run
+ }
+ protected function getMap($dbi, $argarray, $request)
+ {
+ }
+
function getExpire($dbi, $argarray, $request)
{
return '0';
Modified: trunk/lib/plugin/VisualWiki.php
===================================================================
--- trunk/lib/plugin/VisualWiki.php 2014-10-06 17:15:30 UTC (rev 9203)
+++ trunk/lib/plugin/VisualWiki.php 2014-10-06 17:17:24 UTC (rev 9204)
@@ -134,7 +134,7 @@
* @param Request $request
* @return array($map,$html)
*/
- function getMap($dbi, $argarray, $request)
+ protected function getMap($dbi, $argarray, $request)
{
if (!VISUALWIKI_ALLOWOPTIONS)
$argarray = $this->defaultarguments();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-10-06 17:15:34
|
Revision: 9203
http://sourceforge.net/p/phpwiki/code/9203
Author: vargenau
Date: 2014-10-06 17:15:30 +0000 (Mon, 06 Oct 2014)
Log Message:
-----------
Revert extract arguments by hand
Modified Paths:
--------------
trunk/lib/plugin/BackLinks.php
trunk/lib/plugin/CurrentTime.php
trunk/lib/plugin/FullTextSearch.php
trunk/lib/plugin/IncludePage.php
Modified: trunk/lib/plugin/BackLinks.php
===================================================================
--- trunk/lib/plugin/BackLinks.php 2014-10-06 17:12:32 UTC (rev 9202)
+++ trunk/lib/plugin/BackLinks.php 2014-10-06 17:15:30 UTC (rev 9203)
@@ -58,17 +58,12 @@
function run($dbi, $argstr, &$request, $basepage)
{
$args = $this->getArgs($argstr, $request);
- $page = $args['page'];
- $sortby = $args['sortby'];
- $info = $args['info'];
- $noheader = $args['noheader'];
- $include_self = $args['include_self'];
- $limit = $args['limit'];
- $exclude = $args['exclude'];
+ extract($args);
if (empty($page) and $page != '0') {
return '';
}
+ // exclude is now already expanded in WikiPlugin::getArgs()
if (empty($exclude)) {
$exclude = array();
}
Modified: trunk/lib/plugin/CurrentTime.php
===================================================================
--- trunk/lib/plugin/CurrentTime.php 2014-10-06 17:12:32 UTC (rev 9202)
+++ trunk/lib/plugin/CurrentTime.php 2014-10-06 17:15:30 UTC (rev 9203)
@@ -78,8 +78,7 @@
*/
function run($dbi, $argstr, &$request, $basepage)
{
- $args = $this->getArgs($argstr, $request);
- $format = $args['format'];
+ extract($this->getArgs($argstr, $request));
if ($format == 'date') {
$format = '%Y-%m-%d';
Modified: trunk/lib/plugin/FullTextSearch.php
===================================================================
--- trunk/lib/plugin/FullTextSearch.php 2014-10-06 17:12:32 UTC (rev 9202)
+++ trunk/lib/plugin/FullTextSearch.php 2014-10-06 17:15:30 UTC (rev 9203)
@@ -69,26 +69,17 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return $this|bool|HtmlElement|PageList|XmlContent
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
- // Extract arguments
$args = $this->getArgs($argstr, $request);
- $s = $args['s'];
- $hilight = $args['hilight'];
- $case_exact = $args['case_exact'];
- $regex = $args['regex'];
- $sortby = $args['sortby'];
- $noheader = $args['noheader'];
- $exclude = $args['exclude'];
- $quiet = $args['quiet'];
- $limit = $args['limit'];
- if (empty($s)) {
+ if (empty($args['s'])) {
return HTML::p(array('class' => 'warning'),
_("You must enter a search term."));
}
+ extract($args);
$query = new TextSearchQuery($s, $case_exact, $regex);
$pages = $dbi->fullSearch($query, $sortby, $limit, $exclude);
Modified: trunk/lib/plugin/IncludePage.php
===================================================================
--- trunk/lib/plugin/IncludePage.php 2014-10-06 17:12:32 UTC (rev 9202)
+++ trunk/lib/plugin/IncludePage.php 2014-10-06 17:15:30 UTC (rev 9203)
@@ -51,9 +51,10 @@
function getWikiPageLinks($argstr, $basepage)
{
- $args = $this->getArgs($argstr);
- $page = $args['page'];
+ extract($this->getArgs($argstr));
+ if (!isset($page))
+ return false;
if ($page) {
// Expand relative page names.
$page = new WikiPageName($page, $basepage);
@@ -88,9 +89,7 @@
function run($dbi, $argstr, &$request, $basepage)
{
$args = $this->getArgs($argstr, $request);
- $page = $args['page'];
- $rev = $args['rev'];
- $quiet = $args['quiet'];
+ extract($args);
if ($page) {
// Expand relative page names.
@@ -192,13 +191,7 @@
*/
protected function extractParts($c, $pagename, $args)
{
- $section = $args['section'];
- $sections = $args['sections'];
- $lines = $args['lines'];
- $words = $args['words'];
- $bytes = $args['bytes'];
- $quiet = $args['quiet'];
- $sectionhead = $args['sectionhead'];
+ extract($args);
if ($section) {
if ($sections) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-10-06 17:12:36
|
Revision: 9202
http://sourceforge.net/p/phpwiki/code/9202
Author: vargenau
Date: 2014-10-06 17:12:32 +0000 (Mon, 06 Oct 2014)
Log Message:
-----------
Remove pagename assertion
Modified Paths:
--------------
trunk/lib/stdlib.php
Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php 2014-10-06 17:09:23 UTC (rev 9201)
+++ trunk/lib/stdlib.php 2014-10-06 17:12:32 UTC (rev 9202)
@@ -910,13 +910,6 @@
return $page->getPageName();
elseif (isa($page, 'WikiPageName'))
return $page->name;
- // '0' or e.g. '1984' should be allowed though
- if (!is_string($page) and !is_integer($page)) {
- trigger_error(sprintf("Non-string pagename “%s” (%s)(%s)",
- $page, gettype($page), get_class($page)),
- E_USER_NOTICE);
- }
- //assert(is_string($page));
return $page;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-10-06 17:09:31
|
Revision: 9201
http://sourceforge.net/p/phpwiki/code/9201
Author: vargenau
Date: 2014-10-06 17:09:23 +0000 (Mon, 06 Oct 2014)
Log Message:
-----------
Whitespace only
Modified Paths:
--------------
trunk/lib/wikilens/RatingsDb.php
Modified: trunk/lib/wikilens/RatingsDb.php
===================================================================
--- trunk/lib/wikilens/RatingsDb.php 2014-10-06 17:08:10 UTC (rev 9200)
+++ trunk/lib/wikilens/RatingsDb.php 2014-10-06 17:09:23 UTC (rev 9201)
@@ -448,7 +448,6 @@
*
* @return DB iterator with results
*/
-
function sql_get_rating($dimension = null, $rater = null, $ratee = null,
$orderby = null, $pageinfo = "ratee")
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-10-06 17:08:18
|
Revision: 9200
http://sourceforge.net/p/phpwiki/code/9200
Author: vargenau
Date: 2014-10-06 17:08:10 +0000 (Mon, 06 Oct 2014)
Log Message:
-----------
Remove commented code
Modified Paths:
--------------
trunk/themes/Hawaiian/lib/random.php
Modified: trunk/themes/Hawaiian/lib/random.php
===================================================================
--- trunk/themes/Hawaiian/lib/random.php 2014-10-06 14:39:41 UTC (rev 9199)
+++ trunk/themes/Hawaiian/lib/random.php 2014-10-06 17:08:10 UTC (rev 9200)
@@ -27,9 +27,6 @@
function pickRandom()
{
$this->filename = $this->imageList[array_rand($this->imageList)];
- //trigger_error(sprintf(_("random image chosen: %s"),
- // $this->filename),
- // E_USER_NOTICE); //debugging
return $this->filename;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-10-06 14:39:49
|
Revision: 9199
http://sourceforge.net/p/phpwiki/code/9199
Author: vargenau
Date: 2014-10-06 14:39:41 +0000 (Mon, 06 Oct 2014)
Log Message:
-----------
protected function pngArg
Modified Paths:
--------------
trunk/lib/WikiPluginCached.php
trunk/lib/plugin/GraphViz.php
trunk/lib/plugin/Ploticus.php
Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php 2014-10-06 12:49:21 UTC (rev 9198)
+++ trunk/lib/WikiPluginCached.php 2014-10-06 14:39:41 UTC (rev 9199)
@@ -421,6 +421,19 @@
}
/**
+ * Which argument must be set to 'png', for the fallback image when svg
+ * will fail on the client.
+ * type: SVG_PNG
+ *
+ * @return string
+ */
+ protected function pngArg()
+ {
+ trigger_error('WikiPluginCached::pngArg: pure virtual function in file '
+ . __FILE__ . ' line ' . __LINE__, E_USER_ERROR);
+ }
+
+ /**
* Creates an HTML <img> tag hyperlinking to the specified
* url and produces an alternative text for non-graphical
* browsers.
Modified: trunk/lib/plugin/GraphViz.php
===================================================================
--- trunk/lib/plugin/GraphViz.php 2014-10-06 12:49:21 UTC (rev 9198)
+++ trunk/lib/plugin/GraphViz.php 2014-10-06 14:39:41 UTC (rev 9199)
@@ -319,9 +319,14 @@
return $outfile;
}
- // which argument must be set to 'png', for the fallback image when svg will fail on the client.
- // type: SVG_PNG
- function pngArg()
+ /**
+ * Which argument must be set to 'png', for the fallback image when svg
+ * will fail on the client.
+ * type: SVG_PNG
+ *
+ * @return string
+ */
+ protected function pngArg()
{
return 'imgtype';
}
Modified: trunk/lib/plugin/Ploticus.php
===================================================================
--- trunk/lib/plugin/Ploticus.php 2014-10-06 12:49:21 UTC (rev 9198)
+++ trunk/lib/plugin/Ploticus.php 2014-10-06 14:39:41 UTC (rev 9199)
@@ -277,9 +277,14 @@
return "$tempfile.$gif";
}
- // which argument must be set to 'png', for the fallback image when svg will fail on the client.
- // type: SVG_PNG
- function pngArg()
+ /**
+ * Which argument must be set to 'png', for the fallback image when svg
+ * will fail on the client.
+ * type: SVG_PNG
+ *
+ * @return string
+ */
+ protected function pngArg()
{
return 'device';
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-10-06 12:49:23
|
Revision: 9198
http://sourceforge.net/p/phpwiki/code/9198
Author: vargenau
Date: 2014-10-06 12:49:21 +0000 (Mon, 06 Oct 2014)
Log Message:
-----------
Check file size
Modified Paths:
--------------
trunk/lib/WikiPluginCached.php
Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php 2014-10-06 12:25:59 UTC (rev 9197)
+++ trunk/lib/WikiPluginCached.php 2014-10-06 12:49:21 UTC (rev 9198)
@@ -747,7 +747,11 @@
}
if (file_exists($tmpfile)) {
$fp = fopen($tmpfile, 'rb');
- $content['image'] = fread($fp, filesize($tmpfile));
+ if (filesize($tmpfile)) {
+ $content['image'] = fread($fp, filesize($tmpfile));
+ } else {
+ $content['image'] = '';
+ }
fclose($fp);
if (!empty($this->_static)) {
// on static it is in "uploads/" but in wikicached also
@@ -756,8 +760,9 @@
return true;
}
unlink($tmpfile);
- if ($content['image'])
+ if ($content['image']) {
return true;
+ }
}
return false;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-10-06 12:26:02
|
Revision: 9197
http://sourceforge.net/p/phpwiki/code/9197
Author: vargenau
Date: 2014-10-06 12:25:59 +0000 (Mon, 06 Oct 2014)
Log Message:
-----------
Update translations
Modified Paths:
--------------
trunk/locale/de/LC_MESSAGES/phpwiki.mo
trunk/locale/es/LC_MESSAGES/phpwiki.mo
trunk/locale/fr/LC_MESSAGES/phpwiki.mo
trunk/locale/it/LC_MESSAGES/phpwiki.mo
trunk/locale/ja/LC_MESSAGES/phpwiki.mo
trunk/locale/nl/LC_MESSAGES/phpwiki.mo
trunk/locale/po/de.po
trunk/locale/po/es.po
trunk/locale/po/fr.po
trunk/locale/po/it.po
trunk/locale/po/ja.po
trunk/locale/po/nl.po
trunk/locale/po/phpwiki.pot
trunk/locale/po/sv.po
trunk/locale/po/zh.po
trunk/locale/sv/LC_MESSAGES/phpwiki.mo
trunk/locale/zh/LC_MESSAGES/phpwiki.mo
Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po 2014-10-06 12:21:30 UTC (rev 9196)
+++ trunk/locale/po/de.po 2014-10-06 12:25:59 UTC (rev 9197)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-03 16:39+0200\n"
+"POT-Creation-Date: 2014-10-06 14:25+0200\n"
"PO-Revision-Date: 2000-10-31 02:23+0200\n"
"Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
"<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -2295,12 +2295,12 @@
msgid "Ploticus image creation."
msgstr ""
+msgid "empty source"
+msgstr "fehlender Quelltext"
+
msgid "shell commands not allowed in Ploticus"
msgstr ""
-msgid "empty source"
-msgstr "fehlender Quelltext"
-
msgid "List of plugins on this wiki."
msgstr "Alle Zusatzprogrammen in diesem Wiki auflisten."
@@ -4907,6 +4907,9 @@
msgid "Image map expired. Reload wiki page to recreate its html part."
msgstr ""
+msgid "Could not create image file from imagehandle."
+msgstr ""
+
msgid "This plugin has no description."
msgstr ""
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po 2014-10-06 12:21:30 UTC (rev 9196)
+++ trunk/locale/po/es.po 2014-10-06 12:25:59 UTC (rev 9197)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-03 16:39+0200\n"
+"POT-Creation-Date: 2014-10-06 14:25+0200\n"
"PO-Revision-Date: 2000-02-01 00:50-0500\n"
"Last-Translator: Pablo Roca <pr...@cl...>\n"
"Language-Team: \n"
@@ -2233,10 +2233,10 @@
msgid "Ploticus image creation."
msgstr ""
-msgid "shell commands not allowed in Ploticus"
+msgid "empty source"
msgstr ""
-msgid "empty source"
+msgid "shell commands not allowed in Ploticus"
msgstr ""
#, fuzzy
@@ -4785,6 +4785,9 @@
"El mapa de imagen expiró. Recargue la página del wiki para reconstruir su "
"pieza del HTML."
+msgid "Could not create image file from imagehandle."
+msgstr ""
+
msgid "This plugin has no description."
msgstr ""
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po 2014-10-06 12:21:30 UTC (rev 9196)
+++ trunk/locale/po/fr.po 2014-10-06 12:25:59 UTC (rev 9197)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-03 16:39+0200\n"
+"POT-Creation-Date: 2014-10-06 14:25+0200\n"
"PO-Revision-Date: 2004-06-22 21:10+0200\n"
"Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
"Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -2254,12 +2254,12 @@
msgid "Ploticus image creation."
msgstr "Création de l'image Ploticus."
+msgid "empty source"
+msgstr "source vide"
+
msgid "shell commands not allowed in Ploticus"
msgstr ""
-msgid "empty source"
-msgstr "source vide"
-
msgid "List of plugins on this wiki."
msgstr "Liste des greffons de ce wiki."
@@ -4844,6 +4844,9 @@
msgid "Image map expired. Reload wiki page to recreate its html part."
msgstr ""
+msgid "Could not create image file from imagehandle."
+msgstr ""
+
msgid "This plugin has no description."
msgstr "Ce greffon n'a pas de description."
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po 2014-10-06 12:21:30 UTC (rev 9196)
+++ trunk/locale/po/it.po 2014-10-06 12:25:59 UTC (rev 9197)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-03 16:39+0200\n"
+"POT-Creation-Date: 2014-10-06 14:25+0200\n"
"PO-Revision-Date: 2005-02-12 16:23+0100\n"
"Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
"Language-Team: \n"
@@ -2212,10 +2212,10 @@
msgid "Ploticus image creation."
msgstr ""
-msgid "shell commands not allowed in Ploticus"
+msgid "empty source"
msgstr ""
-msgid "empty source"
+msgid "shell commands not allowed in Ploticus"
msgstr ""
msgid "List of plugins on this wiki."
@@ -4743,6 +4743,9 @@
msgid "Image map expired. Reload wiki page to recreate its html part."
msgstr ""
+msgid "Could not create image file from imagehandle."
+msgstr ""
+
msgid "This plugin has no description."
msgstr ""
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po 2014-10-06 12:21:30 UTC (rev 9196)
+++ trunk/locale/po/ja.po 2014-10-06 12:25:59 UTC (rev 9197)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-03 16:39+0200\n"
+"POT-Creation-Date: 2014-10-06 14:25+0200\n"
"PO-Revision-Date: 2003-06-07 09:01+0900\n"
"Last-Translator: Tadashi Jokagi <web...@el...>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -2234,13 +2234,13 @@
msgid "Ploticus image creation."
msgstr ""
-msgid "shell commands not allowed in Ploticus"
-msgstr ""
-
#, fuzzy
msgid "empty source"
msgstr "ソースを見る"
+msgid "shell commands not allowed in Ploticus"
+msgstr ""
+
msgid "List of plugins on this wiki."
msgstr ""
@@ -4886,6 +4886,9 @@
msgid "Image map expired. Reload wiki page to recreate its html part."
msgstr ""
+msgid "Could not create image file from imagehandle."
+msgstr ""
+
msgid "This plugin has no description."
msgstr ""
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po 2014-10-06 12:21:30 UTC (rev 9196)
+++ trunk/locale/po/nl.po 2014-10-06 12:25:59 UTC (rev 9197)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-03 16:39+0200\n"
+"POT-Creation-Date: 2014-10-06 14:25+0200\n"
"PO-Revision-Date: 2000-09-30 02:23+0200\n"
"Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
"Language-Team: Dutch <nl...@li...>\n"
@@ -2203,10 +2203,10 @@
msgid "Ploticus image creation."
msgstr ""
-msgid "shell commands not allowed in Ploticus"
+msgid "empty source"
msgstr ""
-msgid "empty source"
+msgid "shell commands not allowed in Ploticus"
msgstr ""
msgid "List of plugins on this wiki."
@@ -4735,6 +4735,9 @@
msgid "Image map expired. Reload wiki page to recreate its html part."
msgstr ""
+msgid "Could not create image file from imagehandle."
+msgstr ""
+
msgid "This plugin has no description."
msgstr ""
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot 2014-10-06 12:21:30 UTC (rev 9196)
+++ trunk/locale/po/phpwiki.pot 2014-10-06 12:25:59 UTC (rev 9197)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki-1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-03 16:39+0200\n"
+"POT-Creation-Date: 2014-10-06 14:25+0200\n"
"PO-Revision-Date: 2002-12-14 17:51-0500\n"
"Last-Translator: Reini Urban <ru...@us...>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -2197,10 +2197,10 @@
msgid "Ploticus image creation."
msgstr ""
-msgid "shell commands not allowed in Ploticus"
+msgid "empty source"
msgstr ""
-msgid "empty source"
+msgid "shell commands not allowed in Ploticus"
msgstr ""
msgid "List of plugins on this wiki."
@@ -4727,6 +4727,9 @@
msgid "Image map expired. Reload wiki page to recreate its html part."
msgstr ""
+msgid "Could not create image file from imagehandle."
+msgstr ""
+
msgid "This plugin has no description."
msgstr ""
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po 2014-10-06 12:21:30 UTC (rev 9196)
+++ trunk/locale/po/sv.po 2014-10-06 12:25:59 UTC (rev 9197)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-03 16:39+0200\n"
+"POT-Creation-Date: 2014-10-06 14:25+0200\n"
"PO-Revision-Date: 2001-01-27 01:58+0200\n"
"Last-Translator: Jon Åslund <jo...@he...>\n"
"Language-Team: \n"
@@ -2198,10 +2198,10 @@
msgid "Ploticus image creation."
msgstr ""
-msgid "shell commands not allowed in Ploticus"
+msgid "empty source"
msgstr ""
-msgid "empty source"
+msgid "shell commands not allowed in Ploticus"
msgstr ""
msgid "List of plugins on this wiki."
@@ -4728,6 +4728,9 @@
msgid "Image map expired. Reload wiki page to recreate its html part."
msgstr ""
+msgid "Could not create image file from imagehandle."
+msgstr ""
+
msgid "This plugin has no description."
msgstr ""
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po 2014-10-06 12:21:30 UTC (rev 9196)
+++ trunk/locale/po/zh.po 2014-10-06 12:25:59 UTC (rev 9197)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-03 16:39+0200\n"
+"POT-Creation-Date: 2014-10-06 14:25+0200\n"
"PO-Revision-Date: 2004-04-21 10:08+0800\n"
"Last-Translator: DruryL <dr...@us...>\n"
"Language-Team: DruryL <dr...@us...>\n"
@@ -2290,13 +2290,13 @@
msgid "Ploticus image creation."
msgstr ""
-msgid "shell commands not allowed in Ploticus"
-msgstr ""
-
#, fuzzy
msgid "empty source"
msgstr "查看源碼"
+msgid "shell commands not allowed in Ploticus"
+msgstr ""
+
#, fuzzy
msgid "List of plugins on this wiki."
msgstr "在此 wiki 列出所有頁面."
@@ -4971,6 +4971,9 @@
msgid "Image map expired. Reload wiki page to recreate its html part."
msgstr ""
+msgid "Could not create image file from imagehandle."
+msgstr ""
+
msgid "This plugin has no description."
msgstr ""
Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-10-06 12:21:34
|
Revision: 9196
http://sourceforge.net/p/phpwiki/code/9196
Author: vargenau
Date: 2014-10-06 12:21:30 +0000 (Mon, 06 Oct 2014)
Log Message:
-----------
Wikicreole syntax
Modified Paths:
--------------
trunk/lib/WikiPluginCached.php
Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php 2014-10-06 10:19:30 UTC (rev 9195)
+++ trunk/lib/WikiPluginCached.php 2014-10-06 12:21:30 UTC (rev 9196)
@@ -27,7 +27,6 @@
*/
require_once 'lib/WikiPlugin.php';
-// require_once "lib/plugincache-config.php"; // replaced by config.ini settings!
// types:
define('PLUGIN_CACHED_HTML', 0); // cached html (extensive calculation)
@@ -76,7 +75,6 @@
private function genUrl($cache, $argarray)
{
global $request;
- //$cacheparams = $GLOBALS['CacheParams'];
$plugincall = serialize(array(
'pluginname' => $this->getName(),
@@ -137,7 +135,6 @@
public function run($dbi, $argstr, &$request, $basepage)
{
$cache = $this->newCache();
- //$cacheparams = $GLOBALS['CacheParams'];
$sortedargs = $this->getArgs($argstr, $request);
if (is_array($sortedargs))
@@ -400,15 +397,15 @@
* Creates an HTML map hyperlinked to the image specified
* by url and containing the hotspots given by map.
*
- * @param $id string unique id for the plugin call
- * @param $url string url pointing to the image part of the map
- * @param $map string <area> tags defining active
+ * @param string $id unique id for the plugin call
+ * @param string $url url pointing to the image part of the map
+ * @param string $map <area> tags defining active
* regions in the map
- * @param $dbi WikiDB database abstraction class
- * @param $argarray array complete (!) arguments to produce
+ * @param WikiDB $dbi database abstraction class
+ * @param array $argarray complete (!) arguments to produce
* image. It is not necessary to call
* WikiPlugin->getArgs anymore.
- * @param $request Request
+ * @param Request $request
* @return string html output
*/
protected function embedMap($id, $url, $map, &$dbi, $argarray, &$request)
@@ -659,9 +656,9 @@
* Extracts the parameters necessary to reconstruct the plugin
* call needed to produce the requested image.
*
- * @param $plugincall string reference to serialized array containing both
+ * @param string $plugincall reference to serialized array containing both
* name and parameters of the plugin call
- * @param $request Request ???
+ * @param Request $request ???
* @return bool false if an error occurs, true otherwise.
*
*/
@@ -686,13 +683,13 @@
/**
* Creates an image or image map depending on the plugin type.
- * @param $content array reference to created array which overwrite the keys
+ * @param array $content reference to created array which overwrite the keys
* 'image', 'imagetype' and possibly 'html'
- * @param $plugin WikiPluginCached plugin which is called to create image or map
- * @param $dbi WikiDB handle to database
- * @param $argarray array Contains all arguments needed by plugin
- * @param $request Request ????
- * @param $errorformat string outputs errors in 'png', 'gif', 'jpg' or 'html'
+ * @param WikiPluginCached $plugin plugin which is called to create image or map
+ * @param WikiDB $dbi WikiDB handle to database
+ * @param array $argarray array Contains all arguments needed by plugin
+ * @param Request $request Request ????
+ * @param string $errorformat outputs errors in 'png', 'gif', 'jpg' or 'html'
* @return bool error status; true=ok; false=error
*/
private function produceImage(&$content, $plugin, $dbi, $argarray, $request, $errorformat)
@@ -711,8 +708,8 @@
if (!$imagehandle || $errortext) {
if (!$errortext) {
- $errortext = "'<?plugin " . $plugin->getName() . ' '
- . $this->glueArgs($argarray) . " ?>' returned no image, "
+ $errortext = "'<<" . $plugin->getName() . ' '
+ . $this->glueArgs($argarray) . " >>' returned no image, "
. " although no error was reported.";
}
$this->printError($errorformat, $errortext);
@@ -858,7 +855,7 @@
return true;
}
- $errortext = "Could not create image file from imagehandle.";
+ $errortext = _("Could not create image file from imagehandle.");
$this->printError($errorformat, $errortext);
return false;
} // FetchImageFromCache
@@ -941,11 +938,11 @@
* values may be smaller if the chosen font is to big for there
* is further restriction to 600 pixel in width and 350 in height.
*
- * @param $txt string multi line text to be converted
- * @param $fontnr integer number (1-5) telling gd which internal font to use;
+ * @param string $txt multi line text to be converted
+ * @param int $fontnr number (1-5) telling gd which internal font to use;
* I recommend font 2 for errors and 4 for help texts.
- * @param $textcol array text color as a list of the rgb components; array(red,green,blue)
- * @param $bgcol array background color; array(red,green,blue)
+ * @param array $textcol text color as a list of the rgb components; array(red,green,blue)
+ * @param array $bgcol background color; array(red,green,blue)
* @return string image handle for gd routines
*/
static public function text2img($txt, $fontnr, $textcol, $bgcol)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-10-06 10:19:38
|
Revision: 9195
http://sourceforge.net/p/phpwiki/code/9195
Author: vargenau
Date: 2014-10-06 10:19:30 +0000 (Mon, 06 Oct 2014)
Log Message:
-----------
Update PHP Doc; type compatibility
Modified Paths:
--------------
trunk/lib/plugin/GraphViz.php
trunk/lib/plugin/RecentChangesCached.php
trunk/lib/plugin/SiteMap.php
trunk/lib/plugin/VisualWiki.php
trunk/lib/wikilens/RatingsDb.php
Modified: trunk/lib/plugin/GraphViz.php
===================================================================
--- trunk/lib/plugin/GraphViz.php 2014-10-06 10:04:20 UTC (rev 9194)
+++ trunk/lib/plugin/GraphViz.php 2014-10-06 10:19:30 UTC (rev 9195)
@@ -205,7 +205,7 @@
array(255, 255, 255));
}
- function processSource($argarray = false)
+ function processSource($argarray = array())
{
if (empty($this->source)) {
// create digraph from pages
@@ -240,7 +240,12 @@
return $source;
}
- function createDotFile($tempfile = '', $argarray = false)
+ /**
+ * @param string $tempfile
+ * @param array $argarray
+ * @return mixed
+ */
+ function createDotFile($tempfile = '', $argarray = array())
{
$this->source = $this->processSource($argarray);
if (!$this->source)
Modified: trunk/lib/plugin/RecentChangesCached.php
===================================================================
--- trunk/lib/plugin/RecentChangesCached.php 2014-10-06 10:04:20 UTC (rev 9194)
+++ trunk/lib/plugin/RecentChangesCached.php 2014-10-06 10:19:30 UTC (rev 9195)
@@ -79,7 +79,7 @@
// ->box is used to display a fixed-width, narrow version with common header.
// Just a limited list of pagenames, without date.
// This does not use ->run, to avoid pi construction and deconstruction
- function box($args = false, $request = false, $basepage = false, $do_save = false)
+ function box($args = '', $request = null, $basepage = '', $do_save = false)
{
if (!$request) $request =& $GLOBALS['request'];
if (!isset($args['limit'])) $args['limit'] = 12;
Modified: trunk/lib/plugin/SiteMap.php
===================================================================
--- trunk/lib/plugin/SiteMap.php 2014-10-06 10:04:20 UTC (rev 9194)
+++ trunk/lib/plugin/SiteMap.php 2014-10-06 10:19:30 UTC (rev 9195)
@@ -144,7 +144,7 @@
{
include_once 'lib/BlockParser.php';
- $args = $this->getArgs($argstr, $request, false);
+ $args = $this->getArgs($argstr, $request, array());
extract($args);
if (!$page)
return '';
Modified: trunk/lib/plugin/VisualWiki.php
===================================================================
--- trunk/lib/plugin/VisualWiki.php 2014-10-06 10:04:20 UTC (rev 9194)
+++ trunk/lib/plugin/VisualWiki.php 2014-10-06 10:19:30 UTC (rev 9195)
@@ -397,7 +397,7 @@
* <code>dot</code>.
*
* @param string $filename
- * @param bool $argarray
+ * @param array $argarray
* @internal param string $filename name of the dot file to be created
* @internal param float $width width of the output graph in inches
* @internal param float $height height of the graph in inches
Modified: trunk/lib/wikilens/RatingsDb.php
===================================================================
--- trunk/lib/wikilens/RatingsDb.php 2014-10-06 10:04:20 UTC (rev 9194)
+++ trunk/lib/wikilens/RatingsDb.php 2014-10-06 10:19:30 UTC (rev 9195)
@@ -417,7 +417,7 @@
* If this is null (or left off), the search for ratings
* is not restricted by dimension.
*
- * @param rater The page id of the rater, i.e. page doing the rating.
+ * @param int $rater The page id of the rater, i.e. page doing the rating.
* This is a Wiki page id, often of a user page.
* Example: "DanFr"
* [optional]
@@ -425,21 +425,21 @@
* is not restricted by rater.
* TODO: Support an array
*
- * @param ratee The page id of the ratee, i.e. page being rated.
+ * @param int $ratee The page id of the ratee, i.e. page being rated.
* Example: "DudeWheresMyCar"
* [optional]
* If this is null (or left off), the search for ratings
* is not restricted by ratee.
* TODO: Support an array
*
- * @param orderby An order-by clause with fields and (optionally) ASC
+ * @param string $orderby An order-by clause with fields and (optionally) ASC
* or DESC.
* Example: "ratingvalue DESC"
* [optional]
* If this is null (or left off), the search for ratings
* has no guaranteed order
*
- * @param pageinfo The type of page that has its info returned (i.e.,
+ * @param string $pageinfo The type of page that has its info returned (i.e.,
* 'pagename', 'hits', and 'pagedata') in the rows.
* Example: "rater"
* [optional]
@@ -448,6 +448,7 @@
*
* @return DB iterator with results
*/
+
function sql_get_rating($dimension = null, $rater = null, $ratee = null,
$orderby = null, $pageinfo = "ratee")
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-10-06 10:04:24
|
Revision: 9194
http://sourceforge.net/p/phpwiki/code/9194
Author: vargenau
Date: 2014-10-06 10:04:20 +0000 (Mon, 06 Oct 2014)
Log Message:
-----------
Update PHP Doc; type compatibility
Modified Paths:
--------------
trunk/lib/plugin/BlogArchives.php
trunk/lib/plugin/FullTextSearch.php
trunk/lib/plugin/LinkDatabase.php
trunk/lib/plugin/RateIt.php
trunk/lib/plugin/RecentChanges.php
trunk/lib/plugin/RecentChangesCached.php
trunk/lib/plugin/RecentEdits.php
trunk/lib/plugin/RelatedChanges.php
trunk/lib/plugin/RssFeed.php
trunk/lib/plugin/SystemInfo.php
trunk/lib/plugin/WhoIsOnline.php
trunk/lib/plugin/WikiAdminUtils.php
Modified: trunk/lib/plugin/BlogArchives.php
===================================================================
--- trunk/lib/plugin/BlogArchives.php 2014-10-06 10:01:53 UTC (rev 9193)
+++ trunk/lib/plugin/BlogArchives.php 2014-10-06 10:04:20 UTC (rev 9194)
@@ -142,7 +142,13 @@
}
// box is used to display a fixed-width, narrow version with common header
- function box($args = false, $request = false, $basepage = false)
+ /**
+ * @param string $args
+ * @param WikiRequest $request
+ * @param string $basepage
+ * @return $this|HtmlElement
+ */
+ function box($args = '', $request = null, $basepage = '')
{
if (!$request) $request =& $GLOBALS['request'];
if (!$args or empty($args['limit'])) $args['limit'] = 10;
Modified: trunk/lib/plugin/FullTextSearch.php
===================================================================
--- trunk/lib/plugin/FullTextSearch.php 2014-10-06 10:01:53 UTC (rev 9193)
+++ trunk/lib/plugin/FullTextSearch.php 2014-10-06 10:04:20 UTC (rev 9194)
@@ -100,7 +100,7 @@
$args['listtype'] = 'dl';
$args['types'] = array(new _PageList_Column_content
('rev:hi_content', _("Content"), "left", $s, $hilight_re));
- $list = new PageList(false, $exclude, $args);
+ $list = new PageList(array(), $exclude, $args);
$list->setCaption(fmt("Full text search results for “%s”", $s));
while ($page = $pages->next()) {
$list->addPage($page);
Modified: trunk/lib/plugin/LinkDatabase.php
===================================================================
--- trunk/lib/plugin/LinkDatabase.php 2014-10-06 10:01:53 UTC (rev 9193)
+++ trunk/lib/plugin/LinkDatabase.php 2014-10-06 10:04:20 UTC (rev 9194)
@@ -67,6 +67,13 @@
));
}
+ /**
+ * @param WikiDB $dbi
+ * @param string $argstr
+ * @param WikiRequest $request
+ * @param string $basepage
+ * @return mixed
+ */
function getHtml($dbi, $argarray, $request, $basepage)
{
$this->run($dbi, WikiPluginCached::glueArgs($argarray), $request, $basepage);
Modified: trunk/lib/plugin/RateIt.php
===================================================================
--- trunk/lib/plugin/RateIt.php 2014-10-06 10:01:53 UTC (rev 9193)
+++ trunk/lib/plugin/RateIt.php 2014-10-06 10:04:20 UTC (rev 9194)
@@ -102,7 +102,7 @@
if ($imgPrefix and !$WikiTheme->_findData("images/RateIt" . $imgPrefix . "Nk0.png", 1))
$imgPrefix = '';
$img = substr($WikiTheme->_findData("images/RateIt" . $imgPrefix . "Nk0.png"), 0, -7);
- $urlprefix = WikiURL("", 0, 1); // TODO: check actions USE_PATH_INFO=false
+ $urlprefix = WikiURL("", array(), 1); // TODO: check actions USE_PATH_INFO=false
$js_globals = "var rateit_imgsrc = '" . $img . "';
var rateit_action = '" . urlencode("RateIt") . "';
";
@@ -294,7 +294,13 @@
}
// box is used to display a fixed-width, narrow version with common header
- function box($args = false, $request = false, $basepage = false)
+ /**
+ * @param string $args
+ * @param WikiRequest $request
+ * @param string $basepage
+ * @return $this|HtmlElement
+ */
+ function box($args = '', $request = null, $basepage = '')
{
if (!$request) $request =& $GLOBALS['request'];
if (!$request->_user->isSignedIn()) {
Modified: trunk/lib/plugin/RecentChanges.php
===================================================================
--- trunk/lib/plugin/RecentChanges.php 2014-10-06 10:01:53 UTC (rev 9193)
+++ trunk/lib/plugin/RecentChanges.php 2014-10-06 10:04:20 UTC (rev 9194)
@@ -1446,7 +1446,13 @@
// box is used to display a fixed-width, narrow version with common header.
// just a numbered list of limit pagenames, without date.
- function box($args = false, $request = false, $basepage = false)
+ /**
+ * @param string $args
+ * @param WikiRequest $request
+ * @param string $basepage
+ * @return $this|HtmlElement
+ */
+ function box($args = '', $request = null, $basepage = '')
{
if (!$request) $request =& $GLOBALS['request'];
if (!isset($args['limit'])) $args['limit'] = 15;
Modified: trunk/lib/plugin/RecentChangesCached.php
===================================================================
--- trunk/lib/plugin/RecentChangesCached.php 2014-10-06 10:01:53 UTC (rev 9193)
+++ trunk/lib/plugin/RecentChangesCached.php 2014-10-06 10:04:20 UTC (rev 9194)
@@ -56,6 +56,13 @@
// We don't go through pi parsing, instead we go directly to the
// better plugin methods.
+ /**
+ * @param WikiDB $dbi
+ * @param string $argstr
+ * @param WikiRequest $request
+ * @param string $basepage
+ * @return mixed
+ */
function getHtml($dbi, $args, $request, $basepage)
{
$plugin = new WikiPlugin_RecentChanges();
Modified: trunk/lib/plugin/RecentEdits.php
===================================================================
--- trunk/lib/plugin/RecentEdits.php 2014-10-06 10:01:53 UTC (rev 9193)
+++ trunk/lib/plugin/RecentEdits.php 2014-10-06 10:04:20 UTC (rev 9194)
@@ -40,7 +40,13 @@
// box is used to display a fixed-width, narrow version with common header.
// just a numbered list of limit pagenames, without date.
- function box($args = false, $request = false, $basepage = false)
+ /**
+ * @param string $args
+ * @param WikiRequest $request
+ * @param string $basepage
+ * @return $this|HtmlElement
+ */
+ function box($args = '', $request = null, $basepage = '')
{
if (!$request) $request =& $GLOBALS['request'];
if (!isset($args['limit'])) $args['limit'] = 15;
Modified: trunk/lib/plugin/RelatedChanges.php
===================================================================
--- trunk/lib/plugin/RelatedChanges.php 2014-10-06 10:01:53 UTC (rev 9193)
+++ trunk/lib/plugin/RelatedChanges.php 2014-10-06 10:04:20 UTC (rev 9194)
@@ -74,7 +74,13 @@
// box is used to display a fixed-width, narrow version with common header.
// just a numbered list of limit pagenames, without date.
- function box($args = false, $request = false, $basepage = false)
+ /**
+ * @param string $args
+ * @param WikiRequest $request
+ * @param string $basepage
+ * @return $this|HtmlElement
+ */
+ function box($args = '', $request = null, $basepage = '')
{
if (!$request) $request =& $GLOBALS['request'];
if (!isset($args['limit'])) $args['limit'] = 15;
Modified: trunk/lib/plugin/RssFeed.php
===================================================================
--- trunk/lib/plugin/RssFeed.php 2014-10-06 10:01:53 UTC (rev 9193)
+++ trunk/lib/plugin/RssFeed.php 2014-10-06 10:04:20 UTC (rev 9194)
@@ -111,7 +111,13 @@
return $html;
}
- function box($args = false, $request = false, $basepage = false)
+ /**
+ * @param string $args
+ * @param WikiRequest $request
+ * @param string $basepage
+ * @return mixed
+ */
+ function box($args = '', $request = null, $basepage = '')
{
if (!$request) $request =& $GLOBALS['request'];
extract($args);
Modified: trunk/lib/plugin/SystemInfo.php
===================================================================
--- trunk/lib/plugin/SystemInfo.php 2014-10-06 10:01:53 UTC (rev 9193)
+++ trunk/lib/plugin/SystemInfo.php 2014-10-06 10:04:20 UTC (rev 9194)
@@ -71,6 +71,13 @@
return '+1800'; // 30 minutes
}
+ /**
+ * @param WikiDB $dbi
+ * @param string $argstr
+ * @param WikiRequest $request
+ * @param string $basepage
+ * @return mixed
+ */
function getHtml($dbi, $argarray, $request, $basepage)
{
$loader = new WikiPluginLoader();
Modified: trunk/lib/plugin/WhoIsOnline.php
===================================================================
--- trunk/lib/plugin/WhoIsOnline.php 2014-10-06 10:01:53 UTC (rev 9193)
+++ trunk/lib/plugin/WhoIsOnline.php 2014-10-06 10:04:20 UTC (rev 9194)
@@ -75,7 +75,13 @@
// box is used to display a fixed-width, narrow version with common header
// just the number of online users.
- function box($args = false, $request = false, $basepage = false)
+ /**
+ * @param string $args
+ * @param WikiRequest $request
+ * @param string $basepage
+ * @return $this|HtmlElement
+ */
+ function box($args = '', $request = null, $basepage = '')
{
if (!$request) $request =& $GLOBALS['request'];
$stats = $this->getStats($request->_dbi, $request, 'summary');
Modified: trunk/lib/plugin/WikiAdminUtils.php
===================================================================
--- trunk/lib/plugin/WikiAdminUtils.php 2014-10-06 10:01:53 UTC (rev 9193)
+++ trunk/lib/plugin/WikiAdminUtils.php 2014-10-06 10:04:20 UTC (rev 9194)
@@ -236,7 +236,7 @@
private function _do_email_verification(&$request, &$args)
{
$dbi = $request->getDbh();
- $pagelist = new PageList('pagename', 0, $args);
+ $pagelist = new PageList('pagename', array(), $args);
//$args['return_url'] = 'action=email-verification-verified';
$email = new _PageList_Column_email('email', _("E-mail"), 'left');
$emailVerified = new _PageList_Column_emailVerified('emailVerified',
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-10-06 10:02:01
|
Revision: 9193
http://sourceforge.net/p/phpwiki/code/9193
Author: vargenau
Date: 2014-10-06 10:01:53 +0000 (Mon, 06 Oct 2014)
Log Message:
-----------
Remove deprecated HTML tag
Modified Paths:
--------------
trunk/lib/plugin/GoogleMaps.php
Modified: trunk/lib/plugin/GoogleMaps.php
===================================================================
--- trunk/lib/plugin/GoogleMaps.php 2014-10-06 09:42:22 UTC (rev 9192)
+++ trunk/lib/plugin/GoogleMaps.php 2014-10-06 10:01:53 UTC (rev 9193)
@@ -129,9 +129,9 @@
$markerjs = JavaScript("
function createMarker(point, text) {
var marker = new GMarker(point);
- var html = text + \"<br><br><font size='-1'>[" .
+ var html = text + \"<br /><br />[" .
_("new window") .
- "]</font>\";
+ "]\";
GEvent.addListener(marker, \"click\", function() {marker.openInfoWindowHtml(html);});
return marker;
}");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-10-06 09:42:32
|
Revision: 9192
http://sourceforge.net/p/phpwiki/code/9192
Author: vargenau
Date: 2014-10-06 09:42:22 +0000 (Mon, 06 Oct 2014)
Log Message:
-----------
boolean --> bool
Modified Paths:
--------------
trunk/lib/plugin/PopularNearby.php
trunk/lib/plugin/VisualWiki.php
Modified: trunk/lib/plugin/PopularNearby.php
===================================================================
--- trunk/lib/plugin/PopularNearby.php 2014-10-06 09:40:08 UTC (rev 9191)
+++ trunk/lib/plugin/PopularNearby.php 2014-10-06 09:42:22 UTC (rev 9192)
@@ -102,8 +102,8 @@
* mode=incoming: $pages iter and $direction=true
* mode=outgoing: $pages iter and $direction=false
*
- * @param $pages array of WikiDB_Page's or a Page_iterator
- * @param $direction boolean: true if incoming links
+ * @param array $pages array of WikiDB_Page's or a Page_iterator
+ * @param bool $direction true if incoming links
*
* @param int $limit
* @return Array of sorted links
Modified: trunk/lib/plugin/VisualWiki.php
===================================================================
--- trunk/lib/plugin/VisualWiki.php 2014-10-06 09:40:08 UTC (rev 9191)
+++ trunk/lib/plugin/VisualWiki.php 2014-10-06 09:42:22 UTC (rev 9192)
@@ -406,7 +406,7 @@
* @internal param string $shape node shape; 'ellipse', 'box', 'circle', 'point'
* @internal param string $label 'name': label by name,
* 'number': label by unique number
- * @return boolean error status; true=ok; false=error
+ * @return bool error status; true=ok; false=error
*/
function createDotFile($filename, $argarray)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-10-06 09:40:16
|
Revision: 9191
http://sourceforge.net/p/phpwiki/code/9191
Author: vargenau
Date: 2014-10-06 09:40:08 +0000 (Mon, 06 Oct 2014)
Log Message:
-----------
function run: @return mixed
Modified Paths:
--------------
trunk/lib/plugin/AddComment.php
trunk/lib/plugin/AllPages.php
trunk/lib/plugin/AllUsers.php
trunk/lib/plugin/AnalyseAccessLogSql.php
trunk/lib/plugin/AppendText.php
trunk/lib/plugin/AsciiMath.php
trunk/lib/plugin/AsciiSVG.php
trunk/lib/plugin/AtomFeed.php
trunk/lib/plugin/AuthorHistory.php
trunk/lib/plugin/BackLinks.php
trunk/lib/plugin/BlogArchives.php
trunk/lib/plugin/BlogJournal.php
trunk/lib/plugin/BoxRight.php
trunk/lib/plugin/Calendar.php
trunk/lib/plugin/CalendarList.php
trunk/lib/plugin/CategoryPage.php
trunk/lib/plugin/Chart.php
trunk/lib/plugin/Comment.php
trunk/lib/plugin/CreateBib.php
trunk/lib/plugin/CreatePage.php
trunk/lib/plugin/CreateToc.php
trunk/lib/plugin/CurrentTime.php
trunk/lib/plugin/DebugAuthInfo.php
trunk/lib/plugin/DebugBackendInfo.php
trunk/lib/plugin/DebugGroupInfo.php
trunk/lib/plugin/DebugRetransform.php
trunk/lib/plugin/Diff.php
trunk/lib/plugin/DynamicIncludePage.php
trunk/lib/plugin/EditMetaData.php
trunk/lib/plugin/ExternalSearch.php
trunk/lib/plugin/FacebookLike.php
trunk/lib/plugin/FileInfo.php
trunk/lib/plugin/FoafViewer.php
trunk/lib/plugin/FuzzyPages.php
trunk/lib/plugin/GoTo.php
trunk/lib/plugin/GoogleMaps.php
trunk/lib/plugin/GooglePlugin.php
trunk/lib/plugin/HelloWorld.php
trunk/lib/plugin/HtmlConverter.php
trunk/lib/plugin/IncludePage.php
trunk/lib/plugin/IncludePages.php
trunk/lib/plugin/IncludeSiteMap.php
trunk/lib/plugin/IncludeTree.php
trunk/lib/plugin/InterWikiSearch.php
trunk/lib/plugin/JabberPresence.php
trunk/lib/plugin/LdapSearch.php
trunk/lib/plugin/LikePages.php
trunk/lib/plugin/LinkDatabase.php
trunk/lib/plugin/LinkSearch.php
trunk/lib/plugin/ListPages.php
trunk/lib/plugin/ListRelations.php
trunk/lib/plugin/ListSubpages.php
trunk/lib/plugin/MediawikiTable.php
trunk/lib/plugin/ModeratedPage.php
trunk/lib/plugin/MostPopular.php
trunk/lib/plugin/NewPagesPerUser.php
trunk/lib/plugin/NoCache.php
trunk/lib/plugin/OldStyleTable.php
trunk/lib/plugin/OrphanedPages.php
trunk/lib/plugin/PageGroup.php
trunk/lib/plugin/PageHistory.php
trunk/lib/plugin/PageInfo.php
trunk/lib/plugin/PageTrail.php
trunk/lib/plugin/PasswordReset.php
trunk/lib/plugin/PhotoAlbum.php
trunk/lib/plugin/PhpHighlight.php
trunk/lib/plugin/PhpWeather.php
trunk/lib/plugin/PluginManager.php
trunk/lib/plugin/PopUp.php
trunk/lib/plugin/PopularNearby.php
trunk/lib/plugin/PopularTags.php
trunk/lib/plugin/PreferenceApp.php
trunk/lib/plugin/PreferencesInfo.php
trunk/lib/plugin/PrevNext.php
trunk/lib/plugin/Processing.php
trunk/lib/plugin/RandomPage.php
trunk/lib/plugin/RateIt.php
trunk/lib/plugin/RawHtml.php
trunk/lib/plugin/RecentChanges.php
trunk/lib/plugin/RecentComments.php
trunk/lib/plugin/RecentReferrers.php
trunk/lib/plugin/RedirectTo.php
trunk/lib/plugin/RichTable.php
trunk/lib/plugin/RssFeed.php
trunk/lib/plugin/SearchHighlight.php
trunk/lib/plugin/SemanticRelations.php
trunk/lib/plugin/SemanticSearch.php
trunk/lib/plugin/SemanticSearchAdvanced.php
trunk/lib/plugin/SiteMap.php
trunk/lib/plugin/SpellCheck.php
trunk/lib/plugin/SqlResult.php
trunk/lib/plugin/SyncWiki.php
trunk/lib/plugin/SyntaxHighlighter.php
trunk/lib/plugin/SystemInfo.php
trunk/lib/plugin/TeX2png.php
trunk/lib/plugin/Template.php
trunk/lib/plugin/TitleSearch.php
trunk/lib/plugin/Transclude.php
trunk/lib/plugin/TranslateText.php
trunk/lib/plugin/UnfoldSubpages.php
trunk/lib/plugin/UpLoad.php
trunk/lib/plugin/UriResolver.php
trunk/lib/plugin/UserPreferences.php
trunk/lib/plugin/UserRatings.php
trunk/lib/plugin/Video.php
trunk/lib/plugin/WantedPages.php
trunk/lib/plugin/WantedPagesOld.php
trunk/lib/plugin/WatchPage.php
trunk/lib/plugin/WhoIsOnline.php
trunk/lib/plugin/WikiAdminChown.php
trunk/lib/plugin/WikiAdminDeleteAcl.php
trunk/lib/plugin/WikiAdminPurge.php
trunk/lib/plugin/WikiAdminRemove.php
trunk/lib/plugin/WikiAdminRename.php
trunk/lib/plugin/WikiAdminSearchReplace.php
trunk/lib/plugin/WikiAdminSelect.php
trunk/lib/plugin/WikiAdminSetAcl.php
trunk/lib/plugin/WikiAdminSetAclSimple.php
trunk/lib/plugin/WikiAdminSetExternal.php
trunk/lib/plugin/WikiAdminUtils.php
trunk/lib/plugin/WikiBlog.php
trunk/lib/plugin/WikiForm.php
trunk/lib/plugin/WikiFormRich.php
trunk/lib/plugin/WikiForum.php
trunk/lib/plugin/WikiPoll.php
trunk/lib/plugin/WikiTranslation.php
trunk/lib/plugin/WikicreoleTable.php
trunk/lib/plugin/YouTube.php
trunk/lib/plugin/text2png.php
Modified: trunk/lib/plugin/AddComment.php
===================================================================
--- trunk/lib/plugin/AddComment.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/AddComment.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -70,7 +70,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/AllPages.php
===================================================================
--- trunk/lib/plugin/AllPages.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/AllPages.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -58,7 +58,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/AllUsers.php
===================================================================
--- trunk/lib/plugin/AllUsers.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/AllUsers.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -62,7 +62,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/AnalyseAccessLogSql.php
===================================================================
--- trunk/lib/plugin/AnalyseAccessLogSql.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/AnalyseAccessLogSql.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -268,7 +268,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/AppendText.php
===================================================================
--- trunk/lib/plugin/AppendText.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/AppendText.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -61,7 +61,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/AsciiMath.php
===================================================================
--- trunk/lib/plugin/AsciiMath.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/AsciiMath.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -61,7 +61,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/AsciiSVG.php
===================================================================
--- trunk/lib/plugin/AsciiSVG.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/AsciiSVG.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -52,7 +52,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/AtomFeed.php
===================================================================
--- trunk/lib/plugin/AtomFeed.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/AtomFeed.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -49,7 +49,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/AuthorHistory.php
===================================================================
--- trunk/lib/plugin/AuthorHistory.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/AuthorHistory.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -86,7 +86,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/BackLinks.php
===================================================================
--- trunk/lib/plugin/BackLinks.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/BackLinks.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -53,7 +53,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/BlogArchives.php
===================================================================
--- trunk/lib/plugin/BlogArchives.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/BlogArchives.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -58,7 +58,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/BlogJournal.php
===================================================================
--- trunk/lib/plugin/BlogJournal.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/BlogJournal.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -54,7 +54,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/BoxRight.php
===================================================================
--- trunk/lib/plugin/BoxRight.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/BoxRight.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -49,7 +49,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/Calendar.php
===================================================================
--- trunk/lib/plugin/Calendar.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/Calendar.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -170,7 +170,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/CalendarList.php
===================================================================
--- trunk/lib/plugin/CalendarList.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/CalendarList.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -147,7 +147,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/CategoryPage.php
===================================================================
--- trunk/lib/plugin/CategoryPage.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/CategoryPage.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -61,7 +61,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/Chart.php
===================================================================
--- trunk/lib/plugin/Chart.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/Chart.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -74,7 +74,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/Comment.php
===================================================================
--- trunk/lib/plugin/Comment.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/Comment.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -54,7 +54,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/CreateBib.php
===================================================================
--- trunk/lib/plugin/CreateBib.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/CreateBib.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -101,7 +101,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/CreatePage.php
===================================================================
--- trunk/lib/plugin/CreatePage.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/CreatePage.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -61,7 +61,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/CreateToc.php
===================================================================
--- trunk/lib/plugin/CreateToc.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/CreateToc.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -382,7 +382,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/CurrentTime.php
===================================================================
--- trunk/lib/plugin/CurrentTime.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/CurrentTime.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -74,7 +74,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/DebugAuthInfo.php
===================================================================
--- trunk/lib/plugin/DebugAuthInfo.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/DebugAuthInfo.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -46,7 +46,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/DebugBackendInfo.php
===================================================================
--- trunk/lib/plugin/DebugBackendInfo.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/DebugBackendInfo.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -42,7 +42,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/DebugGroupInfo.php
===================================================================
--- trunk/lib/plugin/DebugGroupInfo.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/DebugGroupInfo.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -41,7 +41,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/DebugRetransform.php
===================================================================
--- trunk/lib/plugin/DebugRetransform.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/DebugRetransform.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -41,7 +41,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/Diff.php
===================================================================
--- trunk/lib/plugin/Diff.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/Diff.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -78,7 +78,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/DynamicIncludePage.php
===================================================================
--- trunk/lib/plugin/DynamicIncludePage.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/DynamicIncludePage.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -50,7 +50,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/EditMetaData.php
===================================================================
--- trunk/lib/plugin/EditMetaData.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/EditMetaData.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -59,7 +59,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/ExternalSearch.php
===================================================================
--- trunk/lib/plugin/ExternalSearch.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/ExternalSearch.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -76,7 +76,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/FacebookLike.php
===================================================================
--- trunk/lib/plugin/FacebookLike.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/FacebookLike.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -53,7 +53,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/FileInfo.php
===================================================================
--- trunk/lib/plugin/FileInfo.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/FileInfo.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -57,7 +57,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/FoafViewer.php
===================================================================
--- trunk/lib/plugin/FoafViewer.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/FoafViewer.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -84,7 +84,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/FuzzyPages.php
===================================================================
--- trunk/lib/plugin/FuzzyPages.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/FuzzyPages.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -153,7 +153,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/GoTo.php
===================================================================
--- trunk/lib/plugin/GoTo.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/GoTo.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -48,7 +48,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/GoogleMaps.php
===================================================================
--- trunk/lib/plugin/GoogleMaps.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/GoogleMaps.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -83,7 +83,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/GooglePlugin.php
===================================================================
--- trunk/lib/plugin/GooglePlugin.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/GooglePlugin.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -61,7 +61,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/HelloWorld.php
===================================================================
--- trunk/lib/plugin/HelloWorld.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/HelloWorld.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -57,7 +57,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/HtmlConverter.php
===================================================================
--- trunk/lib/plugin/HtmlConverter.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/HtmlConverter.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -47,7 +47,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/IncludePage.php
===================================================================
--- trunk/lib/plugin/IncludePage.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/IncludePage.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -83,7 +83,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/IncludePages.php
===================================================================
--- trunk/lib/plugin/IncludePages.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/IncludePages.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -49,7 +49,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/IncludeSiteMap.php
===================================================================
--- trunk/lib/plugin/IncludeSiteMap.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/IncludeSiteMap.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -74,7 +74,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/IncludeTree.php
===================================================================
--- trunk/lib/plugin/IncludeTree.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/IncludeTree.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -63,7 +63,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/InterWikiSearch.php
===================================================================
--- trunk/lib/plugin/InterWikiSearch.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/InterWikiSearch.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -44,7 +44,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/JabberPresence.php
===================================================================
--- trunk/lib/plugin/JabberPresence.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/JabberPresence.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -57,7 +57,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/LdapSearch.php
===================================================================
--- trunk/lib/plugin/LdapSearch.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/LdapSearch.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -72,7 +72,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/LikePages.php
===================================================================
--- trunk/lib/plugin/LikePages.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/LikePages.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -53,7 +53,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/LinkDatabase.php
===================================================================
--- trunk/lib/plugin/LinkDatabase.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/LinkDatabase.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -77,7 +77,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/LinkSearch.php
===================================================================
--- trunk/lib/plugin/LinkSearch.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/LinkSearch.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -128,7 +128,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/ListPages.php
===================================================================
--- trunk/lib/plugin/ListPages.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/ListPages.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -63,7 +63,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/ListRelations.php
===================================================================
--- trunk/lib/plugin/ListRelations.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/ListRelations.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -50,7 +50,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/ListSubpages.php
===================================================================
--- trunk/lib/plugin/ListSubpages.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/ListSubpages.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -58,7 +58,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/MediawikiTable.php
===================================================================
--- trunk/lib/plugin/MediawikiTable.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/MediawikiTable.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -77,7 +77,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/ModeratedPage.php
===================================================================
--- trunk/lib/plugin/ModeratedPage.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/ModeratedPage.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -59,7 +59,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/MostPopular.php
===================================================================
--- trunk/lib/plugin/MostPopular.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/MostPopular.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -56,7 +56,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/NewPagesPerUser.php
===================================================================
--- trunk/lib/plugin/NewPagesPerUser.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/NewPagesPerUser.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -59,7 +59,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/NoCache.php
===================================================================
--- trunk/lib/plugin/NoCache.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/NoCache.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -51,7 +51,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/OldStyleTable.php
===================================================================
--- trunk/lib/plugin/OldStyleTable.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/OldStyleTable.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -81,7 +81,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/OrphanedPages.php
===================================================================
--- trunk/lib/plugin/OrphanedPages.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/OrphanedPages.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -56,7 +56,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/PageGroup.php
===================================================================
--- trunk/lib/plugin/PageGroup.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/PageGroup.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -92,7 +92,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/PageHistory.php
===================================================================
--- trunk/lib/plugin/PageHistory.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/PageHistory.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -334,7 +334,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/PageInfo.php
===================================================================
--- trunk/lib/plugin/PageInfo.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/PageInfo.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -45,7 +45,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/PageTrail.php
===================================================================
--- trunk/lib/plugin/PageTrail.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/PageTrail.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -59,7 +59,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/PasswordReset.php
===================================================================
--- trunk/lib/plugin/PasswordReset.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/PasswordReset.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -118,7 +118,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/PhotoAlbum.php
===================================================================
--- trunk/lib/plugin/PhotoAlbum.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/PhotoAlbum.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -159,7 +159,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/PhpHighlight.php
===================================================================
--- trunk/lib/plugin/PhpHighlight.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/PhpHighlight.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -54,7 +54,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/PhpWeather.php
===================================================================
--- trunk/lib/plugin/PhpWeather.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/PhpWeather.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -78,7 +78,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/PluginManager.php
===================================================================
--- trunk/lib/plugin/PluginManager.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/PluginManager.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -43,7 +43,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/PopUp.php
===================================================================
--- trunk/lib/plugin/PopUp.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/PopUp.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -75,7 +75,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/PopularNearby.php
===================================================================
--- trunk/lib/plugin/PopularNearby.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/PopularNearby.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -59,7 +59,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/PopularTags.php
===================================================================
--- trunk/lib/plugin/PopularTags.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/PopularTags.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -55,7 +55,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/PreferenceApp.php
===================================================================
--- trunk/lib/plugin/PreferenceApp.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/PreferenceApp.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -74,7 +74,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/PreferencesInfo.php
===================================================================
--- trunk/lib/plugin/PreferencesInfo.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/PreferencesInfo.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -43,7 +43,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/PrevNext.php
===================================================================
--- trunk/lib/plugin/PrevNext.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/PrevNext.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -56,7 +56,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/Processing.php
===================================================================
--- trunk/lib/plugin/Processing.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/Processing.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -51,7 +51,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/RandomPage.php
===================================================================
--- trunk/lib/plugin/RandomPage.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/RandomPage.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -52,7 +52,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/RateIt.php
===================================================================
--- trunk/lib/plugin/RateIt.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/RateIt.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -195,7 +195,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/RawHtml.php
===================================================================
--- trunk/lib/plugin/RawHtml.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/RawHtml.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -72,7 +72,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/RecentChanges.php
===================================================================
--- trunk/lib/plugin/RecentChanges.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/RecentChanges.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -1423,7 +1423,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/RecentComments.php
===================================================================
--- trunk/lib/plugin/RecentComments.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/RecentComments.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -58,7 +58,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/RecentReferrers.php
===================================================================
--- trunk/lib/plugin/RecentReferrers.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/RecentReferrers.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -50,7 +50,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/RedirectTo.php
===================================================================
--- trunk/lib/plugin/RedirectTo.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/RedirectTo.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -56,7 +56,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/RichTable.php
===================================================================
--- trunk/lib/plugin/RichTable.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/RichTable.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -55,7 +55,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/RssFeed.php
===================================================================
--- trunk/lib/plugin/RssFeed.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/RssFeed.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -49,7 +49,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/SearchHighlight.php
===================================================================
--- trunk/lib/plugin/SearchHighlight.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/SearchHighlight.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -56,7 +56,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/SemanticRelations.php
===================================================================
--- trunk/lib/plugin/SemanticRelations.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/SemanticRelations.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -53,7 +53,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/SemanticSearch.php
===================================================================
--- trunk/lib/plugin/SemanticSearch.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/SemanticSearch.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -271,7 +271,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/SemanticSearchAdvanced.php
===================================================================
--- trunk/lib/plugin/SemanticSearchAdvanced.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/SemanticSearchAdvanced.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -129,7 +129,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/SiteMap.php
===================================================================
--- trunk/lib/plugin/SiteMap.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/SiteMap.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -138,7 +138,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/SpellCheck.php
===================================================================
--- trunk/lib/plugin/SpellCheck.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/SpellCheck.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -117,7 +117,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/SqlResult.php
===================================================================
--- trunk/lib/plugin/SqlResult.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/SqlResult.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -98,7 +98,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/SyncWiki.php
===================================================================
--- trunk/lib/plugin/SyncWiki.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/SyncWiki.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -65,7 +65,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/SyntaxHighlighter.php
===================================================================
--- trunk/lib/plugin/SyntaxHighlighter.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/SyntaxHighlighter.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -54,7 +54,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/SystemInfo.php
===================================================================
--- trunk/lib/plugin/SystemInfo.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/SystemInfo.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -491,7 +491,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/TeX2png.php
===================================================================
--- trunk/lib/plugin/TeX2png.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/TeX2png.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -216,7 +216,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/Template.php
===================================================================
--- trunk/lib/plugin/Template.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/Template.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -107,7 +107,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/TitleSearch.php
===================================================================
--- trunk/lib/plugin/TitleSearch.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/TitleSearch.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -72,7 +72,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/Transclude.php
===================================================================
--- trunk/lib/plugin/Transclude.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/Transclude.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -66,7 +66,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/TranslateText.php
===================================================================
--- trunk/lib/plugin/TranslateText.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/TranslateText.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -59,7 +59,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/UnfoldSubpages.php
===================================================================
--- trunk/lib/plugin/UnfoldSubpages.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/UnfoldSubpages.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -73,7 +73,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/UpLoad.php
===================================================================
--- trunk/lib/plugin/UpLoad.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/UpLoad.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -62,7 +62,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/UriResolver.php
===================================================================
--- trunk/lib/plugin/UriResolver.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/UriResolver.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -52,7 +52,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/UserPreferences.php
===================================================================
--- trunk/lib/plugin/UserPreferences.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/UserPreferences.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -65,7 +65,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/UserRatings.php
===================================================================
--- trunk/lib/plugin/UserRatings.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/UserRatings.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -74,7 +74,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/Video.php
===================================================================
--- trunk/lib/plugin/Video.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/Video.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -65,7 +65,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/WantedPages.php
===================================================================
--- trunk/lib/plugin/WantedPages.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/WantedPages.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -61,7 +61,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/WantedPagesOld.php
===================================================================
--- trunk/lib/plugin/WantedPagesOld.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/WantedPagesOld.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -50,7 +50,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/WatchPage.php
===================================================================
--- trunk/lib/plugin/WatchPage.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/WatchPage.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -100,7 +100,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/WhoIsOnline.php
===================================================================
--- trunk/lib/plugin/WhoIsOnline.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/WhoIsOnline.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -55,7 +55,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/WikiAdminChown.php
===================================================================
--- trunk/lib/plugin/WikiAdminChown.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/WikiAdminChown.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -105,7 +105,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/WikiAdminDeleteAcl.php
===================================================================
--- trunk/lib/plugin/WikiAdminDeleteAcl.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/WikiAdminDeleteAcl.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -82,7 +82,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/WikiAdminPurge.php
===================================================================
--- trunk/lib/plugin/WikiAdminPurge.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/WikiAdminPurge.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -91,7 +91,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/WikiAdminRemove.php
===================================================================
--- trunk/lib/plugin/WikiAdminRemove.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/WikiAdminRemove.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -135,7 +135,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/WikiAdminRename.php
===================================================================
--- trunk/lib/plugin/WikiAdminRename.php 2014-10-06 09:25:36 UTC (rev 9190)
+++ trunk/lib/plugin/WikiAdminRename.php 2014-10-06 09:40:08 UTC (rev 9191)
@@ -66,7 +66,7 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return bool
+ * @return mixed
*/
function run($dbi, $argstr, &$request, $basepage)
{
Modified: trunk/lib/plugin/WikiAdminSearchReplace.php
===================================================================
--- trunk/lib/plugin/WikiAdminSearchReplace...
[truncated message content] |
|
From: <var...@us...> - 2014-10-06 09:25:38
|
Revision: 9190
http://sourceforge.net/p/phpwiki/code/9190
Author: vargenau
Date: 2014-10-06 09:25:36 +0000 (Mon, 06 Oct 2014)
Log Message:
-----------
Update PHP Doc
Modified Paths:
--------------
trunk/lib/WikiPlugin.php
trunk/lib/WikiPluginCached.php
Modified: trunk/lib/WikiPlugin.php
===================================================================
--- trunk/lib/WikiPlugin.php 2014-10-06 08:55:30 UTC (rev 9189)
+++ trunk/lib/WikiPlugin.php 2014-10-06 09:25:36 UTC (rev 9190)
@@ -32,7 +32,13 @@
return false;
}
- // FIXME: args?
+ /**
+ * @param WikiDB $dbi
+ * @param string $argstr
+ * @param WikiRequest $request
+ * @param string $basepage
+ * @return mixed
+ */
function run($dbi, $argstr, &$request, $basepage)
{
trigger_error("WikiPlugin::run: pure virtual function", E_USER_ERROR);
@@ -371,16 +377,25 @@
}
// box is used to display a fixed-width, narrow version with common header
- function box($args = false, $request = false, $basepage = false)
+ /**
+ * @param string $args
+ * @param WikiRequest $request
+ * @param string $basepage
+ * @return $this|HtmlElement
+ */
+ function box($args = '', $request = null, $basepage = '')
{
- if (!$request) $request =& $GLOBALS['request'];
- $dbi = $request->getDbh();
+ if (!$request) {
+ $request =& $GLOBALS['request'];
+ } $dbi = $request->getDbh();
return $this->makeBox('', $this->run($dbi, $args, $request, $basepage));
}
function makeBox($title, $body)
{
- if (!$title) $title = $this->getName();
+ if (!$title) {
+ $title = $this->getName();
+ }
return HTML::div(array('class' => 'box'),
HTML::div(array('class' => 'box-title'), $title),
HTML::div(array('class' => 'box-data'), $body));
@@ -538,7 +553,6 @@
$ErrorManager->pushErrorHandler(new WikiMethodCb($this, '_plugin_error_filter'));
$plugin_class = "WikiPlugin_$plugin_name";
if (!class_exists($plugin_class)) {
- // $include_failed = !@include_once("lib/plugin/$plugin_name.php");
$include_failed = !include_once($plugin_source);
$ErrorManager->popErrorHandler();
Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php 2014-10-06 08:55:30 UTC (rev 9189)
+++ trunk/lib/WikiPluginCached.php 2014-10-06 09:25:36 UTC (rev 9190)
@@ -126,7 +126,7 @@
*
* @param WikiDB $dbi database abstraction class
* @param string $argstr plugin arguments in the call from PhpWiki
- * @param Request $request
+ * @param WikiRequest $request
* @param string $basepage Pagename to use to interpret links [/relative] page names.
* @return string HTML output to be printed to browser
*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-10-06 08:55:38
|
Revision: 9189
http://sourceforge.net/p/phpwiki/code/9189
Author: vargenau
Date: 2014-10-06 08:55:30 +0000 (Mon, 06 Oct 2014)
Log Message:
-----------
Invert test
Modified Paths:
--------------
trunk/lib/plugin/Ploticus.php
Modified: trunk/lib/plugin/Ploticus.php
===================================================================
--- trunk/lib/plugin/Ploticus.php 2014-10-06 08:49:28 UTC (rev 9188)
+++ trunk/lib/plugin/Ploticus.php 2014-10-06 08:55:30 UTC (rev 9189)
@@ -205,77 +205,76 @@
function getImage($dbi, $argarray, $request)
{
$source =& $this->source;
- if (!empty($source)) {
- if ($this->withShellCommand($source)) {
- $this->_errortext .= _("shell commands not allowed in Ploticus");
- return false;
- }
- if (is_array($argarray['data'])) { // support <!plugin-list !> pagelists
- $src = "#proc getdata\ndata:";
- $i = 0;
- foreach ($argarray['data'] as $data) {
- // hash or array?
- if (is_array($data))
- $src .= ("\t" . join(" ", $data) . "\n");
- else
- $src .= ("\t" . '"' . $data . '" ' . $i++ . "\n");
- }
- $src .= $source;
- $source = $src;
- }
- $tempfile = $this->tempnam('Ploticus', 'plo');
- @unlink($tempfile);
- $gif = $argarray['device'];
- $args = "-$gif -o $tempfile.$gif";
- if (!empty($argarray['-csmap'])) {
- $args .= " -csmap -mapfile $tempfile.map";
- $this->_mapfile = "$tempfile.map";
- }
- if (!empty($argarray['-prefab'])) {
- //check $_ENV['PLOTICUS_PREFABS'] and default directory
- global $HTTP_ENV_VARS;
- if (empty($HTTP_ENV_VARS['PLOTICUS_PREFABS'])) {
- if (file_exists("/usr/share/ploticus"))
- $HTTP_ENV_VARS['PLOTICUS_PREFABS'] = "/usr/share/ploticus";
- elseif (defined('PLOTICUS_PREFABS'))
- $HTTP_ENV_VARS['PLOTICUS_PREFABS'] = constant('PLOTICUS_PREFABS');
- }
- $args .= (" -prefab " . $argarray['-prefab']);
- }
- if (isWindows()) {
- $fp = fopen("$tempfile.plo", "w");
- fwrite($fp, $source);
- fclose($fp);
- $code = $this->execute(PLOTICUS_EXE . " $tempfile.plo $args", $tempfile . ".$gif");
- } else {
- $code = $this->filterThroughCmd($source, PLOTICUS_EXE . " -stdin $args");
- sleep(1);
- }
- if (!file_exists($tempfile . ".$gif")) {
- $this->_errortext .= sprintf(_("%s error: outputfile “%s” not created"),
- "Ploticus", "$tempfile.$gif");
- if (isWindows())
- $this->_errortext .= ("\ncmd-line: " . PLOTICUS_EXE . " $tempfile.plo $args");
+ if (empty($source)) {
+ return $this->error(_("empty source"));
+ }
+ if ($this->withShellCommand($source)) {
+ $this->_errortext .= _("shell commands not allowed in Ploticus");
+ return false;
+ }
+ if (is_array($argarray['data'])) { // support <!plugin-list !> pagelists
+ $src = "#proc getdata\ndata:";
+ $i = 0;
+ foreach ($argarray['data'] as $data) {
+ // hash or array?
+ if (is_array($data))
+ $src .= ("\t" . join(" ", $data) . "\n");
else
- $this->_errortext .= ("\ncmd-line: cat script | " . PLOTICUS_EXE . " $args");
- @unlink("$tempfile.pl");
- @unlink("$tempfile");
- return false;
+ $src .= ("\t" . '"' . $data . '" ' . $i++ . "\n");
}
- $ImageCreateFromFunc = "ImageCreateFrom$gif";
- if (function_exists($ImageCreateFromFunc)) {
- $handle = $ImageCreateFromFunc("$tempfile.$gif");
- if ($handle) {
- @unlink("$tempfile.$gif");
- @unlink("$tempfile.plo");
- @unlink("$tempfile");
- return $handle;
- }
+ $src .= $source;
+ $source = $src;
+ }
+ $tempfile = $this->tempnam('Ploticus', 'plo');
+ @unlink($tempfile);
+ $gif = $argarray['device'];
+ $args = "-$gif -o $tempfile.$gif";
+ if (!empty($argarray['-csmap'])) {
+ $args .= " -csmap -mapfile $tempfile.map";
+ $this->_mapfile = "$tempfile.map";
+ }
+ if (!empty($argarray['-prefab'])) {
+ //check $_ENV['PLOTICUS_PREFABS'] and default directory
+ global $HTTP_ENV_VARS;
+ if (empty($HTTP_ENV_VARS['PLOTICUS_PREFABS'])) {
+ if (file_exists("/usr/share/ploticus"))
+ $HTTP_ENV_VARS['PLOTICUS_PREFABS'] = "/usr/share/ploticus";
+ elseif (defined('PLOTICUS_PREFABS'))
+ $HTTP_ENV_VARS['PLOTICUS_PREFABS'] = constant('PLOTICUS_PREFABS');
}
- return "$tempfile.$gif";
+ $args .= (" -prefab " . $argarray['-prefab']);
+ }
+ if (isWindows()) {
+ $fp = fopen("$tempfile.plo", "w");
+ fwrite($fp, $source);
+ fclose($fp);
+ $code = $this->execute(PLOTICUS_EXE . " $tempfile.plo $args", $tempfile . ".$gif");
} else {
- return $this->error(_("empty source"));
+ $code = $this->filterThroughCmd($source, PLOTICUS_EXE . " -stdin $args");
+ sleep(1);
}
+ if (!file_exists($tempfile . ".$gif")) {
+ $this->_errortext .= sprintf(_("%s error: outputfile “%s” not created"),
+ "Ploticus", "$tempfile.$gif");
+ if (isWindows())
+ $this->_errortext .= ("\ncmd-line: " . PLOTICUS_EXE . " $tempfile.plo $args");
+ else
+ $this->_errortext .= ("\ncmd-line: cat script | " . PLOTICUS_EXE . " $args");
+ @unlink("$tempfile.pl");
+ @unlink("$tempfile");
+ return false;
+ }
+ $ImageCreateFromFunc = "ImageCreateFrom$gif";
+ if (function_exists($ImageCreateFromFunc)) {
+ $handle = $ImageCreateFromFunc("$tempfile.$gif");
+ if ($handle) {
+ @unlink("$tempfile.$gif");
+ @unlink("$tempfile.plo");
+ @unlink("$tempfile");
+ return $handle;
+ }
+ }
+ return "$tempfile.$gif";
}
// which argument must be set to 'png', for the fallback image when svg will fail on the client.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-10-06 08:49:35
|
Revision: 9188
http://sourceforge.net/p/phpwiki/code/9188
Author: vargenau
Date: 2014-10-06 08:49:28 +0000 (Mon, 06 Oct 2014)
Log Message:
-----------
Remove commented code
Modified Paths:
--------------
trunk/lib/plugin/Ploticus.php
Modified: trunk/lib/plugin/Ploticus.php
===================================================================
--- trunk/lib/plugin/Ploticus.php 2014-10-03 16:06:26 UTC (rev 9187)
+++ trunk/lib/plugin/Ploticus.php 2014-10-06 08:49:28 UTC (rev 9188)
@@ -204,8 +204,6 @@
function getImage($dbi, $argarray, $request)
{
- //extract($this->getArgs($argstr, $request));
- //extract($argarray);
$source =& $this->source;
if (!empty($source)) {
if ($this->withShellCommand($source)) {
@@ -253,8 +251,6 @@
$code = $this->filterThroughCmd($source, PLOTICUS_EXE . " -stdin $args");
sleep(1);
}
- //if (empty($code))
- // return $this->error(fmt("Couldn't start commandline “%s”", $commandLine));
if (!file_exists($tempfile . ".$gif")) {
$this->_errortext .= sprintf(_("%s error: outputfile “%s” not created"),
"Ploticus", "$tempfile.$gif");
@@ -278,7 +274,7 @@
}
return "$tempfile.$gif";
} else {
- return $this->error(fmt("empty source"));
+ return $this->error(_("empty source"));
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
286 messages has been excluded from this view by a project administrator.
