Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[9851] trunk
|
From: <var...@us...> - 2016-05-25 10:17:46
|
Revision: 9851
http://sourceforge.net/p/phpwiki/code/9851
Author: vargenau
Date: 2016-05-25 10:17:43 +0000 (Wed, 25 May 2016)
Log Message:
-----------
Be case consistent
Modified Paths:
--------------
trunk/lib/WikiPlugin.php
trunk/lib/WikiPluginCached.php
trunk/lib/WikiTheme.php
trunk/lib/WikiUser.php
trunk/lib/plugin/RateIt.php
trunk/lib/plugin/UpLoad.php
trunk/lib/plugin/VisualWiki.php
trunk/lib/plugin/text2png.php
trunk/lib/wikilens/CustomPrefs.php
trunk/themes/Sidebar/hyperapplet.php
trunk/themes/Sidebar/hyperwiki.php
trunk/themes/Sidebar/themeinfo.php
Modified: trunk/lib/WikiPlugin.php
===================================================================
--- trunk/lib/WikiPlugin.php 2016-05-25 10:01:54 UTC (rev 9850)
+++ trunk/lib/WikiPlugin.php 2016-05-25 10:17:43 UTC (rev 9851)
@@ -467,7 +467,7 @@
function expandPI($pi, &$request, &$markup, $basepage = false)
{
- if (!($ppi = $this->parsePi($pi)))
+ if (!($ppi = $this->parsePI($pi)))
return false;
list($pi_name, $plugin, $plugin_args) = $ppi;
@@ -513,7 +513,7 @@
function getWikiPageLinks($pi, $basepage)
{
- if (!($ppi = $this->parsePi($pi)))
+ if (!($ppi = $this->parsePI($pi)))
return false;
list($pi_name, $plugin, $plugin_args) = $ppi;
if (!is_object($plugin))
Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php 2016-05-25 10:01:54 UTC (rev 9850)
+++ trunk/lib/WikiPluginCached.php 2016-05-25 10:17:43 UTC (rev 9851)
@@ -736,7 +736,7 @@
}
if (is_resource($imagehandle)) {
$this->writeImage($content['imagetype'], $imagehandle, $tmpfile);
- ImageDestroy($imagehandle);
+ imagedestroy($imagehandle);
sleep(0.2);
} elseif (is_string($imagehandle)) {
$content['file'] = getUploadFilePath() . basename($tmpfile);
@@ -930,7 +930,7 @@
}
$this->writeHeader($imgtype);
$this->writeImage($imgtype, $im);
- ImageDestroy($im);
+ imagedestroy($im);
}
} // printError
@@ -977,8 +977,8 @@
'width' => 600,
'height' => 350);
- $charx = ImageFontWidth($fontnr);
- $chary = ImageFontHeight($fontnr);
+ $charx = imagefontwidth($fontnr);
+ $chary = imagefontheight($fontnr);
$marginx = $charx;
$marginy = floor($chary / 2);
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php 2016-05-25 10:01:54 UTC (rev 9850)
+++ trunk/lib/WikiTheme.php 2016-05-25 10:17:43 UTC (rev 9851)
@@ -1484,7 +1484,7 @@
* A list of name => _UserPreference class pairs.
* Rationale: Certain themes should be able to extend the predefined list
* of preferences. Display/editing is done in the theme specific userprefs.tmpl
- * but storage/sanification/update/... must be extended to the Get/SetPreferences methods.
+ * but storage/sanification/update/... must be extended to the get/setPreferences methods.
* See themes/wikilens/themeinfo.php
*/
//$this->customUserPreference();
@@ -1506,7 +1506,7 @@
* A list of name => _UserPreference class pairs.
* Rationale: Certain themes should be able to extend the predefined list
* of preferences. Display/editing is done in the theme specific userprefs.tmpl
- * but storage/sanification/update/... must be extended to the Get/SetPreferences methods.
+ * but storage/sanification/update/... must be extended to the get/setPreferences methods.
* These values are just ignored if another theme is used.
*/
function customUserPreferences($array)
Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php 2016-05-25 10:01:54 UTC (rev 9850)
+++ trunk/lib/WikiUser.php 2016-05-25 10:17:43 UTC (rev 9851)
@@ -88,7 +88,7 @@
* 2004-04-04 rurban
* 7) Certain themes should be able to extend the predefined list
* of preferences. Display/editing is done in the theme specific userprefs.tmpl,
- * but storage must be extended to the Get/SetPreferences methods.
+ * but storage must be extended to the get/setPreferences methods.
* <theme>/themeinfo.php must provide CustomUserPreferences:
* A list of name => _UserPreference class pairs.
* 2010-06-07 rurban
@@ -1335,7 +1335,7 @@
/** The default method is storing the password in prefs.
* Child methods (DB, File) may store in external auth also, but this
* must be explicitly enabled.
- * This may be called by plugin/UserPreferences or by ->SetPreferences()
+ * This may be called by plugin/UserPreferences or by ->setPreferences()
*/
function changePass($submitted_password)
{
@@ -1350,7 +1350,7 @@
if ($stored_password != $submitted_password) {
$this->_prefs->set('passwd', $submitted_password);
//update the storage (session, homepage, ...)
- $this->SetPreferences($this->_prefs);
+ $this->setPreferences($this->_prefs);
return true;
}
//Todo: return an error msg to the caller what failed?
Modified: trunk/lib/plugin/RateIt.php
===================================================================
--- trunk/lib/plugin/RateIt.php 2016-05-25 10:01:54 UTC (rev 9850)
+++ trunk/lib/plugin/RateIt.php 2016-05-25 10:17:43 UTC (rev 9851)
@@ -528,7 +528,7 @@
if (!$this->rating)
$imgprops['style'] = 'display:none';
$a0->pushContent(HTML::img($imgprops));
- $a0->addToolTip($msg);
+ $a0->addTooltip($msg);
$html->pushContent($a0);
}
Modified: trunk/lib/plugin/UpLoad.php
===================================================================
--- trunk/lib/plugin/UpLoad.php 2016-05-25 10:01:54 UTC (rev 9850)
+++ trunk/lib/plugin/UpLoad.php 2016-05-25 10:17:43 UTC (rev 9851)
@@ -186,7 +186,7 @@
return HTML($message, $form);
}
if (move_uploaded_file($userfile_tmpname, $file_dir . $sanified_userfile_name) or
- (IsWindows() and rename($userfile_tmpname, $file_dir . $sanified_userfile_name))) {
+ (isWindows() and rename($userfile_tmpname, $file_dir . $sanified_userfile_name))) {
$interwiki = new PageType_interwikimap();
if (UPLOAD_USERDIR) {
$link = $interwiki->link("[[Upload:$username/$sanified_userfile_name]]");
Modified: trunk/lib/plugin/VisualWiki.php
===================================================================
--- trunk/lib/plugin/VisualWiki.php 2016-05-25 10:01:54 UTC (rev 9850)
+++ trunk/lib/plugin/VisualWiki.php 2016-05-25 10:17:43 UTC (rev 9851)
@@ -548,7 +548,7 @@
$upload_dir = getUploadDataPath();
$tmpfile = tempnam($file_dir, "VisualWiki") . "." . $argarray['imgtype'];
WikiPluginCached::writeImage($argarray['imgtype'], $imagehandle, $tmpfile);
- ImageDestroy($imagehandle);
+ imagedestroy($imagehandle);
return WikiPluginCached::embedMap(1, $upload_dir . basename($tmpfile), $content['html'],
$dbi, $argarray, $request);
}
Modified: trunk/lib/plugin/text2png.php
===================================================================
--- trunk/lib/plugin/text2png.php 2016-05-25 10:01:54 UTC (rev 9850)
+++ trunk/lib/plugin/text2png.php 2016-05-25 10:17:43 UTC (rev 9851)
@@ -180,15 +180,15 @@
$rgb = $this->hexcolor($shadowcolor, array(175, 175, 175));
$text_color = imagecolorallocate($im, $rgb[0], $rgb[1], $rgb[2]);
// shadow is 1 pixel down and 2 pixels right
- ImageTTFText($im, $fontsize, 0, 12, abs($s[7]) + 6, $text_color, $ttfont, $text);
+ imagettftext($im, $fontsize, 0, 12, abs($s[7]) + 6, $text_color, $ttfont, $text);
}
// draw text
$rgb = $this->hexcolor($fontcolor, array(0, 0, 0));
$text_color = imagecolorallocate($im, $rgb[0], $rgb[1], $rgb[2]);
- ImageTTFText($im, $fontsize, 0, 10, abs($s[7]) + 5, $text_color, $ttfont, $text);
+ imagettftext($im, $fontsize, 0, 10, abs($s[7]) + 5, $text_color, $ttfont, $text);
/**
- * An alternate text drawing method in case ImageTTFText
+ * An alternate text drawing method in case imagettftext
* doesn't work.
**/
//imagestring($im, 2, 10, 40, $text, $text_color);
@@ -198,7 +198,7 @@
//imagepng($im);
// to save to file:
- $success = ImagePng($im, $filepath . $filename);
+ $success = imagepng($im, $filepath . $filename);
} else {
$filepath .= "/";
Modified: trunk/lib/wikilens/CustomPrefs.php
===================================================================
--- trunk/lib/wikilens/CustomPrefs.php 2016-05-25 10:01:54 UTC (rev 9850)
+++ trunk/lib/wikilens/CustomPrefs.php 2016-05-25 10:17:43 UTC (rev 9851)
@@ -5,7 +5,7 @@
* A list of name => _UserPreference class pairs.
* Rationale: Certain themes should be able to extend the predefined list
* of preferences. Display/editing is done in the theme specific userprefs.tmpl
- * but storage/sanification/update/... must be extended to the Get/SetPreferences methods.
+ * but storage/sanification/update/... must be extended to the get/setPreferences methods.
*
* This is just at alpha stage, a recommendation to the wikilens group.
*/
Modified: trunk/themes/Sidebar/hyperapplet.php
===================================================================
--- trunk/themes/Sidebar/hyperapplet.php 2016-05-25 10:01:54 UTC (rev 9850)
+++ trunk/themes/Sidebar/hyperapplet.php 2016-05-25 10:17:43 UTC (rev 9851)
@@ -10,12 +10,12 @@
global $WikiTheme;
?>
<applet code="hypergraph.applications.hexplorer.HExplorerApplet.class" align="baseline"
- archive="<?php echo $WikiTheme->_finddata("hyperapplet.jar") ?>"
+ archive="<?php echo $WikiTheme->_findData("hyperapplet.jar") ?>"
width="160" height="360">
<?php // the dynamic version: ?>
<!--param name="file" value="<?php echo WikiURL("LinkDatabase", array('format' => 'xml')) ?>" /-->
<?php // The faster static version: dump it periodically ?>
- <param name="file" value="<?php echo $WikiTheme->_finddata("LinkDatabase.xml") ?>"/>
- <!--param name="properties" value="<?php echo $WikiTheme->_finddata("hwiki.prop") ?>" /-->
+ <param name="file" value="<?php echo $WikiTheme->_findData("LinkDatabase.xml") ?>"/>
+ <!--param name="properties" value="<?php echo $WikiTheme->_findData("hwiki.prop") ?>" /-->
<param name="center" value="<?php echo $page->getName() ?>"/>
</applet>
Modified: trunk/themes/Sidebar/hyperwiki.php
===================================================================
--- trunk/themes/Sidebar/hyperwiki.php 2016-05-25 10:01:54 UTC (rev 9850)
+++ trunk/themes/Sidebar/hyperwiki.php 2016-05-25 10:17:43 UTC (rev 9851)
@@ -8,9 +8,9 @@
// via the RPC interface it goes like this...
?>
<applet code="hypergraph.applications.hwiki.HWikiApplet.class"
- archive="<?php echo $WikiTheme->_finddata("hyperwiki.jar") ?>"
+ archive="<?php echo $WikiTheme->_findData("hyperwiki.jar") ?>"
width="162" height="240">
<param name="startPage" value="<?php echo $page->getName() ?>"/>
- <param name="properties" value="<?php echo $WikiTheme->_finddata("hwiki.prop") ?>"/>
+ <param name="properties" value="<?php echo $WikiTheme->_findData("hwiki.prop") ?>"/>
<param name="wikiURL" value="<?php echo PHPWIKI_BASE_URL ?>"/>
</applet>
Modified: trunk/themes/Sidebar/themeinfo.php
===================================================================
--- trunk/themes/Sidebar/themeinfo.php 2016-05-25 10:01:54 UTC (rev 9850)
+++ trunk/themes/Sidebar/themeinfo.php 2016-05-25 10:17:43 UTC (rev 9851)
@@ -181,7 +181,7 @@
* A list of name => _UserPreference class pairs.
* Rationale: Certain themes should be able to extend the predefined list
* of preferences. Display/editing is done in the theme specific userprefs.tmpl
- * but storage/sanification/update/... must be extended to the Get/SetPreferences methods.
+ * but storage/sanification/update/... must be extended to the get/setPreferences methods.
* See themes/wikilens/themeinfo.php
*/
//$this->customUserPreference();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
