Menu
▾
▴
phpwiki-checkins
|
From: <var...@us...> - 2012-03-01 11:58:49
|
Revision: 8243
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8243&view=rev
Author: vargenau
Date: 2012-03-01 11:58:38 +0000 (Thu, 01 Mar 2012)
Log Message:
-----------
Be consistent in function declarations
Modified Paths:
--------------
trunk/lib/PageType.php
Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php 2012-03-01 11:36:35 UTC (rev 8242)
+++ trunk/lib/PageType.php 2012-03-01 11:58:38 UTC (rev 8243)
@@ -340,7 +340,7 @@
// New policy: default = new markup (old crashes quite often)
}
- function _transform(&$text) {
+ function _transform($text) {
include_once('lib/BlockParser.php');
return TransformText($text, $this->_markup);
}
@@ -357,8 +357,8 @@
class PageFormatter_wikitext extends PageFormatter
{
- function format(&$text) {
- return HTML::div(array('class' => 'wikitext'),
+ function format($text) {
+ return HTML::div(array('class' => 'wikitext'),
$this->_transform($text));
}
}
@@ -466,7 +466,7 @@
class PageFormatter_html extends PageFormatter
{
function _transform($text) {
- return $text;
+ return $text;
}
function format($text) {
return $text;
@@ -529,7 +529,7 @@
class PageFormatter_MediaWiki extends PageFormatter
{
- function _transform(&$text) {
+ function _transform($text) {
include_once('lib/BlockParser.php');
// Expand leading tabs.
$text = expand_tabs($text);
@@ -539,7 +539,7 @@
return new XmlContent($output->getContent());
}
- function format(&$text) {
+ function format($text) {
return HTML::div(array('class' => 'wikitext'),
$this->_transform($text));
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-06-13 08:51:26
|
Revision: 8901
http://sourceforge.net/p/phpwiki/code/8901
Author: vargenau
Date: 2014-06-13 08:51:17 +0000 (Fri, 13 Jun 2014)
Log Message:
-----------
Replace space by %20 in interwikis
Modified Paths:
--------------
trunk/lib/PageType.php
Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php 2014-06-12 19:18:59 UTC (rev 8900)
+++ trunk/lib/PageType.php 2014-06-13 08:51:17 UTC (rev 8901)
@@ -241,6 +241,7 @@
else
$url .= $page_enc;
+ $url = str_replace(' ', '%20', $url);
$link = HTML::a(array('href' => $url));
if (!$linktext) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-06-18 10:13:07
|
Revision: 8917
http://sourceforge.net/p/phpwiki/code/8917
Author: vargenau
Date: 2014-06-18 10:12:59 +0000 (Wed, 18 Jun 2014)
Log Message:
-----------
Encode spaces in '[[Help:Reini Urban]]' but not in '[[Upload:logo.jpg size=40x25 align=center]]'
Modified Paths:
--------------
trunk/lib/PageType.php
Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php 2014-06-17 16:59:16 UTC (rev 8916)
+++ trunk/lib/PageType.php 2014-06-18 10:12:59 UTC (rev 8917)
@@ -241,7 +241,12 @@
else
$url .= $page_enc;
- $url = str_replace(' ', '%20', $url);
+ // Encode spaces in '[[Help:Reini Urban]]'
+ // but not in '[[Upload:logo.jpg size=40x25 align=center]]'
+ if ($moniker != 'Upload') {
+ $url = str_replace(' ', '%20', $url);
+ }
+
$link = HTML::a(array('href' => $url));
if (!$linktext) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-10-10 16:23:31
|
Revision: 9246
http://sourceforge.net/p/phpwiki/code/9246
Author: vargenau
Date: 2014-10-10 16:23:28 +0000 (Fri, 10 Oct 2014)
Log Message:
-----------
function GetPageType is static
Modified Paths:
--------------
trunk/lib/PageType.php
Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php 2014-10-10 16:03:31 UTC (rev 9245)
+++ trunk/lib/PageType.php 2014-10-10 16:23:28 UTC (rev 9246)
@@ -76,7 +76,7 @@
* @param string $name Name of the page type.
* @return PageType An object which is a subclass of PageType.
*/
- function GetPageType($name = '')
+ static function GetPageType($name = '')
{
if (!$name)
$name = 'wikitext';
@@ -351,6 +351,7 @@
if (!$this->_map)
return '(?:(?!a)a)'; // Never matches.
+ $qkeys = array();
foreach (array_keys($this->_map) as $moniker)
$qkeys[] = preg_quote($moniker, '/');
return "(?:" . join("|", $qkeys) . ")";
@@ -363,7 +364,7 @@
{
/**
* @param WikiDB_Page $page
- * @param hash $meta Version meta-data.
+ * @param array $meta Version meta-data hash.
*/
function __construct(&$page, $meta)
{
@@ -424,13 +425,14 @@
{
$map = $this->_getMap($pagetext);
if (!$map)
- return HTML::p("<No interwiki map found>"); // Shouldn't happen.
+ return HTML::p("No interwiki map found"); // Shouldn't happen.
$mon_attr = array('class' => 'interwiki-moniker');
$url_attr = array('class' => 'interwiki-url');
$thead = HTML::thead(HTML::tr(HTML::th($mon_attr, _("Moniker")),
HTML::th($url_attr, _("InterWiki Address"))));
+ $rows = array();
foreach ($map as $moniker => $interurl) {
$rows[] = HTML::tr(HTML::td($mon_attr, new Cached_WikiLinkIfKnown($moniker)),
HTML::td($url_attr, HTML::samp($interurl)));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-10-13 13:30:32
|
Revision: 9252
http://sourceforge.net/p/phpwiki/code/9252
Author: vargenau
Date: 2014-10-13 13:30:30 +0000 (Mon, 13 Oct 2014)
Log Message:
-----------
Use __construct, private, protected, abstract
Modified Paths:
--------------
trunk/lib/PageType.php
Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php 2014-10-13 13:14:33 UTC (rev 9251)
+++ trunk/lib/PageType.php 2014-10-13 13:30:30 UTC (rev 9252)
@@ -66,7 +66,7 @@
* as of the cached marked-up page, it is important that the PageType classes
* not have large amounts of class data. (No class data is even better.)
*/
-class PageType
+abstract class PageType
{
/**
* Get a page type descriptor.
@@ -155,7 +155,7 @@
class PageType_interwikimap extends PageType
{
- function PageType_interwikimap($pagetext = false)
+ function __construct($pagetext = false)
{
if (!$pagetext) {
$dbi = $GLOBALS['request']->getDbh();
@@ -260,7 +260,7 @@
return $link;
}
- function _parseMap($text)
+ private function _parseMap($text)
{
if (!preg_match_all("/^\s*(\S+)\s+(.+)$/m",
$text, $matches, PREG_SET_ORDER)
@@ -320,7 +320,7 @@
return $map;
}
- function _getMapFromWikiText($pagetext)
+ private function _getMapFromWikiText($pagetext)
{
if (preg_match('|^<verbatim>\n(.*)^</verbatim>|ms', $pagetext, $m)) {
return $m[1];
@@ -328,7 +328,7 @@
return false;
}
- function _getMapFromFile($filename)
+ private function _getMapFromFile($filename)
{
if (defined('WARN_NONPUBLIC_INTERWIKIMAP') and WARN_NONPUBLIC_INTERWIKIMAP) {
$error_html = sprintf(_("Loading InterWikiMap from external file %s."),
@@ -346,7 +346,7 @@
return $data;
}
- function _getRegexp()
+ private function _getRegexp()
{
if (!$this->_map)
return '(?:(?!a)a)'; // Never matches.
@@ -405,23 +405,23 @@
$this->_transform($this->_getFooter($text)));
}
- function _getHeader($text)
+ protected function _getHeader($text)
{
return preg_replace('/<verbatim>.*/s', '', $text);
}
- function _getFooter($text)
+ protected function _getFooter($text)
{
return preg_replace('@.*?(</verbatim>|\Z)@s', '', $text, 1);
}
- function _getMap($pagetext)
+ protected function _getMap($pagetext)
{
$map = getInterwikiMap($pagetext, 'force');
return $map->_map;
}
- function _formatMap($pagetext)
+ protected function _formatMap($pagetext)
{
$map = $this->_getMap($pagetext);
if (!$map)
@@ -446,7 +446,7 @@
class FakePageRevision
{
- function FakePageRevision($meta)
+ function __construct($meta)
{
$this->_meta = $meta;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-10-13 16:45:50
|
Revision: 9253
http://sourceforge.net/p/phpwiki/code/9253
Author: vargenau
Date: 2014-10-13 16:45:39 +0000 (Mon, 13 Oct 2014)
Log Message:
-----------
Remove PageType_pdf
Modified Paths:
--------------
trunk/lib/PageType.php
Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php 2014-10-13 13:30:30 UTC (rev 9252)
+++ trunk/lib/PageType.php 2014-10-13 16:45:39 UTC (rev 9253)
@@ -124,10 +124,6 @@
{
}
-class PageType_pdf extends PageType
-{
-}
-
class PageType_wikiblog extends PageType
{
}
@@ -211,7 +207,7 @@
global $request;
include_once 'lib/config.php';
$url = getUploadFilePath();
- // calculate to a relative local path to /uploads for pdf images.
+ // calculate to a relative local path to /uploads for PDF images.
$doc_root = $request->get("DOCUMENT_ROOT");
$ldir = NormalizeLocalFileName($url);
$wikiroot = NormalizeLocalFileName('');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-09-20 09:27:20
|
Revision: 10581
http://sourceforge.net/p/phpwiki/code/10581
Author: vargenau
Date: 2021-09-20 09:27:18 +0000 (Mon, 20 Sep 2021)
Log Message:
-----------
Remove unnecessary cast
Modified Paths:
--------------
trunk/lib/PageType.php
Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php 2021-09-20 09:25:22 UTC (rev 10580)
+++ trunk/lib/PageType.php 2021-09-20 09:27:18 UTC (rev 10581)
@@ -80,7 +80,7 @@
{
if (!$name)
$name = 'wikitext';
- $class = "PageType_" . (string)$name;
+ $class = "PageType_" . $name;
if (class_exists($class))
return new $class;
trigger_error(sprintf("PageType “%s” unknown", (string)$name),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-09-20 09:28:23
|
Revision: 10582
http://sourceforge.net/p/phpwiki/code/10582
Author: vargenau
Date: 2021-09-20 09:28:21 +0000 (Mon, 20 Sep 2021)
Log Message:
-----------
Remove useless local variable
Modified Paths:
--------------
trunk/lib/PageType.php
Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php 2021-09-20 09:27:18 UTC (rev 10581)
+++ trunk/lib/PageType.php 2021-09-20 09:28:21 UTC (rev 10582)
@@ -184,8 +184,7 @@
{
/*PHP5 Fatal error: Using $this when not in object context */
if (empty($this->_map)) {
- $map = new PageType_interwikimap($pagetext);
- return $map;
+ return new PageType_interwikimap($pagetext);
} else {
return $this;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-09-20 10:11:23
|
Revision: 10583
http://sourceforge.net/p/phpwiki/code/10583
Author: vargenau
Date: 2021-09-20 10:11:20 +0000 (Mon, 20 Sep 2021)
Log Message:
-----------
function _getMapFromFile needs no parameter, always INTERWIKI_MAP_FILE
Modified Paths:
--------------
trunk/lib/PageType.php
Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php 2021-09-20 09:28:21 UTC (rev 10582)
+++ trunk/lib/PageType.php 2021-09-20 10:11:20 UTC (rev 10583)
@@ -174,7 +174,7 @@
$intermap = $this->_getMapFromWikiText($pagetext);
}
if (!$intermap && defined('INTERWIKI_MAP_FILE'))
- $intermap = $this->_getMapFromFile(INTERWIKI_MAP_FILE);
+ $intermap = $this->_getMapFromFile();
$this->_map = $this->_parseMap($intermap);
$this->_regexp = $this->_getRegexp();
@@ -333,14 +333,14 @@
return false;
}
- private function _getMapFromFile($filename)
+ private function _getMapFromFile()
{
if (defined('WARN_NONPUBLIC_INTERWIKIMAP') and WARN_NONPUBLIC_INTERWIKIMAP) {
$error_html = sprintf(_("Loading InterWikiMap from external file %s."),
- $filename);
+ INTERWIKI_MAP_FILE);
trigger_error($error_html, E_USER_NOTICE);
}
- if (!file_exists($filename)) {
+ if (!file_exists(INTERWIKI_MAP_FILE)) {
$finder = new FileFinder();
$filename = $finder->findFile(INTERWIKI_MAP_FILE);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-09-20 10:33:01
|
Revision: 10585
http://sourceforge.net/p/phpwiki/code/10585
Author: vargenau
Date: 2021-09-20 10:32:58 +0000 (Mon, 20 Sep 2021)
Log Message:
-----------
lib/PageType.php: $filename = INTERWIKI_MAP_FILE
Modified Paths:
--------------
trunk/lib/PageType.php
Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php 2021-09-20 10:13:23 UTC (rev 10584)
+++ trunk/lib/PageType.php 2021-09-20 10:32:58 UTC (rev 10585)
@@ -340,7 +340,9 @@
INTERWIKI_MAP_FILE);
trigger_error($error_html, E_USER_NOTICE);
}
- if (!file_exists(INTERWIKI_MAP_FILE)) {
+ if (file_exists(INTERWIKI_MAP_FILE)) {
+ $filename = INTERWIKI_MAP_FILE;
+ } else {
$finder = new FileFinder();
$filename = $finder->findFile(INTERWIKI_MAP_FILE);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X