Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[9848] trunk
|
From: <var...@us...> - 2016-05-25 09:22:46
|
Revision: 9848
http://sourceforge.net/p/phpwiki/code/9848
Author: vargenau
Date: 2016-05-25 09:22:44 +0000 (Wed, 25 May 2016)
Log Message:
-----------
Be case consistent
Modified Paths:
--------------
trunk/lib/RssWriter091.php
trunk/lib/WikiGroup.php
trunk/lib/WikiPluginCached.php
trunk/lib/loadsave.php
trunk/lib/pdf.php
trunk/lib/plugin/AuthorHistory.php
trunk/lib/plugin/FacebookLike.php
trunk/lib/plugin/PageDump.php
trunk/lib/plugin/RecentChanges.php
trunk/themes/Wordpress/templates/signin.tmpl
trunk/themes/blog/templates/calendar.tmpl
trunk/themes/default/templates/online.tmpl
trunk/themes/default/templates/signin.tmpl
trunk/themes/smaller/templates/signin.tmpl
trunk/themes/wikilens/templates/newuserwelcomepage.tmpl
Modified: trunk/lib/RssWriter091.php
===================================================================
--- trunk/lib/RssWriter091.php 2016-05-25 09:02:48 UTC (rev 9847)
+++ trunk/lib/RssWriter091.php 2016-05-25 09:22:44 UTC (rev 9848)
@@ -74,7 +74,7 @@
}
class _RecentChanges_RssFormatter091
- extends _RecentChanges_RSSFormatter
+ extends _RecentChanges_RssFormatter
// This class should probably go at then of RecentChanges.php
{
function format($changes)
Modified: trunk/lib/WikiGroup.php
===================================================================
--- trunk/lib/WikiGroup.php 2016-05-25 09:02:48 UTC (rev 9847)
+++ trunk/lib/WikiGroup.php 2016-05-25 09:22:44 UTC (rev 9848)
@@ -87,7 +87,7 @@
{
global $request;
$user = (!empty($this->user)) ? $this->user : $request->getUser();
- $username = $user->getID();
+ $username = $user->getId();
if ($username != $this->username) {
$this->membership = array();
$this->username = $username;
@@ -114,7 +114,7 @@
break;
case "DB":
if ($GLOBALS['DBParams']['dbtype'] == 'ADODB') {
- return new GroupDB_ADODB($not_current);
+ return new GroupDb_ADODB($not_current);
} elseif ($GLOBALS['DBParams']['dbtype'] == 'SQL') {
return new GroupDb_PearDB($not_current);
} else {
Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php 2016-05-25 09:02:48 UTC (rev 9847)
+++ trunk/lib/WikiPluginCached.php 2016-05-25 09:22:44 UTC (rev 9848)
@@ -570,7 +570,7 @@
} // writeImage
/**
- * Sends HTTP Header for some predefined file types.
+ * Sends HTTP header for some predefined file types.
* There is no parameter check.
*
* @param string $doctype 'gif', 'png', 'jpeg', 'html'
@@ -589,7 +589,7 @@
'wbmp' => 'Content-type: image/vnd.wap.wbmp', // wireless bitmaps for PDA's and such.
'html' => 'Content-type: text/html');
// Todo: swf, pdf, svg, svgz
- Header($IMAGEHEADER[$doctype]);
+ header($IMAGEHEADER[$doctype]);
}
/**
Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php 2016-05-25 09:02:48 UTC (rev 9847)
+++ trunk/lib/loadsave.php 2016-05-25 09:22:44 UTC (rev 9848)
@@ -848,7 +848,7 @@
fclose($fp);
}
if (!headers_sent()) {
- Header('Content-Type: application/pdf');
+ header('Content-Type: application/pdf');
passthru($cmd);
} else {
$tmpdir = getUploadFilePath();
Modified: trunk/lib/pdf.php
===================================================================
--- trunk/lib/pdf.php 2016-05-25 09:02:48 UTC (rev 9847)
+++ trunk/lib/pdf.php 2016-05-25 09:22:44 UTC (rev 9848)
@@ -80,7 +80,7 @@
if (defined('USE_EXTERNAL_HTML2PDF')
and USE_EXTERNAL_HTML2PDF
) { // htmldoc or ghostscript + html2ps or docbook (dbdoclet, xsltproc, fop)
- Header('Content-Type: application/pdf');
+ header('Content-Type: application/pdf');
$request->discardOutput();
$request->buffer_output(false /*'nocompress'*/);
require_once 'lib/WikiPluginCached.php';
Modified: trunk/lib/plugin/AuthorHistory.php
===================================================================
--- trunk/lib/plugin/AuthorHistory.php 2016-05-25 09:02:48 UTC (rev 9847)
+++ trunk/lib/plugin/AuthorHistory.php 2016-05-25 09:22:44 UTC (rev 9848)
@@ -128,7 +128,7 @@
if ($authordoesmatch && (!$isminor || ($includeminor && $isminor))) {
$difflink = Button(array('action' => 'diff',
'previous' => 'minor'),
- $rev->getversion(), $rev);
+ $rev->getVersion(), $rev);
$tr = HTML::tr(HTML::td(array('class' => 'align-right'),
$difflink, $nbsp),
$includeminor ? (HTML::td($nbsp, ($isminor ? "minor" : "major"), $nbsp)) : "",
@@ -170,7 +170,7 @@
if ($authordoesmatch && (!$isminor || ($includeminor && $isminor))) {
$difflink = Button(array('action' => 'diff',
'previous' => 'minor'),
- $rev->getversion(), $rev);
+ $rev->getVersion(), $rev);
$tr = HTML::tr(
HTML::td($nbsp,
($isminor ? $rev->_pagename : WikiLink($rev->_pagename, 'auto'))
Modified: trunk/lib/plugin/FacebookLike.php
===================================================================
--- trunk/lib/plugin/FacebookLike.php 2016-05-25 09:02:48 UTC (rev 9847)
+++ trunk/lib/plugin/FacebookLike.php 2016-05-25 09:22:44 UTC (rev 9848)
@@ -71,7 +71,7 @@
);
$pagename = $request->getArg('pagename');
$url = "http://www.facebook.com/plugins/like.php?"
- . "href=" . urlencode(WikiUrl($pagename, $urlargs, true));
+ . "href=" . urlencode(WikiURL($pagename, $urlargs, true));
$url = str_replace("%3D", "=", $url);
$params = array("src" => $url,
"scrolling" => 'no',
Modified: trunk/lib/plugin/PageDump.php
===================================================================
--- trunk/lib/plugin/PageDump.php 2016-05-25 09:02:48 UTC (rev 9847)
+++ trunk/lib/plugin/PageDump.php 2016-05-25 09:22:44 UTC (rev 9848)
@@ -113,19 +113,19 @@
ob_end_clean(); // clean up after hijacking $request
//while (@ob_end_flush()); //debugging
$filename = FilenameForPage($page);
- Header("Content-disposition: attachment; filename=\""
+ header("Content-disposition: attachment; filename=\""
. $filename . "\"");
// We generate 3 Content-Type headers! first in loadsave,
// then here and the mimified string $mailified also has it!
// This one is correct and overwrites the others.
- Header("Content-Type: application/octet-stream; name=\""
+ header("Content-Type: application/octet-stream; name=\""
. $filename . "\"; charset=\"" . 'UTF-8'
. "\"");
$request->checkValidators();
// let $request provide last modified & etag
- Header("Content-Id: <" . $this->MessageId . ">");
+ header("Content-Id: <" . $this->MessageId . ">");
// be nice to http keepalive~s
- Header("Content-Length: " . strlen($mailified));
+ header("Content-Length: " . strlen($mailified));
// Here comes our prepared mime file
echo $mailified;
Modified: trunk/lib/plugin/RecentChanges.php
===================================================================
--- trunk/lib/plugin/RecentChanges.php 2016-05-25 09:02:48 UTC (rev 9847)
+++ trunk/lib/plugin/RecentChanges.php 2016-05-25 09:22:44 UTC (rev 9848)
@@ -48,13 +48,13 @@
if ($author) {
$title = $author;
if ($title == '[]') {
- $title = $request->_user->getID();
+ $title = $request->_user->getId();
}
$title = _("UserContribs") . ": $title";
} elseif ($owner) {
$title = $owner;
if ($title == '[]') {
- $title = $request->_user->getID();
+ $title = $request->_user->getId();
}
$title = _("UserContribs") . ": $title";
} elseif ($only_new) {
@@ -333,13 +333,13 @@
if (!empty($author)) {
global $request;
if ($author == '[]')
- $author = $request->_user->getID();
+ $author = $request->_user->getId();
$edits .= sprintf(_(" for pages changed by %s"), $author);
}
if (!empty($owner)) {
global $request;
if ($owner == '[]')
- $owner = $request->_user->getID();
+ $owner = $request->_user->getId();
$edits .= sprintf(_(" for pages owned by %s"), $owner);
}
if (!empty($category)) {
@@ -572,8 +572,8 @@
{
global $request;
extract($this->_args);
- if ($author == '[]') $author = $request->_user->getID();
- if ($owner == '[]') $owner = $request->_user->getID();
+ if ($author == '[]') $author = $request->_user->getId();
+ if ($owner == '[]') $owner = $request->_user->getId();
$author_args = $owner
? array('owner' => $owner)
: array('author' => $author);
@@ -1354,13 +1354,13 @@
if (!empty($args['author'])) {
global $request;
if ($args['author'] == '[]')
- $args['author'] = $request->_user->getID();
+ $args['author'] = $request->_user->getId();
$params['author'] = $args['author'];
}
if (!empty($args['owner'])) {
global $request;
if ($args['owner'] == '[]')
- $args['owner'] = $request->_user->getID();
+ $args['owner'] = $request->_user->getId();
$params['owner'] = $args['owner'];
}
if (!empty($days)) {
Modified: trunk/themes/Wordpress/templates/signin.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/signin.tmpl 2016-05-25 09:02:48 UTC (rev 9847)
+++ trunk/themes/Wordpress/templates/signin.tmpl 2016-05-25 09:22:44 UTC (rev 9848)
@@ -51,7 +51,7 @@
function SignIn(form,userid) {
<?php if (defined('EDITING_POLICY') and $request->_dbi->isWikiPage(EDITING_POLICY)) { ?>
if (window.focus) {
- window.open('<?php echo WikiUrl(EDITING_POLICY) ?>',<!-- url -->
+ window.open('<?php echo WikiURL(EDITING_POLICY) ?>',<!-- url -->
'PleaseReadThisFirst',<!-- window name -->
'width=600,height=430,scrollbars=yes,resizable=yes,toolbar=yes');
}
Modified: trunk/themes/blog/templates/calendar.tmpl
===================================================================
--- trunk/themes/blog/templates/calendar.tmpl 2016-05-25 09:02:48 UTC (rev 9847)
+++ trunk/themes/blog/templates/calendar.tmpl 2016-05-25 09:22:44 UTC (rev 9848)
@@ -7,7 +7,7 @@
var d = calendar.date.getDate(); // integer, 1..31
m = m < 10 ? "0" + m : m;
d = d < 10 ? "0" + d : d;
- window.location = "' . WikiUrl($WikiTheme->calendarBase(),0,1) . '/' . '" + y + "-" + m + "-" + d;
+ window.location = "' . WikiURL($WikiTheme->calendarBase(),0,1) . '/' . '" + y + "-" + m + "-" + d;
}
};
Calendar.setup({flat : "calendar", flatCallback : dateChanged, setDateStatusFunc : dateStatusFunc, weekNumbers : false})') ?>
Modified: trunk/themes/default/templates/online.tmpl
===================================================================
--- trunk/themes/default/templates/online.tmpl 2016-05-25 09:02:48 UTC (rev 9847)
+++ trunk/themes/default/templates/online.tmpl 2016-05-25 09:22:44 UTC (rev 9848)
@@ -10,7 +10,7 @@
<?php if ($mode == 'summary') {
if ($allow_detail) {
- $url = WikiUrl($pagename,array("mode"=>"detail"));
+ $url = WikiURL($pagename,array("mode"=>"detail"));
$header = HTML::a(array('href'=>$url,'title'=>_("Switch to detailed list")),_("Who is Online"));
}
?>
@@ -53,7 +53,7 @@
<?php } ?>
<?php if ($mode == 'detail') {
- $url = WikiUrl($pagename,array("mode"=>"summary"));
+ $url = WikiURL($pagename,array("mode"=>"summary"));
$header = HTML::a(array('href'=>$url,'title'=>_("Switch to summary")),_("Who is Online"));
?>
<table class="forumline fullwidth">
Modified: trunk/themes/default/templates/signin.tmpl
===================================================================
--- trunk/themes/default/templates/signin.tmpl 2016-05-25 09:02:48 UTC (rev 9847)
+++ trunk/themes/default/templates/signin.tmpl 2016-05-25 09:22:44 UTC (rev 9848)
@@ -43,7 +43,7 @@
$SignInJS = JavaScript('
function SignIn(form,userid) {'.($editing_policy ? '
if (window.focus) {
- window.open("' . WikiUrl(EDITING_POLICY) . '",<!-- url -->
+ window.open("' . WikiURL(EDITING_POLICY) . '",<!-- url -->
"PleaseReadThisFirst",<!-- window name -->
"width=600,height=430,scrollbars=yes,resizable=yes,toolbar=yes");
}':'').'
Modified: trunk/themes/smaller/templates/signin.tmpl
===================================================================
--- trunk/themes/smaller/templates/signin.tmpl 2016-05-25 09:02:48 UTC (rev 9847)
+++ trunk/themes/smaller/templates/signin.tmpl 2016-05-25 09:22:44 UTC (rev 9848)
@@ -37,7 +37,7 @@
$SignInJS = JavaScript('
function SignIn(form,userid) {'.($editing_policy ? '
if (window.focus) {
- window.open("' . WikiUrl(EDITING_POLICY) . '",<!-- url -->
+ window.open("' . WikiURL(EDITING_POLICY) . '",<!-- url -->
"PleaseReadThisFirst",<!-- window name -->
"width=600,height=430,scrollbars=yes,resizable=yes,toolbar=yes");
}':'').'
Modified: trunk/themes/wikilens/templates/newuserwelcomepage.tmpl
===================================================================
--- trunk/themes/wikilens/templates/newuserwelcomepage.tmpl 2016-05-25 09:02:48 UTC (rev 9847)
+++ trunk/themes/wikilens/templates/newuserwelcomepage.tmpl 2016-05-25 09:22:44 UTC (rev 9848)
@@ -3,7 +3,7 @@
?>
<div>
<h2>Welcome <?php echo $FRIEND ?></h2>
-<p>Welcome to <?php echo WIKI_NAME ?>. A good place to learn about <?php echo WIKI_NAME ?> is to check out the <a href="<?php echo WikiUrl(WIKI_NAME.'/'
+<p>Welcome to <?php echo WIKI_NAME ?>. A good place to learn about <?php echo WIKI_NAME ?> is to check out the <a href="<?php echo WikiURL(WIKI_NAME.'/'
._("Tutorial"), '', true); ?>"><?php echo WIKI_NAME ?> Tutorial</a></p>
<br />
<?php if ($PAGE1 || $PAGE2 || $PAGE3) { ?>
@@ -12,7 +12,7 @@
foreach (array($PAGE1, $PAGE2, $PAGE3) as $pagename) {
if ($dbi->isWikiPage($pagename)) {
?>
- <a href="<?php echo WikiUrl($pagename, '', true); ?>"><?php echo $pagename ?></a><br>
+ <a href="<?php echo WikiURL($pagename, '', true); ?>"><?php echo $pagename ?></a><br>
<?php
}
}
@@ -20,8 +20,8 @@
?>
<br />
<?php if ($dbi->isWikiPage($SENDERUSERNAME)) { ?>
-<p>Also, <?php echo $SENDER; ?> has his own homepage at <?php echo WIKI_NAME ?>: <a href="<?php echo WikiUrl($SENDERUSERNAME, '', true); ?>"><?php echo $SENDER ?>'s page</a></p>
+<p>Also, <?php echo $SENDER; ?> has his own homepage at <?php echo WIKI_NAME ?>: <a href="<?php echo WikiURL($SENDERUSERNAME, '', true); ?>"><?php echo $SENDER ?>'s page</a></p>
<?php } ?>
<br>
-<p>To create your own login on <?php echo WIKI_NAME ?>, you can <a href="<?php echo WikiUrl('NewUserRegister', '', true) ?>">Register</a></p>
+<p>To create your own login on <?php echo WIKI_NAME ?>, you can <a href="<?php echo WikiURL('NewUserRegister', '', true) ?>">Register</a></p>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
