Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[9850] trunk
|
From: <var...@us...> - 2016-05-25 10:01:57
|
Revision: 9850
http://sourceforge.net/p/phpwiki/code/9850
Author: vargenau
Date: 2016-05-25 10:01:54 +0000 (Wed, 25 May 2016)
Log Message:
-----------
Be case consistent
Modified Paths:
--------------
trunk/lib/Captcha.php
trunk/lib/WikiPluginCached.php
trunk/lib/plugin/AppendText.php
trunk/lib/plugin/AuthorHistory.php
trunk/lib/plugin/GoogleMaps.php
trunk/lib/plugin/GraphViz.php
trunk/lib/plugin/RateIt.php
trunk/lib/plugin/WikiPoll.php
trunk/lib/plugin/text2png.php
trunk/themes/Wordpress/templates/signin.tmpl
trunk/themes/default/templates/signin.tmpl
Modified: trunk/lib/Captcha.php
===================================================================
--- trunk/lib/Captcha.php 2016-05-25 09:41:56 UTC (rev 9849)
+++ trunk/lib/Captcha.php 2016-05-25 10:01:54 UTC (rev 9850)
@@ -183,15 +183,15 @@
imageline($jpg, 0, $height - 1, $width - 1, $height - 1, $tx);
imageline($jpg, $width - 1, 0, $width - 1, $height - 1, $tx);
- if (function_exists("ImageJpeg")) {
+ if (function_exists("imagejpeg")) {
header("Content-type: image/jpeg");
- ImageJpeg($jpg);
- } elseif (function_exists("ImagePNG")) {
+ imagejpeg($jpg);
+ } elseif (function_exists("imagepng")) {
header("Content-type: image/png");
- ImagePNG($jpg);
- } elseif (function_exists("ImageGIF")) {
+ imagepng($jpg);
+ } elseif (function_exists("imagegif")) {
header("Content-type: image/gif");
- ImageGIF($jpg);
+ imagegif($jpg);
} else {
trigger_error("missing GD bitmap support", E_USER_WARNING);
}
Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php 2016-05-25 09:41:56 UTC (rev 9849)
+++ trunk/lib/WikiPluginCached.php 2016-05-25 10:01:54 UTC (rev 9850)
@@ -916,7 +916,7 @@
$talkedallready = ob_get_contents() || headers_sent();
if (($imgtype == 'html') || $talkedallready) {
if (is_object($errortext))
- $errortext = $errortext->asXml();
+ $errortext = $errortext->asXML();
trigger_error($errortext, E_USER_WARNING);
} else {
$red = array(255, 0, 0);
Modified: trunk/lib/plugin/AppendText.php
===================================================================
--- trunk/lib/plugin/AppendText.php 2016-05-25 09:41:56 UTC (rev 9849)
+++ trunk/lib/plugin/AppendText.php 2016-05-25 10:01:54 UTC (rev 9850)
@@ -148,7 +148,7 @@
} else {
$link = HTML::em(WikiLink($pagename));
- $message->pushContent(HTML::raw(sprintf(_("Go to %s."), $link->asXml())));
+ $message->pushContent(HTML::raw(sprintf(_("Go to %s."), $link->asXML())));
}
return $message;
Modified: trunk/lib/plugin/AuthorHistory.php
===================================================================
--- trunk/lib/plugin/AuthorHistory.php 2016-05-25 09:41:56 UTC (rev 9849)
+++ trunk/lib/plugin/AuthorHistory.php 2016-05-25 10:01:54 UTC (rev 9850)
@@ -136,7 +136,7 @@
'if_known'), $nbsp),
HTML::td($nbsp, $rev->get('summary')),
HTML::td(array('class' => 'align-right'),
- $WikiTheme->formatdatetime($rev->get('mtime')))
+ $WikiTheme->formatDateTime($rev->get('mtime')))
);
$class = $isminor ? 'evenrow' : 'oddrow';
@@ -180,7 +180,7 @@
$includeminor ? (HTML::td($nbsp, ($isminor ? "minor" : "major"), $nbsp)) : "",
HTML::td($nbsp, $rev->get('summary')),
HTML::td(array('class' => 'align-right'),
- $WikiTheme->formatdatetime($rev->get('mtime')), $nbsp)
+ $WikiTheme->formatDateTime($rev->get('mtime')), $nbsp)
);
$class = $isminor ? 'evenrow' : 'oddrow';
Modified: trunk/lib/plugin/GoogleMaps.php
===================================================================
--- trunk/lib/plugin/GoogleMaps.php 2016-05-25 09:41:56 UTC (rev 9849)
+++ trunk/lib/plugin/GoogleMaps.php 2016-05-25 10:01:54 UTC (rev 9850)
@@ -148,7 +148,7 @@
($Marker
? "
var point = new GPoint(" . $Longitude . "," . $Latitude . ");
-var marker = createMarker(point, '" . $markertext->asXml() . "'); map.addOverlay(marker);"
+var marker = createMarker(point, '" . $markertext->asXML() . "'); map.addOverlay(marker);"
: "")
);
if ($Marker)
Modified: trunk/lib/plugin/GraphViz.php
===================================================================
--- trunk/lib/plugin/GraphViz.php 2016-05-25 09:41:56 UTC (rev 9849)
+++ trunk/lib/plugin/GraphViz.php 2016-05-25 10:01:54 UTC (rev 9850)
@@ -383,7 +383,7 @@
$source = $this->processSource($argarray);
if (empty($source)) {
$this->complain("No dot graph given");
- return array(false, $this->GetError());
+ return array(false, $this->getError());
}
//$ok = $ok and $this->createDotFile($tempfiles.'.dot', $argarray);
@@ -455,8 +455,8 @@
. (file_exists("$tempfiles.map") ? filesize("$tempfiles.map") : 'missing'));
$this->complain("\ncmd-line: $cmdline1");
$this->complain("\ncmd-line: $cmdline2");
- //trigger_error($this->GetError(), E_USER_WARNING);
- return array(false, $this->GetError());
+ //trigger_error($this->getError(), E_USER_WARNING);
+ return array(false, $this->getError());
}
// clean up tempfiles
@@ -469,7 +469,7 @@
if ($ok)
return array($img, $map);
else
- return array(false, $this->GetError());
+ return array(false, $this->getError());
}
}
Modified: trunk/lib/plugin/RateIt.php
===================================================================
--- trunk/lib/plugin/RateIt.php 2016-05-25 09:41:56 UTC (rev 9849)
+++ trunk/lib/plugin/RateIt.php 2016-05-25 10:01:54 UTC (rev 9850)
@@ -506,7 +506,7 @@
. "'$reImgId','$dimension','X')",
'style' => 'outline: 0'));
$msg = _("Cancel your rating");
- $imgprops = array('src' => $WikiTheme->getImageUrl("RateIt" . $imgPrefix . "Cancel"),
+ $imgprops = array('src' => $WikiTheme->getImageURL("RateIt" . $imgPrefix . "Cancel"),
'id' => $imgId . $imgPrefix . 'Cancel',
'alt' => $msg,
'title' => $msg,
@@ -521,7 +521,7 @@
$a0 = HTML::a(array('href' => "javascript:clickRating('$reImgPrefix','$rePagename','$version',"
. "'$reImgId','$dimension','X')"));
$msg = _("Cancel your rating");
- $imgprops = array('src' => $WikiTheme->getImageUrl("RateIt" . $imgPrefix . "Cancel"),
+ $imgprops = array('src' => $WikiTheme->getImageURL("RateIt" . $imgPrefix . "Cancel"),
'id' => $imgId . $imgPrefix . 'Cancel',
'alt' => $msg,
'title' => $msg);
Modified: trunk/lib/plugin/WikiPoll.php
===================================================================
--- trunk/lib/plugin/WikiPoll.php 2016-05-25 09:41:56 UTC (rev 9849)
+++ trunk/lib/plugin/WikiPoll.php 2016-05-25 10:01:54 UTC (rev 9850)
@@ -251,13 +251,13 @@
private function bar($percent)
{
global $WikiTheme;
- return HTML(HTML::img(array('src' => $WikiTheme->getImageUrl('leftbar'),
+ return HTML(HTML::img(array('src' => $WikiTheme->getImageURL('leftbar'),
'alt' => '<')),
- HTML::img(array('src' => $WikiTheme->getImageUrl('mainbar'),
+ HTML::img(array('src' => $WikiTheme->getImageURL('mainbar'),
'alt' => '-',
'width' => sprintf("%02d", $percent),
'height' => 14)),
- HTML::img(array('src' => $WikiTheme->getImageUrl('rightbar'),
+ HTML::img(array('src' => $WikiTheme->getImageURL('rightbar'),
'alt' => '>')));
}
Modified: trunk/lib/plugin/text2png.php
===================================================================
--- trunk/lib/plugin/text2png.php 2016-05-25 09:41:56 UTC (rev 9849)
+++ trunk/lib/plugin/text2png.php 2016-05-25 10:01:54 UTC (rev 9850)
@@ -163,7 +163,7 @@
*/
// get ready to draw
- $s = ImageTTFBBox($fontsize, 0, $ttfont, $text);
+ $s = imagettfbbox($fontsize, 0, $ttfont, $text);
$im = @imagecreate(abs($s[4]) + 20, abs($s[7]) + 10);
if (empty($im)) {
$error_html = _("PHP was unable to create a new GD image stream. Read 'lib/plugin/text2png.php' for details.");
Modified: trunk/themes/Wordpress/templates/signin.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/signin.tmpl 2016-05-25 09:41:56 UTC (rev 9849)
+++ trunk/themes/Wordpress/templates/signin.tmpl 2016-05-25 10:01:54 UTC (rev 9850)
@@ -41,7 +41,7 @@
$userid = $user->getId();
if ($user->isSignedIn())
echo sprintf(_("You are signed but not authenticated as %s. "),
- asXml(HTML::a(array(
+ asXML(HTML::a(array(
'href'=>'#',
'title' => sprintf(_("Click to authenticate as %s"),$userid),
'onclick'=>'SignIn(document.forms["'.$FORMNAME.'"],"'.$userid.'");'),
Modified: trunk/themes/default/templates/signin.tmpl
===================================================================
--- trunk/themes/default/templates/signin.tmpl 2016-05-25 09:41:56 UTC (rev 9849)
+++ trunk/themes/default/templates/signin.tmpl 2016-05-25 10:01:54 UTC (rev 9850)
@@ -33,7 +33,7 @@
$userid = $user->getId();
if ($user->isSignedIn()) {
echo sprintf(_("You are signed but not authenticated as %s. "),
- asXml(HTML::a(array(
+ asXML(HTML::a(array(
'href'=>'#',
'title' => sprintf(_("Click to authenticate as %s"),$userid),
'onclick'=>'SignIn(document.forms["'.$FORMNAME.'"],"'.$userid.'");'),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
