Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[9847] trunk
|
From: <var...@us...> - 2016-05-25 09:02:51
|
Revision: 9847
http://sourceforge.net/p/phpwiki/code/9847
Author: vargenau
Date: 2016-05-25 09:02:48 +0000 (Wed, 25 May 2016)
Log Message:
-----------
Be case consistent
Modified Paths:
--------------
trunk/config/config-dist.ini
trunk/lib/PageList.php
trunk/lib/WikiPlugin.php
trunk/lib/WikiPluginCached.php
trunk/lib/plugin/FuzzyPages.php
trunk/lib/plugin/PageGroup.php
trunk/lib/plugin/PhotoAlbum.php
trunk/lib/plugin/PrevNext.php
trunk/lib/plugin/TeX2png.php
trunk/lib/plugin/VisualWiki.php
trunk/lib/plugin/text2png.php
trunk/themes/Hawaiian/themeinfo.php
trunk/themes/MacOSX/themeinfo.php
Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini 2016-05-25 08:49:19 UTC (rev 9846)
+++ trunk/config/config-dist.ini 2016-05-25 09:02:48 UTC (rev 9847)
@@ -1305,7 +1305,7 @@
; (As it is the case for a graphical site map.)
;PLUGIN_CACHED_FORCE_SYNCMAP = true
-; If ImageTypes() does not exist (PHP < 4.0.2) allow the
+; If imagetypes() does not exist (PHP < 4.0.2) allow the
; following image formats (IMG_PNG | IMG_GIF | IMG_JPG | IMG_WBMP)
; In principal all image types which are compiled into php:
; libgd, libpng, libjpeg, libungif, libtiff, libgd2, ...
Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php 2016-05-25 08:49:19 UTC (rev 9846)
+++ trunk/lib/PageList.php 2016-05-25 09:02:48 UTC (rev 9847)
@@ -90,7 +90,7 @@
//Fixme: pass all also other GET args along. (limit, p[])
//TODO: support GET and POST
$s = HTML::a(array('href' =>
- $request->GetURLtoSelf(array('sortby' => $sortby)),
+ $request->getURLtoSelf(array('sortby' => $sortby)),
'class' => 'pagetitle',
'title' => sprintf(_("Sort by %s"), $this->_field)),
HTML::u($this->_heading));
@@ -140,7 +140,7 @@
}
$s = HTML::a(array('href' =>
//Fixme: pass all also other GET args along. (limit is ok, p[])
- $request->GetURLtoSelf(array('sortby' => $sortby,
+ $request->getURLtoSelf(array('sortby' => $sortby,
'id' => $pagelist->id)),
'class' => 'gridbutton',
'title' => sprintf($title, $this->_heading)),
Modified: trunk/lib/WikiPlugin.php
===================================================================
--- trunk/lib/WikiPlugin.php 2016-05-25 08:49:19 UTC (rev 9846)
+++ trunk/lib/WikiPlugin.php 2016-05-25 09:02:48 UTC (rev 9847)
@@ -454,7 +454,7 @@
} else
if (stristr($default, ' '))
$default = "'$default'";
- $arguments->pushcontent("$arg=$default", HTML::br());
+ $arguments->pushContent("$arg=$default", HTML::br());
}
return $arguments;
}
Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php 2016-05-25 08:49:19 UTC (rev 9846)
+++ trunk/lib/WikiPluginCached.php 2016-05-25 09:02:48 UTC (rev 9847)
@@ -534,7 +534,7 @@
'xbm' => IMG_XBM,
*/
);
- $presenttypes = ImageTypes();
+ $presenttypes = imagetypes();
foreach ($imagetypes as $imgtype => $bitmask)
if ($presenttypes && $bitmask)
array_push($supportedtypes, $imgtype);
Modified: trunk/lib/plugin/FuzzyPages.php
===================================================================
--- trunk/lib/plugin/FuzzyPages.php 2016-05-25 08:49:19 UTC (rev 9846)
+++ trunk/lib/plugin/FuzzyPages.php 2016-05-25 09:02:48 UTC (rev 9847)
@@ -198,7 +198,7 @@
$debug_metaphone = sprintf("(%s, %s)", metaphone($pagename),
$this->_searchterm_metaphone);
- $row->pushcontent(HTML::td(array('class' => 'align-center'), $debug_spelling),
+ $row->pushContent(HTML::td(array('class' => 'align-center'), $debug_spelling),
HTML::td(array('class' => 'align-center'), $debug_sound),
HTML::td($debug_metaphone));
}
Modified: trunk/lib/plugin/PageGroup.php
===================================================================
--- trunk/lib/plugin/PageGroup.php 2016-05-25 08:49:19 UTC (rev 9846)
+++ trunk/lib/plugin/PageGroup.php 2016-05-25 09:02:48 UTC (rev 9847)
@@ -145,8 +145,8 @@
$go = array('previous', 'next');
$links = HTML();
- $links->pushcontent($label);
- $links->pushcontent(" [ "); // an experiment
+ $links->pushContent($label);
+ $links->pushContent(" [ "); // an experiment
$lastindex = count($c) - 1; // array is 0-based, count is 1-based!
foreach ($go as $go_item) {
@@ -161,8 +161,8 @@
// mind the French : punctuation
$text = fmt("%s: %s", $directions[$go_item],
$WikiTheme->makeLinkButton($linkpage));
- $links->pushcontent($text);
- $links->pushcontent($sep); // this works because
+ $links->pushContent($text);
+ $links->pushContent($sep); // this works because
// there are only 2 go
// items, previous,next
} else {
@@ -172,8 +172,8 @@
$linkpage = $c[$thispage - 1];
$text = fmt("%s: %s", $directions[$go_item],
$WikiTheme->makeLinkButton($linkpage));
- $links->pushcontent($text);
- $links->pushcontent($sep); //this works
+ $links->pushContent($text);
+ $links->pushContent($sep); //this works
//because there are
//only 2 go items,
//previous,next
@@ -197,10 +197,10 @@
$WikiTheme->makeLinkButton($linkpage));
}
}
- $links->pushcontent($text);
+ $links->pushContent($text);
}
}
- $links->pushcontent(" ] "); // an experiment
+ $links->pushContent(" ] "); // an experiment
return $links;
}
}
Modified: trunk/lib/plugin/PhotoAlbum.php
===================================================================
--- trunk/lib/plugin/PhotoAlbum.php 2016-05-25 08:49:19 UTC (rev 9846)
+++ trunk/lib/plugin/PhotoAlbum.php 2016-05-25 09:02:48 UTC (rev 9847)
@@ -491,9 +491,9 @@
$p
) {
if ($mode == 'row')
- $html->pushcontent(HTML::div($row));
+ $html->pushContent(HTML::div($row));
else
- $html->pushcontent(HTML::tr($row));
+ $html->pushContent(HTML::tr($row));
$row->setContent('');
}
}
Modified: trunk/lib/plugin/PrevNext.php
===================================================================
--- trunk/lib/plugin/PrevNext.php 2016-05-25 08:49:19 UTC (rev 9846)
+++ trunk/lib/plugin/PrevNext.php 2016-05-25 09:02:48 UTC (rev 9847)
@@ -99,9 +99,9 @@
if ($align == 'center') {
$tr->pushContent(HTML::td(array('class' => 'align-'.$align), " [ "));
} elseif ($align == 'right') {
- $td->pushcontent(" [ ");
+ $td->pushContent(" [ ");
} else {
- $links->pushcontent(" [ ");
+ $links->pushContent(" [ ");
}
}
$last_is_text = false;
@@ -117,9 +117,9 @@
if ($align == 'center') {
$tr->pushContent(HTML::td(array('class' => 'align-'.$align), $sep));
} elseif ($align == 'right') {
- $td->pushcontent($sep);
+ $td->pushContent($sep);
} else {
- $links->pushcontent($sep);
+ $links->pushContent($sep);
}
}
if ($align == 'center') {
@@ -127,7 +127,7 @@
} elseif ($align == 'right') {
$td->pushContent(new ImageButton($label, $url, false, $imgurl));
} else {
- $links->pushcontent(new ImageButton($label, $url, false, $imgurl));
+ $links->pushContent(new ImageButton($label, $url, false, $imgurl));
}
$last_is_text = false;
// generic version: prev.gif
@@ -136,9 +136,9 @@
if ($align == 'center') {
$tr->pushContent(HTML::td(array('class' => 'align-'.$align), $sep));
} elseif ($align == 'right') {
- $td->pushcontent($sep);
+ $td->pushContent($sep);
} else {
- $links->pushcontent($sep);
+ $links->pushContent($sep);
}
}
if ($align == 'center') {
@@ -146,7 +146,7 @@
} elseif ($align == 'right') {
$td->pushContent(new ImageButton($label, $url, false, $imgurl));
} else {
- $links->pushcontent(new ImageButton($label, $url, false, $imgurl));
+ $links->pushContent(new ImageButton($label, $url, false, $imgurl));
}
$last_is_text = false;
} else { // text only
@@ -154,9 +154,9 @@
if ($align == 'center') {
$tr->pushContent(HTML::td(array('class' => 'align-'.$align), $sep));
} elseif ($align == 'right') {
- $td->pushcontent($sep);
+ $td->pushContent($sep);
} else {
- $links->pushcontent($sep);
+ $links->pushContent($sep);
}
}
if ($align == 'center') {
@@ -164,7 +164,7 @@
} elseif ($align == 'right') {
$td->pushContent(new Button($label, $url, $class));
} else {
- $links->pushcontent(new Button($label, $url, $class));
+ $links->pushContent(new Button($label, $url, $class));
}
$last_is_text = true;
}
@@ -173,9 +173,9 @@
if ($align == 'center') {
$tr->pushContent(HTML::td(array('class' => 'align-'.$align), $sep));
} elseif ($align == 'right') {
- $td->pushcontent($sep);
+ $td->pushContent($sep);
} else {
- $links->pushcontent($sep);
+ $links->pushContent($sep);
}
}
if ($align == 'center') {
@@ -183,7 +183,7 @@
} elseif ($align == 'right') {
$td->pushContent(new Button($label, $url, $class));
} else {
- $links->pushcontent(new Button($label, $url, $class));
+ $links->pushContent(new Button($label, $url, $class));
}
$last_is_text = true;
}
@@ -194,9 +194,9 @@
if ($align == 'center') {
$tr->pushContent(HTML::td(array('class' => 'align-'.$align), " ] "));
} elseif ($align == 'right') {
- $td->pushcontent(" ] ");
+ $td->pushContent(" ] ");
} else {
- $links->pushcontent(" ] ");
+ $links->pushContent(" ] ");
}
}
return $links;
Modified: trunk/lib/plugin/TeX2png.php
===================================================================
--- trunk/lib/plugin/TeX2png.php 2016-05-25 08:49:19 UTC (rev 9846)
+++ trunk/lib/plugin/TeX2png.php 2016-05-25 09:02:48 UTC (rev 9847)
@@ -221,7 +221,7 @@
function run($dbi, $argstr, &$request, $basepage)
{
// from text2png.php
- if (ImageTypes() & IMG_PNG) {
+ if (imagetypes() & IMG_PNG) {
// we have gd & png so go ahead.
extract($this->getArgs($argstr, $request));
return $this->tex2png($text);
Modified: trunk/lib/plugin/VisualWiki.php
===================================================================
--- trunk/lib/plugin/VisualWiki.php 2016-05-25 08:49:19 UTC (rev 9846)
+++ trunk/lib/plugin/VisualWiki.php 2016-05-25 09:02:48 UTC (rev 9847)
@@ -91,19 +91,19 @@
function getDefaultArguments()
{
if (VISUALWIKI_ALLOWOPTIONS)
- return $this->defaultarguments();
+ return $this->defaultArguments();
else
return array();
}
/**
* Substitutes each forbidden parameter value by the default value
- * defined in <code>defaultarguments</code>.
+ * defined in <code>defaultArguments</code>.
*/
function checkArguments(&$arg)
{
extract($arg);
- $def = $this->defaultarguments();
+ $def = $this->defaultArguments();
if (($width < 3) || ($width > 15))
$arg['width'] = $def['width'];
if (($height < 3) || ($height > 20))
@@ -147,7 +147,7 @@
protected function getMap($dbi, $argarray, $request)
{
if (!VISUALWIKI_ALLOWOPTIONS)
- $argarray = $this->defaultarguments();
+ $argarray = $this->defaultArguments();
$this->checkArguments($argarray);
$request->setArg('debug', $argarray['debug']);
//extract($argarray);
@@ -171,7 +171,7 @@
*/
function helpImage()
{
- $def = $this->defaultarguments();
+ $def = $this->defaultArguments();
$other_imgtypes = $GLOBALS['PLUGIN_CACHED_IMGTYPES'];
unset ($other_imgtypes[$def['imgtype']]);
$helparr = array(
@@ -535,7 +535,7 @@
private function embedImg($url, &$dbi, $argarray, &$request)
{
if (!VISUALWIKI_ALLOWOPTIONS)
- $argarray = $this->defaultarguments();
+ $argarray = $this->defaultArguments();
$this->checkArguments($argarray);
//extract($argarray);
if ($argarray['help'])
Modified: trunk/lib/plugin/text2png.php
===================================================================
--- trunk/lib/plugin/text2png.php 2016-05-25 08:49:19 UTC (rev 9846)
+++ trunk/lib/plugin/text2png.php 2016-05-25 09:02:48 UTC (rev 9847)
@@ -75,7 +75,7 @@
*/
function run($dbi, $argstr, &$request, $basepage)
{
- if (ImageTypes() & IMG_PNG) {
+ if (imagetypes() & IMG_PNG) {
// we have gd & png so go ahead.
$args = $this->getArgs($argstr, $request);
return $this->text2png($args);
Modified: trunk/themes/Hawaiian/themeinfo.php
===================================================================
--- trunk/themes/Hawaiian/themeinfo.php 2016-05-25 08:49:19 UTC (rev 9846)
+++ trunk/themes/Hawaiian/themeinfo.php 2016-05-25 09:02:48 UTC (rev 9847)
@@ -19,7 +19,7 @@
// FIXME: this is a hack which will not be needed once
// we have dynamic CSS.
$css = WikiTheme::getCSS();
- $css->pushcontent(HTML::style(array('type' => 'text/css'),
+ $css->pushContent(HTML::style(array('type' => 'text/css'),
new RawXml(sprintf("<!--\nbody {background-image: url(%s);}\n-->",
$this->getImageURL('uhhbackground.jpg')))));
return $css;
Modified: trunk/themes/MacOSX/themeinfo.php
===================================================================
--- trunk/themes/MacOSX/themeinfo.php 2016-05-25 08:49:19 UTC (rev 9846)
+++ trunk/themes/MacOSX/themeinfo.php 2016-05-25 09:02:48 UTC (rev 9847)
@@ -38,7 +38,7 @@
// FIXME: this is a hack which will not be needed once
// we have dynamic CSS.
$css = WikiTheme::getCSS();
- $css->pushcontent(HTML::style(array('type' => 'text/css'),
+ $css->pushContent(HTML::style(array('type' => 'text/css'),
new RawXml(sprintf("<!--\nbody {background-image: url(%s);}\n-->\n",
$this->getImageURL('bgpaper8')))));
//for non-browse pages, like former editpage, message etc.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
