Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[8281] trunk
|
From: <var...@us...> - 2012-08-31 12:01:14
|
Revision: 8281
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8281&view=rev
Author: vargenau
Date: 2012-08-31 12:01:01 +0000 (Fri, 31 Aug 2012)
Log Message:
-----------
extra_empty_lines
Modified Paths:
--------------
trunk/configurator.php
trunk/lib/BlockParser.php
trunk/lib/DbaPartition.php
trunk/lib/ErrorManager.php
trunk/lib/HtmlElement.php
trunk/lib/HtmlElement5.php
trunk/lib/IniConfig.php
trunk/lib/InlineParser.php
trunk/lib/PageList.php
trunk/lib/PageType.php
trunk/lib/RSSWriter091.php
trunk/lib/RssWriter.php
trunk/lib/Template.php
trunk/lib/TextSearchQuery.php
trunk/lib/WikiDB/SQL.php
trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php
trunk/lib/WikiDB/adodb/adodb-errorhandler.inc.php
trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php
trunk/lib/WikiDB/adodb/adodb-iterator.inc.php
trunk/lib/WikiDB/adodb/adodb-lib.inc.php
trunk/lib/WikiDB/adodb/adodb-pear.inc.php
trunk/lib/WikiDB/adodb/adodb-php4.inc.php
trunk/lib/WikiDB/adodb/adodb-time.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-access.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-csv.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-informix72.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-ldap.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mssqlpo.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mysql.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mysqli.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mysqlt.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-netezza.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-odbc_mssql.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-odbc_oracle.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-oracle.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-postgres7.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-sapdb.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-sqlanywhere.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-sqlite.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-vfp.inc.php
trunk/lib/WikiDB/backend/ADODB.php
trunk/lib/WikiDB/backend/PDO.php
trunk/lib/WikiDB/backend/PearDB.php
trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
trunk/lib/WikiDB/backend/cvs.php
trunk/lib/WikiDB/backend/dumb/MostPopularIter.php
trunk/lib/WikiDB/backend/dumb/MostRecentIter.php
trunk/lib/WikiDB/backend/file.php
trunk/lib/WikiDB/backend.php
trunk/lib/WikiDB/file.php
trunk/lib/WikiDB.php
trunk/lib/WikiPluginCached.php
trunk/lib/WikiTheme.php
trunk/lib/WikiUserNew.php
trunk/lib/XMLRPC/utils.php
trunk/lib/XmlElement.php
trunk/lib/XmlRpcServer.php
trunk/lib/diff.php
trunk/lib/diff3.php
trunk/lib/difflib.php
trunk/lib/editpage.php
trunk/lib/fortune.php
trunk/lib/gif.php
trunk/lib/imagecache.php
trunk/lib/loadsave.php
trunk/lib/pear/Cache/Container/file.php
trunk/lib/pear/Cache/Container/imgfile.php
trunk/lib/pear/Cache/Container.php
trunk/lib/pear/Cache/Error.php
trunk/lib/pear/Cache/Graphics.php
trunk/lib/pear/DB/dbase.php
trunk/lib/pear/DB/fbsql.php
trunk/lib/pear/DB/ibase.php
trunk/lib/pear/DB/ifx.php
trunk/lib/pear/DB/mysql.php
trunk/lib/pear/DB/mysqli.php
trunk/lib/pear/DB/oci8.php
trunk/lib/pear/DB/odbc.php
trunk/lib/pear/DB/sybase.php
trunk/lib/pear/DB.php
trunk/lib/plugin/AuthorHistory.php
trunk/lib/plugin/CacheTest.php
trunk/lib/plugin/Calendar.php
trunk/lib/plugin/CreateBib.php
trunk/lib/plugin/InterWikiSearch.php
trunk/lib/plugin/PageHistory.php
trunk/lib/plugin/PopularNearby.php
trunk/lib/plugin/PreferenceApp.php
trunk/lib/plugin/RawHtml.php
trunk/lib/plugin/RecentChangesCached.php
trunk/lib/plugin/TexToPng.php
trunk/lib/plugin/UserRatings.php
trunk/lib/plugin/WikiAdminUtils.php
trunk/lib/plugin/WikiBlog.php
trunk/lib/stdlib.php
trunk/lib/wikilens/RatingsDb.php
trunk/lib/ziplib.php
trunk/tests/unit/lib/AtomParserTest.php
trunk/tests/unit/lib/PageListTest.php
trunk/tests/unit/lib/TextSearchTest.php
trunk/tests/unit/lib/plugin/AllPagesTest.php
trunk/tests/unit/lib/plugin/AllUsersTest.php
trunk/tests/unit/lib/plugin/OrphanedPagesTest.php
trunk/tests/unit/lib/plugin/WantedPagesTest.php
trunk/tests/unit/pcre-crash.php
trunk/tests/xmlrpc/interop-client.php
trunk/tests/xmlrpc/interop-server.php
trunk/tests/xmlrpc/validate-form.php
trunk/tests/xmlrpc/validate.php
trunk/tests/xmlrpc/xmlrpc-client.php
trunk/tests/xmlrpc/xmlrpc-introspect.php
trunk/tests/xmlrpc/xmlrpc-servers.php
trunk/themes/Hawaiian/lib/random.php
trunk/themes/MacOSX/lib/RecentChanges.php
trunk/themes/Portland/lib/RecentChanges.php
trunk/themes/SpaceWiki/lib/RecentChanges.php
trunk/themes/Wordpress/lib/RecentChanges.php
Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/configurator.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -1627,7 +1627,6 @@
$properties["HIGHLIGHT_DATA_DIR"] =
new _define_commented_optional('HIGHLIGHT_DATA_DIR'); // /usr/share/highlight
-
$properties["Part Eight"] =
new part('_part8', $SEPARATOR."\n", "
@@ -1868,7 +1867,6 @@
}
}
-
class _define
extends _variable {
function _config_format($value) {
@@ -2464,7 +2462,6 @@
}
}
-
if (!empty($HTTP_POST_VARS['action'])
and $HTTP_POST_VARS['action'] == 'make_config'
and !empty($HTTP_POST_VARS['ADMIN_USER'])
Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/BlockParser.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -145,8 +145,6 @@
}
}
-
-
class BlockParser_Input {
function BlockParser_Input ($text) {
@@ -323,7 +321,6 @@
}
}
-
class Block_HtmlElement extends HtmlElement
{
function Block_HtmlElement($tag /*, ... */) {
@@ -613,8 +610,6 @@
}
}
-
-
class Block_table_dl_defn extends XmlContent
{
var $nrows;
@@ -808,7 +803,6 @@
return false;
}
-
$prefix = $m->match;
$oldindent = '[*#;](?=[#*]|;.*:.*\S)';
$newindent = sprintf('\\ {%d}', strlen($prefix));
Modified: trunk/lib/DbaPartition.php
===================================================================
--- trunk/lib/DbaPartition.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/DbaPartition.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -74,7 +74,6 @@
}
}
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/ErrorManager.php
===================================================================
--- trunk/lib/ErrorManager.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/ErrorManager.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -385,7 +385,6 @@
$GLOBALS['ErrorManager']->handleError($error);
}
-
/**
* A class representing a PHP error report.
*
Modified: trunk/lib/HtmlElement.php
===================================================================
--- trunk/lib/HtmlElement.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/HtmlElement.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -422,7 +422,6 @@
define('HTMLTAG_INLINE', 2);
define('HTMLTAG_ACCEPTS_INLINE', 4);
-
HTML::_setTagProperty(HTMLTAG_EMPTY,
'area base basefont br col frame hr img input isindex link meta param');
HTML::_setTagProperty(HTMLTAG_ACCEPTS_INLINE,
@@ -491,7 +490,6 @@
return $inputs;
}
-
/** Generate a <script> tag containing javascript.
*
* @param string $js The javascript.
Modified: trunk/lib/HtmlElement5.php
===================================================================
--- trunk/lib/HtmlElement5.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/HtmlElement5.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -422,7 +422,6 @@
define('HTMLTAG_INLINE', 2);
define('HTMLTAG_ACCEPTS_INLINE', 4);
-
HTML::_setTagProperty(HTMLTAG_EMPTY,
'area base basefont br col embed frame hr img input isindex link meta param');
HTML::_setTagProperty(HTMLTAG_ACCEPTS_INLINE,
@@ -491,7 +490,6 @@
return $inputs;
}
-
/** Generate a <script> tag containing javascript.
*
* @param string $js The javascript.
Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/IniConfig.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -997,7 +997,6 @@
if (!defined('HOME_PAGE'))
define('HOME_PAGE', _("HomePage"));
-
//////////////////////////////////////////////////////////////////
// Autodetect URL settings:
//
Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/InlineParser.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -37,7 +37,6 @@
require_once('lib/CachedMarkup.php');
require_once(dirname(__FILE__).'/stdlib.php');
-
function WikiEscape($text) {
return str_replace('#', ESCAPE_CHAR . '#', $text);
}
@@ -220,8 +219,6 @@
}
}
-
-
/**
* A simple markup rule (i.e. terminal token).
*
@@ -771,7 +768,6 @@
$start[] = "(?<= _) (?: ${b}|${tt}) (?! _)";
$start[] = "(?<= \\*) (?: ${i}|${tt}) (?! \\*)";
-
// any delimiter okay after an opening brace ( [{<(] )
// as long as it's not immediately followed by the matching closing
// brace.
Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/PageList.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -253,7 +253,6 @@
}
}
-
class _PageList_Column_bool extends _PageList_Column {
function _PageList_Column_bool ($field, $default_heading, $text = 'yes') {
$this->_PageList_Column($field, $default_heading, 'center');
@@ -749,7 +748,6 @@
$this->_messageIfEmpty = $msg;
}
-
function getTotal () {
return !empty($this->_options['count'])
? (integer) $this->_options['count'] : count($this->_pages);
Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/PageType.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -545,7 +545,6 @@
}
}
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/RSSWriter091.php
===================================================================
--- trunk/lib/RSSWriter091.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/RSSWriter091.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -71,7 +71,6 @@
$this->printXML();
}
-
}
class _RecentChanges_RssFormatter091
@@ -101,7 +100,6 @@
$request->finish(); // NORETURN!!!!
}
-
function channel_properties ()
{
global $request;
@@ -123,7 +121,6 @@
*/
}
-
function item_properties ($rev)
{
$page = $rev->getPage();
Modified: trunk/lib/RssWriter.php
===================================================================
--- trunk/lib/RssWriter.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/RssWriter.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -122,7 +122,6 @@
$this->printXML();
}
-
/**
* Create a new RDF <em>typedNode</em>.
*/
Modified: trunk/lib/Template.php
===================================================================
--- trunk/lib/Template.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/Template.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -3,7 +3,6 @@
require_once("lib/ErrorManager.php");
-
/** An HTML template.
*/
class Template
Modified: trunk/lib/TextSearchQuery.php
===================================================================
--- trunk/lib/TextSearchQuery.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/TextSearchQuery.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -605,7 +605,6 @@
}
}
-
////////////////////////////////////////////////////////////////
//
// Remaining classes are private.
@@ -910,7 +909,6 @@
}
}
-
////////////////////////////////////////////////////////////////
//
// Parser:
Modified: trunk/lib/WikiDB/SQL.php
===================================================================
--- trunk/lib/WikiDB/SQL.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/SQL.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -40,7 +40,6 @@
);
}
-
/**
* Determine whether page exists (in non-default form).
* @see WikiDB::isWikiPage for the slow generic version
Modified: trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -68,7 +68,6 @@
return $line.serialize($rs);
}
-
/**
* Open CSV file and convert it into Data.
*
Modified: trunk/lib/WikiDB/adodb/adodb-errorhandler.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-errorhandler.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/adodb-errorhandler.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -71,7 +71,6 @@
error_log("($t) $s", ADODB_ERROR_LOG_TYPE);
}
-
//print "<p>$s</p>";
trigger_error($s,ADODB_ERROR_HANDLER_TYPE);
}
Modified: trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -74,5 +74,4 @@
throw new $errfn($dbms, $fn, $errno, $errmsg, $p1, $p2, $thisConnection);
}
-
?>
Modified: trunk/lib/WikiDB/adodb/adodb-iterator.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-iterator.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/adodb-iterator.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -15,7 +15,6 @@
echo $k; print_r($v); echo "<br>";
}
-
Iterator code based on http://cvs.php.net/cvs.php/php-src/ext/spl/examples/cachingiterator.inc?login=2
*/
@@ -62,10 +61,8 @@
return 'ADODB Iterator';
}
-
}
-
class ADODB_BASE_RS implements IteratorAggregate {
function getIterator() {
return new ADODB_Iterator($this);
Modified: trunk/lib/WikiDB/adodb/adodb-lib.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-lib.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/adodb-lib.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -13,7 +13,6 @@
Less commonly used functions are placed here to reduce size of adodb.inc.php.
*/
-
// Force key to upper.
// See also http://www.php.net/manual/en/function.array-change-key-case.php
function _array_change_key_case($an_array)
@@ -283,7 +282,6 @@
else
$rsreturn = &$zthis->SelectLimit($sql, $nrows, $offset, $inputarr, $secs2cache);
-
// Before returning the RecordSet, we set the pagination properties we need
if ($rsreturn) {
$rsreturn->_maxRecordCount = $qryRecs;
@@ -381,7 +379,6 @@
else if (isset($rs->fields[strtolower($upperfname)])) $val = $rs->fields[strtolower($upperfname)];
else $val = '';
-
if ($forceUpdate || strcmp($val, $arrFields[$upperfname])) {
// Set the counter for the number of fields that will be updated.
$fieldUpdatedCount++;
Modified: trunk/lib/WikiDB/adodb/adodb-pear.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-pear.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/adodb-pear.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -203,7 +203,6 @@
is_subclass_of($value, 'db_error')));
}
-
/**
* Tell whether a result code from a DB method is a warning.
* Warnings differ from errors in that they are generated by DB,
Modified: trunk/lib/WikiDB/adodb/adodb-php4.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-php4.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/adodb-php4.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -9,7 +9,6 @@
Set tabs to 4.
*/
-
class ADODB_BASE_RS {
}
Modified: trunk/lib/WikiDB/adodb/adodb-time.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-time.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/adodb-time.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -71,13 +71,11 @@
FUNCTION DESCRIPTIONS
-
FUNCTION adodb_getdate($date=false)
Returns an array containing date information, as getdate(), but supports
dates greater than 1901 to 2038.
-
FUNCTION adodb_date($fmt, $timestamp = false)
Convert a timestamp to a formatted local date. If $timestamp is not defined, the
@@ -140,7 +138,6 @@
current timestamp is used. Unlike the function date(), it supports dates
outside the 1901 to 2038 range.
-
FUNCTION adodb_mktime($hr, $min, $sec, $month, $day, $year)
Converts a local date to a unix timestamp. Unlike the function mktime(), it supports
@@ -172,7 +169,6 @@
c. Implement daylight savings, which looks awfully complicated, see
http://webexhibits.org/daylightsaving/
-
CHANGELOG
- 20 Mar 2004 0.12
Fixed month calculation error in adodb_date. 2102-June-01 appeared as 2102-May-32.
@@ -842,7 +838,6 @@
$day = intval($day);
$year = intval($year);
-
$year = adodb_year_digit_check($year);
if ($mon > 12) {
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-access.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-access.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-access.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -70,7 +70,6 @@
}*/
}
-
class ADORecordSet_access extends ADORecordSet_odbc {
var $databaseType = "access";
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -176,7 +176,6 @@
$t = $adors->Fields(2);//table/view name
while (!$adors->EOF){
-
if (strtoupper($t->Value) == $table) {
$fld = new ADOFieldObject();
@@ -195,9 +194,6 @@
return $arr;
}
-
-
-
/* returns queryID or false */
function &_query($sql,$inputarr=false)
{
@@ -243,7 +239,6 @@
return $rs;
}
-
function BeginTrans()
{
if ($this->transOff) return true;
@@ -301,7 +296,6 @@
return true;
}
-
}
/*--------------------------------------------------------------------------------------
@@ -328,7 +322,6 @@
return $this->ADORecordSet($id,$mode);
}
-
// returns the field object
function FetchField($fieldOffset = -1) {
$off=$fieldOffset+1; // offsets begin at 1
@@ -342,7 +335,6 @@
$o->max_length = $f->DefinedSize;
$o->ado_type = $t;
-
//print "off=$off name=$o->name type=$o->type len=$o->max_length<br>";
return $o;
}
@@ -362,7 +354,6 @@
return $this->fields[$this->bind[strtoupper($colname)]];
}
-
function _initrs()
{
$rs = $this->_queryID;
@@ -372,7 +363,6 @@
$this->_numOfFields = $f->Count;
}
-
// should only be used to move forward as we normally use forward-only cursors
function _seek($row)
{
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -33,7 +33,6 @@
}
-
class ADORecordSet_ado_access extends ADORecordSet_ado {
var $databaseType = "ado_access";
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -66,7 +66,6 @@
};
-
class ADORecordSet_borland_ibase extends ADORecordSet_ibase {
var $databaseType = "borland_ibase";
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-csv.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-csv.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-csv.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -48,7 +48,6 @@
return false;
}
-
// returns true or false
function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
{
@@ -70,7 +69,6 @@
return false;
}
-
// parameters use PostgreSQL convention, not MySQL
function &SelectLimit($sql,$nrows=-1,$offset=-1)
{
@@ -137,7 +135,6 @@
(($this->fetchMode !== false)?$this->fetchMode : $ADODB_FETCH_MODE);
$err = false;
-
$rs = csv2rs($url,$err,false);
if ($this->debug) print urldecode($url)."<br><i>$err</i><br>";
$at = strpos($err,'::::');
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -64,8 +64,6 @@
$db->curMode = SQL_CUR_USE_ODBC;
$db->Connect($dsn, $userid, $pwd);
-
-
USING CLI INTERFACE
===================
@@ -79,7 +77,6 @@
>
> In case of DB2 I had to swap the first and last arguments in order to connect properly.
-
*/
if (!defined('_ADODB_ODBC_LAYER')) {
@@ -101,7 +98,6 @@
var $_bindInputArray = false;
var $upperCase = 'upper';
-
function ADODB_DB2()
{
if (strncmp(PHP_OS,'WIN',3) === 0) $this->curmode = SQL_CUR_USE_ODBC;
@@ -228,7 +224,6 @@
return $s;
}
-
function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputArr=false)
{
if ($offset <= 0) {
@@ -249,7 +244,6 @@
};
-
class ADORecordSet_db2 extends ADORecordSet_odbc {
var $databaseType = "db2";
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -122,7 +122,6 @@
else return false;
}
-
// returns queryID or false
function _query($sql,$inputarr)
{
@@ -181,8 +180,6 @@
$this->_numOfFields = @fbsql_num_fields($this->_queryID);
}
-
-
function &FetchField($fieldOffset = -1) {
if ($fieldOffset != -1) {
$o = @fbsql_fetch_field($this->_queryID, $fieldOffset);
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -10,7 +10,6 @@
*/
-
include_once(ADODB_DIR."/drivers/adodb-ibase.inc.php");
class ADODB_firebird extends ADODB_ibase {
@@ -53,10 +52,8 @@
return $rs;
}
-
};
-
class ADORecordSet_firebird extends ADORecordSet_ibase {
var $databaseType = "firebird";
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -23,7 +23,6 @@
$conn->Execute("insert into table (id, col1,...) values ($id, $val1,...)");
*/
-
class ADODB_ibase extends ADOConnection {
var $databaseType = "ibase";
var $dataProvider = "ibase";
@@ -175,7 +174,6 @@
return $indexes;
}
-
// See http://community.borland.com/article/0,1410,25844,00.html
function RowLock($tables,$where,$col)
{
@@ -184,7 +182,6 @@
return 1;
}
-
function CreateSequence($seqname,$startID=1)
{
$ok = $this->Execute(("INSERT INTO RDB\$GENERATORS (RDB\$GENERATOR_NAME) VALUES (UPPER('$seqname'))" ));
@@ -598,7 +595,6 @@
}
-
function OldUpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
{
$blob_id = ibase_blob_create($this->_connectionID);
@@ -714,8 +710,6 @@
return false;
}
-
-
function _fetch()
{
$f = @ibase_fetch_row($this->_queryID);
@@ -772,7 +766,6 @@
}
-
function _close()
{
return @ibase_free_result($this->_queryID);
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-informix72.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-informix72.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-informix72.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -69,8 +69,6 @@
return $arr;
}
-
-
function _insertid()
{
$sqlca =ifx_getsqlca($this->lastQuery);
@@ -136,7 +134,6 @@
return 0;
}
-
function &MetaColumns($table)
{
global $ADODB_FETCH_MODE;
@@ -278,7 +275,6 @@
}
}
-
/*--------------------------------------------------------------------------------------
Class Name: Recordset
--------------------------------------------------------------------------------------*/
@@ -299,8 +295,6 @@
return $this->ADORecordSet($id);
}
-
-
/* Returns: an object containing field information.
Get column information in the Recordset object. fetchField() can be used in order to obtain information about
fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ldap.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-ldap.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-ldap.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -6,11 +6,9 @@
the BSD license will take precedence.
Set tabs to 8.
-
Joshua Eldridge (joshuae74#hotmail.com)
*/
-
class ADODB_ldap extends ADOConnection {
var $databaseType = 'ldap';
var $dataProvider = 'ldap';
@@ -23,7 +21,6 @@
var $filter;
var $dn;
-
function ADODB_ldap()
{
@@ -54,7 +51,6 @@
return $this->_connectionID;
}
-
/* returns _queryID or false */
function _query($sql,$inputarr)
{
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -32,7 +32,6 @@
// CONVERT(char(12),datecol,120)
//----------------------------------------------------------------
-
// has datetime converstion to YYYY-MM-DD format, and also mssql_fetch_assoc
if (ADODB_PHPVER >= 0x4300) {
// docs say 4.2.0, but testing shows only since 4.3.0 does it work!
@@ -40,7 +39,6 @@
} else {
global $ADODB_mssql_mths; // array, months must be upper-case
-
$ADODB_mssql_date_order = 'mdy';
$ADODB_mssql_mths = array(
'JAN'=>1,'FEB'=>2,'MAR'=>3,'APR'=>4,'MAY'=>5,'JUN'=>6,
@@ -101,7 +99,6 @@
var $uniqueOrderBy = true;
var $_bindInputArray = true;
-
function ADODB_mssql()
{
$this->_has_mssql_init = (strnatcmp(PHP_VERSION,'4.1.0')>=0);
@@ -119,7 +116,6 @@
} else
$savem = $this->SetFetchMode(ADODB_FETCH_NUM);
-
$this->Parameter($stmt,$val,'attribute_id');
$row = $this->GetRow($stmt);
@@ -193,7 +189,6 @@
//return $this->GetOne("SELECT CONVERT(varchar(255), NEWID()) AS 'Char'");
}
-
function &SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
{
if ($nrows > 0 && $offset <= 0) {
@@ -206,7 +201,6 @@
return $rs;
}
-
// Format date column in sql string given an input format that understands Y M D
function SQLDate($fmt, $col=false)
{
@@ -267,7 +261,6 @@
return $s;
}
-
function BeginTrans()
{
if ($this->transOff) return true;
@@ -385,7 +378,6 @@
return false;
}
-
function &MetaTables($ttype=false,$showSchema=false,$mask=false)
{
if ($mask) {
@@ -442,7 +434,6 @@
return true;
}
-
// returns true or false
function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
{
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -40,7 +40,6 @@
}
}
-
//----------------------------------------------------------------
// MSSQL returns dates with the format Oct 13 2002 or 13 Oct 2002
// and this causes tons of problems because localized versions of
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mssqlpo.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-mssqlpo.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-mssqlpo.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -13,7 +13,6 @@
*
*/
-
/*
The big difference between mssqlpo and it's parent mssql is that mssqlpo supports
the more standard || string concatenation operator.
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mysql.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-mysql.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-mysql.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -68,7 +68,6 @@
return $ret;
}
-
function &MetaIndexes ($table, $primary = FALSE, $owner=false)
{
// save old fetch mode
@@ -120,7 +119,6 @@
return $indexes;
}
-
// if magic quotes disabled, use mysql_real_escape_string()
function qstr($s,$magic_quotes=false)
{
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mysqli.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-mysqli.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-mysqli.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -59,7 +59,6 @@
return $arr;
}
-
function BeginTrans()
{
if ($this->transOff) return true;
@@ -820,7 +819,6 @@
}
}
-
}
}
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mysqlt.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-mysqlt.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-mysqlt.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -13,10 +13,8 @@
Requires mysql client. Works on Windows and Unix.
*/
-
include_once(ADODB_DIR."/drivers/adodb-mysql.inc.php");
-
class ADODB_mysqlt extends ADODB_mysql {
var $databaseType = 'mysqlt';
var $ansiOuter = true; // for Version 3.23.17 or later
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-netezza.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-netezza.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-netezza.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -47,7 +47,6 @@
var $autoRollback = true; // apparently pgsql does not autorollback properly before 4.3.4
// http://bugs.php.net/bug.php?id=25404
-
function ADODB_netezza()
{
@@ -127,7 +126,6 @@
}
-
}
/*--------------------------------------------------------------------------------------
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -138,7 +138,6 @@
$conn->connectSID = true;
$conn->Connect($serveraddress,'scott,'tiger',$SID);
-
Example TNSName:
---------------
NATSOFT.DOMAIN =
@@ -158,7 +157,6 @@
{
if (!function_exists('OCIPLogon')) return false;
-
$this->_errorMsg = false;
$this->_errorCode = false;
@@ -216,8 +214,6 @@
return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename,1);
}
-
-
// returns true or false
function _nconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
{
@@ -244,7 +240,6 @@
return "TO_DATE(".adodb_date($this->fmtDate,$d).",'".$this->NLS_DATE_FORMAT."')";
}
-
// format and return date string in database timestamp format
function DBTimeStamp($ts)
{
@@ -305,7 +300,6 @@
return $ret;
}
-
function SelectDB($dbName)
{
return false;
@@ -409,7 +403,6 @@
return $s. "')";
}
-
/*
This algorithm makes use of
@@ -597,7 +590,6 @@
return $rez;
}
-
/*
Example of usage:
@@ -919,7 +911,6 @@
return $arr;
}
-
function CharMax()
{
return 4000;
@@ -1064,7 +1055,6 @@
return $this->_fieldobjs[$fieldOffset];
}
-
// 10% speedup to move MoveNext to child class
function MoveNext()
{
@@ -1101,7 +1091,6 @@
return $results;
}
-
/* Use associative array to get fields array */
function Fields($colname)
{
@@ -1116,8 +1105,6 @@
return $this->fields[$this->bind[strtoupper($colname)]];
}
-
-
function _seek($row)
{
return false;
@@ -1171,7 +1158,6 @@
case 'DATE':
return ($this->connection->datetime) ? 'T' : 'D';
-
case 'TIMESTAMP': return 'T';
case 'INT':
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -15,7 +15,6 @@
/*--------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------*/
-
class ADODB_odbc extends ADOConnection {
var $databaseType = "odbc";
var $fmtDate = "'Y-m-d'";
@@ -70,7 +69,6 @@
}
}
-
function CreateSequence($seqname='adodbseq',$start=1)
{
if (empty($this->_genSeqSQL)) return false;
@@ -586,7 +584,6 @@
//$this->ADORecordSet($id);
}
-
// returns the field object
function &FetchField($fieldOffset = -1)
{
@@ -617,7 +614,6 @@
return $this->fields[$this->bind[strtoupper($colname)]];
}
-
function _initrs()
{
global $ADODB_COUNTRECS;
@@ -660,7 +656,6 @@
return $results;
}
-
function MoveNext()
{
if ($this->_numOfRows != 0 && !$this->EOF) {
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-odbc_mssql.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-odbc_mssql.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-odbc_mssql.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -16,7 +16,6 @@
include(ADODB_DIR."/drivers/adodb-odbc.inc.php");
}
-
class ADODB_odbc_mssql extends ADODB_odbc {
var $databaseType = 'odbc_mssql';
var $fmtDate = "'Y-m-d'";
@@ -73,7 +72,6 @@
return $this->GetOne($this->identitySQL);
}
-
function MetaForeignKeys($table, $owner=false, $upper=false)
{
global $ADODB_FETCH_MODE;
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-odbc_oracle.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-odbc_oracle.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-odbc_oracle.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -15,7 +15,6 @@
include(ADODB_DIR."/drivers/adodb-odbc.inc.php");
}
-
class ADODB_odbc_oracle extends ADODB_odbc {
var $databaseType = 'odbc_oracle';
var $replaceQuote = "''"; // string to use to replace quotes
@@ -64,7 +63,6 @@
$fld->type = $rs->fields[1];
$fld->max_length = $rs->fields[2];
-
if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;
else $retarr[strtoupper($fld->name)] = $fld;
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-oracle.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-oracle.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-oracle.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -43,7 +43,6 @@
return 'TO_DATE('.adodb_date($this->fmtTimeStamp,$ts).",'RRRR-MM-DD, HH:MI:SS AM')";
}
-
function BeginTrans()
{
$this->autoCommit = false;
@@ -51,7 +50,6 @@
return true;
}
-
function CommitTrans($ok=true)
{
if (!$ok) return $this->RollbackTrans();
@@ -60,7 +58,6 @@
return $ret;
}
-
function RollbackTrans()
{
$ret = ora_rollback($this->_connectionID);
@@ -68,7 +65,6 @@
return $ret;
}
-
/* there seems to be a bug in the oracle extension -- always returns ORA-00000 - no error */
function ErrorMsg()
{
@@ -77,15 +73,12 @@
return $this->_errorMsg;
}
-
function ErrorNo()
{
$err = @ora_errorcode($this->_curs);
if (!$err) return @ora_errorcode($this->_connectionID);
}
-
-
// returns true or false
function _connect($argHostname, $argUsername, $argPassword, $argDatabasename, $mode=0)
{
@@ -104,7 +97,6 @@
$argHostport="1521";
}
-
if ($this->connectSID) {
$argDatabasename="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
.")(PORT=$argHostport))(CONNECT_DATA=(SID=$argDatabasename)))";
@@ -132,14 +124,12 @@
return true;
}
-
// returns true or false
function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
{
return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename, 1);
}
-
// returns query ID if successful, otherwise false
function _query($sql,$inputarr=false)
{
@@ -154,18 +144,14 @@
return false;
}
-
// returns true or false
function _close()
{
return @ora_logoff($this->_connectionID);
}
-
-
}
-
/*--------------------------------------------------------------------------------------
Class Name: Recordset
--------------------------------------------------------------------------------------*/
@@ -201,8 +187,6 @@
return $this->_queryID;
}
-
-
/* Returns: an object containing field information.
Get column information in the Recordset object. fetchField() can be used in order to obtain information about
fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
@@ -237,7 +221,6 @@
$this->_numOfFields = @ora_numcols($this->_queryID);
}
-
function _seek($row)
{
return false;
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -158,7 +158,6 @@
return pg_cmdtuples($this->_resultid);
}
-
// returns true/false
function BeginTrans()
{
@@ -616,7 +615,6 @@
return $this->_connect($str,$user,$pwd,$db,1);
}
-
// returns queryID or false
function _query($sql,$inputarr)
{
@@ -632,8 +630,6 @@
with plan = 1.51861286163 secs
no plan = 1.26903700829 secs
-
-
*/
$plan = 'P'.md5($sql);
@@ -696,7 +692,6 @@
return $rez;
}
-
/* Returns: the last error message from previous database operation */
function ErrorMsg()
{
@@ -736,7 +731,6 @@
return true;
}
-
/*
* Maximum size of C field
*/
@@ -753,7 +747,6 @@
return 1000000000; // should be 1 Gb?
}
-
}
/*--------------------------------------------------------------------------------------
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-postgres7.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-postgres7.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-postgres7.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -24,7 +24,6 @@
$this->ADODB_postgres64();
}
-
// the following should be compat with postgresql 7.2,
// which makes obsolete the LIMIT limit,offset syntax
function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
@@ -83,8 +82,6 @@
return false;
}
-
-
function xMetaForeignKeys($table, $owner=false, $upper=false)
{
@@ -160,7 +157,6 @@
var $databaseType = "postgres7";
-
function ADORecordSet_postgres7($queryID,$mode=false)
{
$this->ADORecordSet_postgres64($queryID,$mode);
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-sapdb.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-sapdb.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-sapdb.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -48,7 +48,6 @@
};
-
class ADORecordSet_sapdb extends ADORecordSet_odbc {
var $databaseType = "sapdb";
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-sqlanywhere.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-sqlanywhere.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-sqlanywhere.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -158,9 +158,7 @@
$this->ADORecordSet_odbc($id,$mode);
}
-
}; //class
-
} //define
?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-sqlite.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-sqlite.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-sqlite.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -123,7 +123,6 @@
@sqlite_create_function($this->_connectionID, 'adodb_date2', 'adodb_date2', 2);
}
-
// returns true or false
function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
{
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -52,7 +52,6 @@
return $this->GetOne('select @@rowcount');
}
-
function BeginTrans()
{
@@ -174,8 +173,6 @@
return ADORecordSet_array_sybase::UnixTimeStamp($v);
}
-
-
# Added 2003-10-05 by Chris Phillipson
# Used ASA SQL Reference Manual -- http://sybooks.sybase.com/onlinebooks/group-aw/awg0800e/dbrfen8/@ebt-link;pt=16756?target=%25N%15_12018_START_RESTART_N%25
# to convert similar Microsoft SQL*Server (mssql) API into Sybase compatible version
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-vfp.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-vfp.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-vfp.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -42,7 +42,6 @@
return time();
}
-
function BeginTrans() { return false;}
// quote string to be sent back to database
@@ -52,7 +51,6 @@
return "'".$s."'";
}
-
// TOP requires ORDER BY for VFP
function &SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
{
@@ -60,16 +58,12 @@
return ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
}
-
-
};
-
class ADORecordSet_vfp extends ADORecordSet_odbc {
var $databaseType = "vfp";
-
function ADORecordSet_vfp($id,$mode=false)
{
return $this->ADORecordSet_odbc($id,$mode);
Modified: trunk/lib/WikiDB/backend/ADODB.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/backend/ADODB.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -566,7 +566,6 @@
return $result;
}
-
// The only thing we might be interested in updating which we can
// do fast in the flags (minor_edit). I think the default
// update_versiondata will work fine...
Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/backend/PDO.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -664,7 +664,6 @@
return $result;
}
-
// The only thing we might be interested in updating which we can
// do fast in the flags (minor_edit). I think the default
// update_versiondata will work fine...
Modified: trunk/lib/WikiDB/backend/PearDB.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/backend/PearDB.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -107,7 +107,6 @@
}
}
-
/*
* Test fast wikipage.
*/
@@ -811,7 +810,6 @@
if ($since)
$pick[] = "mtime >= $since";
-
if ($include_all_revisions) {
// Include all revisions of each page.
$table = "$page_tbl, $version_tbl";
@@ -980,7 +978,6 @@
$this->unlock();
}
-
/**
* Grab a write lock on the tables in the SQL database.
*
Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -44,7 +44,6 @@
* ALONE BASIS."
*/
-
require_once('lib/ErrorManager.php');
require_once('lib/WikiDB/backend/PearDB_pgsql.php');
@@ -430,7 +429,6 @@
if ($since)
$pick[] = "mtime >= $since";
-
if ($include_all_revisions) {
// Include all revisions of each page.
$table = "$page_tbl, $version_tbl";
Modified: trunk/lib/WikiDB/backend/cvs.php
===================================================================
--- trunk/lib/WikiDB/backend/cvs.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/backend/cvs.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -583,7 +583,6 @@
serialize( $mp ) );
}
-
/**
* Returns an array containing the most popular information. This
* creates the most popular file if it does not exist.
Modified: trunk/lib/WikiDB/backend/dumb/MostPopularIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/MostPopularIter.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/backend/dumb/MostPopularIter.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -3,7 +3,6 @@
require_once('lib/WikiDB/backend.php');
-
/**
* An inefficient but general most_popular iterator.
*
Modified: trunk/lib/WikiDB/backend/dumb/MostRecentIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/MostRecentIter.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/backend/dumb/MostRecentIter.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -3,7 +3,6 @@
require_once('lib/WikiDB/backend.php');
-
/**
* An inefficient but general most_recent iterator.
*
Modified: trunk/lib/WikiDB/backend/file.php
===================================================================
--- trunk/lib/WikiDB/backend/file.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/backend/file.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -80,7 +80,6 @@
$this->_page_version_data = NULL;
$this->_latest_versions = NULL;
-
}
// *********************************************************************
@@ -178,7 +177,6 @@
}
}
-
// *********************************************************************
// Load/Save Page-Data
function _loadPageData($pagename) {
@@ -243,7 +241,6 @@
return $this->_latest_versions[$pagename];
}
-
// *********************************************************************
// Load/Save Page-Links
function _loadPageLinks($pagename) {
@@ -257,8 +254,6 @@
$this->_savePage('links', $pagename, 0, $links);
}
-
-
/**
* Get page meta-data from database.
*
@@ -321,7 +316,6 @@
$this->_savePageData($pagename, $data); // write new pagedata-file
}
-
/**
* Get the current version number for a page.
*
@@ -623,7 +617,6 @@
//trigger_error("unlock: Not Implemented", E_USER_WARNING);
}
-
/**
* Close database.
*/
Modified: trunk/lib/WikiDB/backend.php
===================================================================
--- trunk/lib/WikiDB/backend.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/backend.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -117,7 +117,6 @@
trigger_error("virtual", E_USER_ERROR);
}
-
/**
* Get the current version number for a page.
*
@@ -362,7 +361,6 @@
'exclude' => $exclude));
}
-
/**
*
* @access protected
Modified: trunk/lib/WikiDB/file.php
===================================================================
--- trunk/lib/WikiDB/file.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/file.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -22,7 +22,6 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-
require_once( 'lib/WikiDB.php' );
require_once( 'lib/WikiDB/backend/file.php' );
Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -105,7 +105,6 @@
return new $class ($dbparams);
}
-
/**
* Constructor.
*
Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiPluginCached.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -252,7 +252,6 @@
return HTML();
} // run
-
/* --------------------- virtual or abstract functions ----------- */
/**
@@ -469,7 +468,6 @@
return $object;
}
-
// --------------------------------------------------------------------------
// ---------------------- static member functions ---------------------------
// --------------------------------------------------------------------------
@@ -557,7 +555,6 @@
} // decideImgType
-
/**
* Writes an image into a file or to the browser.
* Note that there is no check if the image can
@@ -581,7 +578,6 @@
}
} // writeImage
-
/**
* Sends HTTP Header for some predefined file types.
* There is no parameter check.
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiTheme.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -146,8 +146,6 @@
}
}
-
-
/**
* Make a button.
*
@@ -1053,7 +1051,6 @@
return $this->_buttonSeparator;
}
-
////////////////////////////////////////////////////////////////
//
// CSS
@@ -1378,7 +1375,6 @@
*/
//$this->setDateFormat("%B %d, %Y", false);
-
/**
* Custom UserPreferences:
* A list of name => _UserPreference class pairs.
@@ -1635,7 +1631,6 @@
};
-
/**
* A class representing a clickable "button".
*
@@ -1732,7 +1727,6 @@
};
-
/**
* A class representing an image form <samp>submit</samp> button.
*/
Modified: trunk/lib/WikiUserNew.php
===================================================================
--- trunk/lib/WikiUserNew.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiUserNew.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -298,7 +298,6 @@
return '_WikiUser';
}
-
/**
* Upgrade olduser by copying properties from user to olduser.
* We are not sure yet, for which php's a simple $this = $user works reliably,
Modified: trunk/lib/XMLRPC/utils.php
===================================================================
--- trunk/lib/XMLRPC/utils.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/XMLRPC/utils.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -32,7 +32,6 @@
*/
-
/* xmlrpc utilities (xu)
* author: Dan Libby (da...@li...)
*/
@@ -131,7 +130,6 @@
'faultString' => $string);
}
-
function find_and_decode_xml($buf, $debug) {
if (strlen($buf)) {
$xml_begin = substr($buf, strpos($buf, "<?xml"));
@@ -236,8 +234,6 @@
));
}
-
-
function xu_is_fault($arg) {
// xmlrpc extension finally supports this.
return is_array($arg) ? xmlrpc_is_fault($arg) : false;
Modified: trunk/lib/XmlElement.php
===================================================================
--- trunk/lib/XmlElement.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/XmlElement.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -172,7 +172,6 @@
return trim($val);
}
-
/**
* See if element is empty.
*
Modified: trunk/lib/XmlRpcServer.php
===================================================================
--- trunk/lib/XmlRpcServer.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/XmlRpcServer.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -85,7 +85,6 @@
require_once("lib/XMLRPC/xmlrpcs.inc");
}
-
/**
* Helper function: Looks up a page revision (most recent by default) in the wiki database
*
@@ -123,7 +122,6 @@
return new xmlrpcresp(0, $xmlrpcerruser + 1, "No such page ".$pagename);
}
-
// ****************************************************************************
// Main API functions follow
// ****************************************************************************
@@ -190,7 +188,6 @@
return new xmlrpcresp(new xmlrpcval($pages, "array"));
}
-
/**
* base64 getPage( String pagename ): Get the raw Wiki text of page, latest version.
* Page name must be UTF-8, with URL encoding. Returned value is a binary object,
@@ -214,7 +211,6 @@
return new xmlrpcresp(long_string($revision->getPackedContent()));
}
-
/**
* base64 getPageVersion( String pagename, int version ): Get the raw Wiki text of page.
* Returns UTF-8, expects UTF-8 with URL encoding.
@@ -336,7 +332,6 @@
return getPageInfo($params);
}
-
/* array listLinks( string pagename ): Lists all links for a given page. The
* returned array contains structs, with the following elements:
* name (string) : The page name or URL the link is to.
Modified: trunk/lib/diff.php
===================================================================
--- trunk/lib/diff.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/diff.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -68,7 +68,6 @@
list ($orig_words, $orig_stripped) = $this->_split($orig_lines);
list ($final_words, $final_stripped) = $this->_split($final_lines);
-
$this->MappedDiff($orig_words, $final_words,
$orig_stripped, $final_stripped);
}
@@ -108,7 +107,6 @@
}
}
-
/**
* HTML unified diff formatter.
*
Modified: trunk/lib/diff3.php
===================================================================
--- trunk/lib/diff3.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/diff3.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -38,7 +38,6 @@
}
}
-
class _Diff3_CopyBlock extends _Diff3_Block {
var $type = 'copy';
@@ -66,7 +65,6 @@
$this->orig = $this->final1 = $this->final2 = array();
}
-
function _append (&$array, $lines) {
array_splice($array, sizeof($array), 0, $lines);
}
@@ -101,7 +99,6 @@
}
};
-
class Diff3 {
function Diff3 ($orig, $final1, $final2) {
$eng = new _DiffEngine;
@@ -179,7 +176,6 @@
return $blocks;
}
-
function merged_output($label1 = false, $label2 = false) {
$lines = array();
foreach ($this->blocks as $block) {
Modified: trunk/lib/difflib.php
===================================================================
--- trunk/lib/difflib.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/difflib.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -81,7 +81,6 @@
}
}
-
/**
* Class used internally by Diff to actually compute the diffs.
*
@@ -191,7 +190,6 @@
return $edits;
}
-
/* Divide the Largest Common Subsequence (LCS) of the sequences
* [XOFF, XLIM) and [YOFF, YLIM) into NCHUNKS approximately equally
* sized segments.
@@ -605,7 +603,6 @@
if (serialize(...
[truncated message content] |
