From b9ed160573e2832f49133d85c38fce6ec91c5676 Mon Sep 17 00:00:00 2001 From: vargenau Date: Mon, 19 Nov 2012 17:02:07 +0000 Subject: [PATCH] Remove extra empty lines git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@8491 96ab9672-09ca-45d6-a79d-3d69d39ca109 --- lib/AccessLog.php | 1 - lib/BlockParser.php | 1 - lib/DbaDatabase.php | 1 - lib/DbaListSet.php | 1 - lib/FileFinder.php | 1 - lib/HtmlParser.php | 1 - lib/InlineParser.php | 1 - lib/PageType.php | 2 -- lib/Request.php | 3 --- lib/SpamBlocklist.php | 1 - lib/Template.php | 3 --- lib/TextSearchQuery.php | 5 ----- lib/WikiDB.php | 3 --- lib/WikiPluginCached.php | 4 ---- lib/WikiUserNew.php | 2 -- lib/XmlElement.php | 2 -- lib/editpage.php | 2 -- lib/stdlib.php | 6 ------ lib/ziplib.php | 2 -- 19 files changed, 42 deletions(-) diff --git a/lib/AccessLog.php b/lib/AccessLog.php index 832e714c0..68927de7b 100644 --- a/lib/AccessLog.php +++ b/lib/AccessLog.php @@ -671,7 +671,6 @@ class Request_AccessLog_SQL ); } - function table_output() { $query = $this->_getQueryString($args); diff --git a/lib/BlockParser.php b/lib/BlockParser.php index efa609b0b..7c7bb48ce 100644 --- a/lib/BlockParser.php +++ b/lib/BlockParser.php @@ -1395,7 +1395,6 @@ class Block_divspan extends BlockMarkup } } - //////////////////////////////////////////////////////////////// // diff --git a/lib/DbaDatabase.php b/lib/DbaDatabase.php index fa2beede8..acb3c5b37 100644 --- a/lib/DbaDatabase.php +++ b/lib/DbaDatabase.php @@ -139,7 +139,6 @@ class DbaDatabase return $this->_error("replace($key)"); } - function firstkey() { return dba_firstkey($this->_dbh); diff --git a/lib/DbaListSet.php b/lib/DbaListSet.php index 6086d4266..1decd485e 100644 --- a/lib/DbaListSet.php +++ b/lib/DbaListSet.php @@ -47,7 +47,6 @@ class DbaListSet return intval($prev); } - function next($i) { list(, $next,) = explode(':', $this->_dbh->fetch(intval($i)), 3); diff --git a/lib/FileFinder.php b/lib/FileFinder.php index b6924aae1..df243d394 100644 --- a/lib/FileFinder.php +++ b/lib/FileFinder.php @@ -202,7 +202,6 @@ class FileFinder return false; } - /** * Search our path for a file. * diff --git a/lib/HtmlParser.php b/lib/HtmlParser.php index ab82b4714..a1edb3fee 100644 --- a/lib/HtmlParser.php +++ b/lib/HtmlParser.php @@ -222,7 +222,6 @@ class HtmlParser } } - class HtmlParser_PhpWiki2 extends HtmlParser { diff --git a/lib/InlineParser.php b/lib/InlineParser.php index 5a38c6353..435869bc1 100644 --- a/lib/InlineParser.php +++ b/lib/InlineParser.php @@ -895,7 +895,6 @@ class Markup_html_divspan extends BalancedMarkup } } - class Markup_html_abbr extends BalancedMarkup { //rurban: abbr|acronym need an optional title tag. diff --git a/lib/PageType.php b/lib/PageType.php index 7bebf8d49..85ccc1029 100644 --- a/lib/PageType.php +++ b/lib/PageType.php @@ -255,7 +255,6 @@ class PageType_interwikimap extends PageType return $link; } - function _parseMap($text) { if (!preg_match_all("/^\s*(\S+)\s+(.+)$/m", @@ -353,7 +352,6 @@ class PageType_interwikimap extends PageType } } - /** How to transform text. */ class PageFormatter diff --git a/lib/Request.php b/lib/Request.php index 4bdb85ca5..64a1c7d84 100644 --- a/lib/Request.php +++ b/lib/Request.php @@ -543,7 +543,6 @@ class Request return Request_UploadedFile::getUploadedFile($key); } - function _fix_magic_quotes_gpc() { $needs_fix = array('HTTP_POST_VARS', @@ -1260,7 +1259,6 @@ function Request_AccessLogEntry_shutdown_function() unset($request->_accesslog->entries); } - class HTTP_ETag { function HTTP_ETag($val, $is_weak = false) @@ -1283,7 +1281,6 @@ class HTTP_ETag return true; } - function asString() { $quoted = '"' . addslashes($this->_val) . '"'; diff --git a/lib/SpamBlocklist.php b/lib/SpamBlocklist.php index 47f068387..4c9ee4a29 100644 --- a/lib/SpamBlocklist.php +++ b/lib/SpamBlocklist.php @@ -98,7 +98,6 @@ function IsBlackListed($uri) return 0; } - /* if (defined('SPAMBLOCKLIST_TEST') and SPAMBLOCKLIST_TEST) { BlackListDebug("10.20.30.40"); diff --git a/lib/Template.php b/lib/Template.php index 3a9c33a8d..feb4a94e0 100644 --- a/lib/Template.php +++ b/lib/Template.php @@ -129,7 +129,6 @@ class Template $this->_locals[$varname] = $value; } - function printExpansion($defaults = false) { if (!is_array($defaults)) // HTML object or template object @@ -181,7 +180,6 @@ class Template return $this->getExpansion(); } - // Debugging: function _dump_template() { @@ -272,7 +270,6 @@ function GeneratePage($content, $title, $page_revision = false, $args = false) printXML(new Template('html', $request, $args)); } - /** * For dumping pages as html to a file. * Used for action=dumphtml,action=ziphtml,format=pdf,format=xml diff --git a/lib/TextSearchQuery.php b/lib/TextSearchQuery.php index 6e4e2cfde..eeb588fa3 100644 --- a/lib/TextSearchQuery.php +++ b/lib/TextSearchQuery.php @@ -95,7 +95,6 @@ define ('TSQ_NODE_AND', 10); define ('TSQ_NODE_OR', 11); */ - class TextSearchQuery { /** @@ -190,7 +189,6 @@ class TextSearchQuery return min(1.0, $score / 10.0); } - /** * Get a regular expression suitable for highlighting matched words. * @@ -404,8 +402,6 @@ class NullTextSearchQuery extends TextSearchQuery } } - - /** * A simple algebraic matcher for numeric attributes. * NumericSearchQuery can do ("population < 20000 and area > 1000000", array("population", "area")) @@ -1182,7 +1178,6 @@ class TextSearchQuery_Parser return $expr; } - function get_atom() { if ($atom = $this->get_word(TSQ_ALLWORDS)) // Bug#1791564 not involved: '*' diff --git a/lib/WikiDB.php b/lib/WikiDB.php index 4658f20e7..580267a5c 100644 --- a/lib/WikiDB.php +++ b/lib/WikiDB.php @@ -921,7 +921,6 @@ class WikiDB_Page $backend->unlock(array('version')); } - /** * Create a new revision of a {@link WikiDB_Page}. * @@ -1455,7 +1454,6 @@ class WikiDB_Page return $strval; } - /** * @access private * @param integer_or_object $version_or_pagerevision @@ -1861,7 +1859,6 @@ class WikiDB_PageRevision return $meta; } - /** * Return a string representation of the revision. * diff --git a/lib/WikiPluginCached.php b/lib/WikiPluginCached.php index 3744c0e74..fc4c619ac 100644 --- a/lib/WikiPluginCached.php +++ b/lib/WikiPluginCached.php @@ -620,7 +620,6 @@ class WikiPluginCached extends WikiPlugin Header($IMAGEHEADER[$doctype]); } - /** * Converts argument array to a string of format option="value". * This should only be used for displaying plugin options for @@ -681,7 +680,6 @@ class WikiPluginCached extends WikiPlugin return true; } // checkCall1 - /** * Extracts the parameters necessary to reconstruct the plugin * call needed to produce the requested image. @@ -712,7 +710,6 @@ class WikiPluginCached extends WikiPlugin return true; } // checkCall2 - /** * Creates an image or image map depending on the plugin type. * @access static private @@ -968,7 +965,6 @@ class WikiPluginCached extends WikiPlugin } } // printError - /** * Basic text to image converter for error handling which allows * multiple line output. diff --git a/lib/WikiUserNew.php b/lib/WikiUserNew.php index b6a33bf6b..f691e39f3 100644 --- a/lib/WikiUserNew.php +++ b/lib/WikiUserNew.php @@ -1335,7 +1335,6 @@ class _PassUser } } - function _checkPassLength($submitted_password) { if (strlen($submitted_password) < PASSWORD_LENGTH_MINIMUM) { @@ -1488,7 +1487,6 @@ class _PassUser * */ - /** * For security, this class should not be extended. Instead, extend * from _PassUser (think of this as unix "root"). diff --git a/lib/XmlElement.php b/lib/XmlElement.php index 628af4f44..ddc124095 100644 --- a/lib/XmlElement.php +++ b/lib/XmlElement.php @@ -388,13 +388,11 @@ class XmlElement extends XmlContent return substr($this->startTag(), 0, -1) . "/>"; } - function endTag() { return "_tag>"; } - function printXML() { if ($this->isEmpty()) diff --git a/lib/editpage.php b/lib/editpage.php index d6bf07350..9a11ffa84 100644 --- a/lib/editpage.php +++ b/lib/editpage.php @@ -595,7 +595,6 @@ class PageEditor else $message = HTML::p(_("Please check it through before saving.")); - /*$steps = HTML::ol(HTML::li(_("Copy your changes to the clipboard or to another temporary place (e.g. text editor).")), HTML::li(fmt("%s of the page. You should now see the most current version of the page. Your changes are no longer there.", $re_edit_link)), @@ -609,7 +608,6 @@ class PageEditor $message); } - function getTextArea() { $request = &$this->request; diff --git a/lib/stdlib.php b/lib/stdlib.php index 310638f94..827a44bee 100644 --- a/lib/stdlib.php +++ b/lib/stdlib.php @@ -1209,7 +1209,6 @@ function ConvertOldMarkup($text, $markup_type = "block") } } - /** * Expand tabs in string. * @@ -1333,7 +1332,6 @@ function TimezoneOffset($time = false, $no_colon = false) $sign, $mins / 60, $colon, $mins % 60); } - /** * Format time in ISO-8601 format. * @@ -1431,7 +1429,6 @@ function CTime($time = false) return date("D M j H:i:s Y", $time); } - /** * Format number as kibibytes or bytes. * Short format is used for PageList @@ -1823,7 +1820,6 @@ function function_usable($function_name) ); } - /** Hash a value. * * This is used for generating ETags. @@ -1841,7 +1837,6 @@ function wikihash($x) trigger_error("Can't hash $x", E_USER_ERROR); } - /** * Seed the random number generator. * @@ -1993,7 +1988,6 @@ class Alert $request->finish(); } - function _getButtons() { global $request; diff --git a/lib/ziplib.php b/lib/ziplib.php index b4896a5db..bf8be5f34 100644 --- a/lib/ziplib.php +++ b/lib/ziplib.php @@ -248,7 +248,6 @@ function dostime2unixtime($dosdate, $dostime) return mktime($hour, $min, $sec, $month, $mday, $year); } - /** * Class for zipfile creation. */ @@ -687,7 +686,6 @@ function ParseRFC822Headers(&$string) return $headers; } - function ParseMimeContentType($string) { // FIXME: Remove (RFC822 style comments). -- 2.45.0