Menu
▾
▴
phpwiki-checkins
|
From: <var...@us...> - 2011-11-22 16:53:51
|
Revision: 8181
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8181&view=rev
Author: vargenau
Date: 2011-11-22 16:53:45 +0000 (Tue, 22 Nov 2011)
Log Message:
-----------
Add <legend> to <fieldset>
Modified Paths:
--------------
trunk/lib/purgepage.php
trunk/lib/removepage.php
Modified: trunk/lib/purgepage.php
===================================================================
--- trunk/lib/purgepage.php 2011-11-07 16:50:45 UTC (rev 8180)
+++ trunk/lib/purgepage.php 2011-11-22 16:53:45 UTC (rev 8181)
@@ -24,7 +24,8 @@
$purgeB = Button('submit:verify', _("Purge Page"), 'wikiadmin');
$cancelB = Button('submit:cancel', _("Cancel"), 'button'); // use generic wiki button look
- $fieldset = HTML::fieldset(HTML::p(fmt("You are about to purge '%s'!", $pagelink)),
+ $fieldset = HTML::fieldset(HTML::legend(_('Confirm purge')),
+ HTML::p(fmt("You are about to purge '%s'!", $pagelink)),
HTML::form(array('method' => 'post',
'action' => $request->getPostURL()),
HiddenInputs(array('currentversion' => $version,
Modified: trunk/lib/removepage.php
===================================================================
--- trunk/lib/removepage.php 2011-11-07 16:50:45 UTC (rev 8180)
+++ trunk/lib/removepage.php 2011-11-22 16:53:45 UTC (rev 8181)
@@ -24,7 +24,8 @@
$removeB = Button('submit:verify', _("Remove Page"), 'wikiadmin');
$cancelB = Button('submit:cancel', _("Cancel"), 'button'); // use generic wiki button look
- $fieldset = HTML::fieldset(HTML::p(fmt("You are about to remove '%s'!", $pagelink)),
+ $fieldset = HTML::fieldset(HTML::legend(_('Confirm removal')),
+ HTML::p(fmt("You are about to remove '%s'!", $pagelink)),
HTML::form(array('method' => 'post',
'action' => $request->getPostURL()),
HiddenInputs(array('currentversion' => $version,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-09-28 11:20:54
|
Revision: 8286
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8286&view=rev
Author: vargenau
Date: 2012-09-28 11:20:42 +0000 (Fri, 28 Sep 2012)
Log Message:
-----------
php_closing_tag [PSR-2] The closing ?> tag MUST be omitted from files containing only PHP.
Modified Paths:
--------------
trunk/lib/AccessLog.php
trunk/lib/ArchiveCleaner.php
trunk/lib/AtomParser.php
trunk/lib/BlockParser.php
trunk/lib/CachedMarkup.php
trunk/lib/Captcha.php
trunk/lib/DbSession/ADODB.php
trunk/lib/DbSession/PDO.php
trunk/lib/DbSession/SQL.php
trunk/lib/DbSession/dba.php
trunk/lib/DbSession.php
trunk/lib/DbaDatabase.php
trunk/lib/DbaListSet.php
trunk/lib/DbaPartition.php
trunk/lib/EditToolbar.php
trunk/lib/ErrorManager.php
trunk/lib/ExternalReferrer.php
trunk/lib/FileFinder.php
trunk/lib/Google.php
trunk/lib/HtmlElement.php
trunk/lib/HtmlElement5.php
trunk/lib/HtmlParser.php
trunk/lib/HttpClient.php
trunk/lib/IniConfig.php
trunk/lib/InlineParser.php
trunk/lib/MailNotify.php
trunk/lib/PageList.php
trunk/lib/PagePerm.php
trunk/lib/PageType.php
trunk/lib/RSSWriter091.php
trunk/lib/Request.php
trunk/lib/RssParser.php
trunk/lib/RssWriter.php
trunk/lib/RssWriter2.php
trunk/lib/SemanticWeb.php
trunk/lib/SpamBlocklist.php
trunk/lib/Template.php
trunk/lib/TextSearchQuery.php
trunk/lib/Units.php
trunk/lib/WikiCallback.php
trunk/lib/WikiDB/ADODB.php
trunk/lib/WikiDB/PDO.php
trunk/lib/WikiDB/SQL.php
trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php
trunk/lib/WikiDB/adodb/adodb-error.inc.php
trunk/lib/WikiDB/adodb/adodb-errorhandler.inc.php
trunk/lib/WikiDB/adodb/adodb-errorpear.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/adodb.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-ado_mssql.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-informix.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-oci805.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-oci8po.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-odbtp.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-odbtp_unicode.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-oracle.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-postgres.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-proxy.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/ADODB_mssql.php
trunk/lib/WikiDB/backend/ADODB_mssqlnative.php
trunk/lib/WikiDB/backend/ADODB_mysql.php
trunk/lib/WikiDB/backend/ADODB_oci8po.php
trunk/lib/WikiDB/backend/ADODB_postgres7.php
trunk/lib/WikiDB/backend/ADODB_sqlite.php
trunk/lib/WikiDB/backend/PDO.php
trunk/lib/WikiDB/backend/PDO_mysql.php
trunk/lib/WikiDB/backend/PDO_oci8.php
trunk/lib/WikiDB/backend/PDO_pgsql.php
trunk/lib/WikiDB/backend/PearDB.php
trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
trunk/lib/WikiDB/backend/PearDB_mysql.php
trunk/lib/WikiDB/backend/PearDB_oci8.php
trunk/lib/WikiDB/backend/PearDB_pgsql.php
trunk/lib/WikiDB/backend/PearDB_sqlite.php
trunk/lib/WikiDB/backend/cvs.php
trunk/lib/WikiDB/backend/dba.php
trunk/lib/WikiDB/backend/dbaBase.php
trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php
trunk/lib/WikiDB/backend/dumb/BackLinkIter.php
trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php
trunk/lib/WikiDB/backend/dumb/MostPopularIter.php
trunk/lib/WikiDB/backend/dumb/MostRecentIter.php
trunk/lib/WikiDB/backend/dumb/TextSearchIter.php
trunk/lib/WikiDB/backend/dumb/WantedPagesIter.php
trunk/lib/WikiDB/backend/file.php
trunk/lib/WikiDB/backend/flatfile.php
trunk/lib/WikiDB/backend.php
trunk/lib/WikiDB/cvs.php
trunk/lib/WikiDB/dba.php
trunk/lib/WikiDB/file.php
trunk/lib/WikiDB/flatfile.php
trunk/lib/WikiDB.php
trunk/lib/WikiGroup.php
trunk/lib/WikiPlugin.php
trunk/lib/WikiPluginCached.php
trunk/lib/WikiTheme.php
trunk/lib/WikiUser/AdoDb.php
trunk/lib/WikiUser/BogoLogin.php
trunk/lib/WikiUser/Db.php
trunk/lib/WikiUser/EMailConfirm.php
trunk/lib/WikiUser/Facebook.php
trunk/lib/WikiUser/File.php
trunk/lib/WikiUser/Forbidden.php
trunk/lib/WikiUser/FusionForge.php
trunk/lib/WikiUser/HttpAuth.php
trunk/lib/WikiUser/HttpAuthUpper.php
trunk/lib/WikiUser/IMAP.php
trunk/lib/WikiUser/LDAP.php
trunk/lib/WikiUser/LdapUpper.php
trunk/lib/WikiUser/OpenID.php
trunk/lib/WikiUser/POP3.php
trunk/lib/WikiUser/PdoDb.php
trunk/lib/WikiUser/PearDb.php
trunk/lib/WikiUser/PersonalPage.php
trunk/lib/WikiUser/Session.php
trunk/lib/WikiUser.php
trunk/lib/WikiUserNew.php
trunk/lib/WysiwygEdit/FCKeditor.php
trunk/lib/WysiwygEdit/Wikiwyg.php
trunk/lib/WysiwygEdit/htmlarea2.php
trunk/lib/WysiwygEdit/htmlarea3.php
trunk/lib/WysiwygEdit/spaw.php
trunk/lib/WysiwygEdit/tinymce.php
trunk/lib/WysiwygEdit.php
trunk/lib/XMLRPC/utils.php
trunk/lib/XmlElement.php
trunk/lib/XmlParser.php
trunk/lib/XmlRpcClient.php
trunk/lib/XmlRpcServer.php
trunk/lib/config.php
trunk/lib/diff.php
trunk/lib/diff3.php
trunk/lib/difflib.php
trunk/lib/display.php
trunk/lib/editpage.php
trunk/lib/fortune.php
trunk/lib/fpdf.php
trunk/lib/gif.php
trunk/lib/imagecache.php
trunk/lib/imdb.php
trunk/lib/install.php
trunk/lib/loadsave.php
trunk/lib/main.php
trunk/lib/nusoap/nusoap.php
trunk/lib/pdf.php
trunk/lib/prepend.php
trunk/lib/purgepage.php
trunk/lib/removepage.php
trunk/lib/spam_babycart.php
trunk/lib/stdlib.php
trunk/lib/upgrade.php
trunk/lib/wikilens/Buddy.php
trunk/lib/wikilens/CustomPrefs.php
trunk/lib/wikilens/PageListColumns.php
trunk/lib/wikilens/RatingsDb.php
trunk/lib/wikilens/RatingsUser.php
trunk/lib/wikilens/Utils.php
trunk/lib/ziplib.php
Property Changed:
----------------
trunk/lib/AccessLog.php
trunk/lib/ArchiveCleaner.php
trunk/lib/AtomParser.php
trunk/lib/BlockParser.php
trunk/lib/CachedMarkup.php
trunk/lib/Captcha.php
trunk/lib/DbSession/ADODB.php
trunk/lib/DbSession/PDO.php
trunk/lib/DbSession/SQL.php
trunk/lib/DbSession/dba.php
trunk/lib/DbSession.php
trunk/lib/DbaDatabase.php
trunk/lib/DbaListSet.php
trunk/lib/DbaPartition.php
trunk/lib/EditToolbar.php
trunk/lib/ErrorManager.php
trunk/lib/ExternalReferrer.php
trunk/lib/FileFinder.php
trunk/lib/Google.php
trunk/lib/HtmlElement.php
trunk/lib/HtmlElement5.php
trunk/lib/HtmlParser.php
trunk/lib/HttpClient.php
trunk/lib/IniConfig.php
trunk/lib/InlineParser.php
trunk/lib/MailNotify.php
trunk/lib/PageList.php
trunk/lib/PagePerm.php
trunk/lib/PageType.php
trunk/lib/RSSWriter091.php
trunk/lib/Request.php
trunk/lib/RssParser.php
trunk/lib/RssWriter.php
trunk/lib/RssWriter2.php
trunk/lib/SemanticWeb.php
trunk/lib/SpamBlocklist.php
trunk/lib/Template.php
trunk/lib/TextSearchQuery.php
trunk/lib/Units.php
trunk/lib/WikiCallback.php
trunk/lib/WikiDB.php
trunk/lib/WikiGroup.php
trunk/lib/WikiPlugin.php
trunk/lib/WikiPluginCached.php
trunk/lib/WikiTheme.php
trunk/lib/WikiUser.php
trunk/lib/WikiUserNew.php
trunk/lib/WysiwygEdit.php
trunk/lib/XmlElement.php
trunk/lib/XmlParser.php
trunk/lib/XmlRpcClient.php
trunk/lib/XmlRpcServer.php
trunk/lib/config.php
trunk/lib/diff.php
trunk/lib/diff3.php
trunk/lib/difflib.php
trunk/lib/display.php
trunk/lib/editpage.php
trunk/lib/fortune.php
trunk/lib/fpdf.php
trunk/lib/gif.php
trunk/lib/imagecache.php
trunk/lib/imdb.php
trunk/lib/install.php
trunk/lib/loadsave.php
trunk/lib/main.php
trunk/lib/nusoap/nusoap.php
trunk/lib/pdf.php
trunk/lib/prepend.php
trunk/lib/purgepage.php
trunk/lib/removepage.php
trunk/lib/spam_babycart.php
trunk/lib/stdlib.php
trunk/lib/upgrade.php
trunk/lib/ziplib.php
Modified: trunk/lib/AccessLog.php
===================================================================
--- trunk/lib/AccessLog.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/AccessLog.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,5 +1,5 @@
<?php
-// $Id$
+
/*
* Copyright 2005, 2007 Reini Urban
*
@@ -736,4 +736,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Property changes on: trunk/lib/AccessLog.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/ArchiveCleaner.php
===================================================================
--- trunk/lib/ArchiveCleaner.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/ArchiveCleaner.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,5 +1,5 @@
<?php
-// $Id$
+
/* Copyright (C) 2002 Geoffrey T. Dairiki <da...@da...>
*
* This file is part of PhpWiki.
@@ -171,4 +171,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Property changes on: trunk/lib/ArchiveCleaner.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/AtomParser.php
===================================================================
--- trunk/lib/AtomParser.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/AtomParser.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// $Id$
+
/*
* Copyright 2010 Sébastien Le Callonnec
*
@@ -254,4 +254,3 @@
return $tag;
}
}
-?>
Property changes on: trunk/lib/AtomParser.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/BlockParser.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
/* Copyright (C) 2002 Geoffrey T. Dairiki <da...@da...>
* Copyright (C) 2004,2005 Reini Urban
* Copyright (C) 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -1403,4 +1403,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Property changes on: trunk/lib/BlockParser.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/CachedMarkup.php
===================================================================
--- trunk/lib/CachedMarkup.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/CachedMarkup.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,5 +1,5 @@
<?php
-// $Id$
+
/* Copyright (C) 2002 Geoffrey T. Dairiki <da...@da...>
* Copyright (C) 2004-2010 $ThePhpWikiProgrammingTeam
* Copyright (C) 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -807,4 +807,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Property changes on: trunk/lib/CachedMarkup.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/Captcha.php
===================================================================
--- trunk/lib/Captcha.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/Captcha.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,5 +1,5 @@
<?php
-// $Id$
+
/**
* Session Captcha v1.0
* by Gavin M. Roy <gm...@bt...>
@@ -183,4 +183,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Property changes on: trunk/lib/Captcha.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/DbSession/ADODB.php
===================================================================
--- trunk/lib/DbSession/ADODB.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/DbSession/ADODB.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
/*
* Copyright 2005 $ThePhpWikiProgrammingTeam
*
@@ -265,4 +265,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Property changes on: trunk/lib/DbSession/ADODB.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/DbSession/PDO.php
===================================================================
--- trunk/lib/DbSession/PDO.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/DbSession/PDO.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
/**
* Db sessions for PDO, based on pear DB Sessions.
@@ -251,4 +251,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Property changes on: trunk/lib/DbSession/PDO.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/DbSession/SQL.php
===================================================================
--- trunk/lib/DbSession/SQL.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/DbSession/SQL.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
/**
* DB sessions for pear DB
@@ -246,4 +246,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Property changes on: trunk/lib/DbSession/SQL.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/DbSession/dba.php
===================================================================
--- trunk/lib/DbSession/dba.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/DbSession/dba.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
/** DBA Sessions
* session:
@@ -144,4 +144,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Property changes on: trunk/lib/DbSession/dba.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/DbSession.php
===================================================================
--- trunk/lib/DbSession.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/DbSession.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
/**
* Store sessions data in Pear DB / ADODB / dba / PDO, ....
@@ -60,4 +60,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Property changes on: trunk/lib/DbSession.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/DbaDatabase.php
===================================================================
--- trunk/lib/DbaDatabase.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/DbaDatabase.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
require_once('lib/ErrorManager.php');
@@ -206,4 +206,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Property changes on: trunk/lib/DbaDatabase.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/DbaListSet.php
===================================================================
--- trunk/lib/DbaListSet.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/DbaListSet.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
class DbaListSet
{
@@ -142,4 +142,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Property changes on: trunk/lib/DbaListSet.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/DbaPartition.php
===================================================================
--- trunk/lib/DbaPartition.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/DbaPartition.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
class DbaPartition
{
@@ -81,4 +81,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Property changes on: trunk/lib/DbaPartition.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/EditToolbar.php
===================================================================
--- trunk/lib/EditToolbar.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/EditToolbar.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,5 +1,5 @@
<?php
-// $Id$
+
/* Copyright 2004-2010 $ThePhpWikiProgrammingTeam
* Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
*
@@ -486,4 +486,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Property changes on: trunk/lib/EditToolbar.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/ErrorManager.php
===================================================================
--- trunk/lib/ErrorManager.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/ErrorManager.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
if (isset($GLOBALS['ErrorManager'])) return;
@@ -663,4 +663,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Property changes on: trunk/lib/ErrorManager.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/ExternalReferrer.php
===================================================================
--- trunk/lib/ExternalReferrer.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/ExternalReferrer.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,6 +1,6 @@
<?php
-// $Id$
+
/**
* Detect external referrers
* Currently only search engines, and highlight the searched item.
@@ -122,4 +122,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Property changes on: trunk/lib/ExternalReferrer.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/FileFinder.php
===================================================================
--- trunk/lib/FileFinder.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/FileFinder.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
require_once(dirname(__FILE__).'/stdlib.php');
@@ -576,4 +576,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Property changes on: trunk/lib/FileFinder.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/Google.php
===================================================================
--- trunk/lib/Google.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/Google.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -282,4 +282,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Property changes on: trunk/lib/Google.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/HtmlElement.php
===================================================================
--- trunk/lib/HtmlElement.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/HtmlElement.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
/**
* Code for writing the HTML subset of XML.
* @author: Jeff Dairiki
@@ -550,4 +550,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Property changes on: trunk/lib/HtmlElement.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/HtmlElement5.php
===================================================================
--- trunk/lib/HtmlElement5.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/HtmlElement5.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
/**
* Code for writing the HTML subset of XML.
* @author: Jeff Dairiki
@@ -550,4 +550,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Property changes on: trunk/lib/HtmlElement5.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/HtmlParser.php
===================================================================
--- trunk/lib/HtmlParser.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/HtmlParser.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// $Id$
+
/**
* HtmlParser Class: Conversion HTML => wikimarkup
* Requires XmlParser, XmlElement and the expat (or now the libxml) library. This is all in core.
@@ -421,4 +421,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Property changes on: trunk/lib/HtmlParser.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/HttpClient.php
===================================================================
--- trunk/lib/HttpClient.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/HttpClient.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,6 +1,6 @@
<?php // -*-php-*-
-// $Id$
+
/**
Version 0.9, 6th April 2003 - Simon Willison ( http://simon.incutio.com/ )
Manual: http://scripts.incutio.com/httpclient/
@@ -393,4 +393,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Property changes on: trunk/lib/HttpClient.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/IniConfig.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,5 +1,5 @@
<?php
-// $Id$
+
/**
* A configurator intended to read its config from a PHP-style INI file,
* instead of a PHP file.
@@ -1137,4 +1137,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Property changes on: trunk/lib/IniConfig.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/InlineParser.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,5 +1,5 @@
<?php
-// $Id$
+
/* Copyright (C) 2002 Geoffrey T. Dairiki <da...@da...>
* Copyright (C) 2004-2010 Reini Urban
* Copyright (C) 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -1406,4 +1406,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Property changes on: trunk/lib/InlineParser.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/MailNotify.php
===================================================================
--- trunk/lib/MailNotify.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/MailNotify.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,5 +1,5 @@
<?php
-// $Id$
+
/* Copyright (C) 2006-2007,2009 Reini Urban
* Copyright (C) 2009 Marc-Etienne Vargenau, Alcatel-Lucent
*
@@ -478,4 +478,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Property changes on: trunk/lib/MailNotify.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/PageList.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,5 +1,5 @@
<?php
-//$Id$
+//$Id: PageList.php 8281 2012-08-31 12:01:01Z vargenau $
/* Copyright (C) 2004-2010 $ThePhpWikiProgrammingTeam
* Copyright (C) 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent
*
@@ -1808,4 +1808,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Property changes on: trunk/lib/PageList.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/PagePerm.php
===================================================================
--- trunk/lib/PagePerm.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/PagePerm.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// $Id$
+
/*
* Copyright 2004,2007 $ThePhpWikiProgrammingTeam
* Copyright 2009-2010 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -749,4 +749,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Property changes on: trunk/lib/PagePerm.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/PageType.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// $Id$
+
/*
* Copyright 1999,2000,2001,2002,2003,2004,2005,2006 $ThePhpWikiProgrammingTeam
*
@@ -552,4 +552,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Property changes on: trunk/lib/PageType.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/RSSWriter091.php
===================================================================
--- trunk/lib/RSSWriter091.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/RSSWriter091.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -21,8 +21,8 @@
// for outputting RecentChanges in RSS 0.91 format
// ----------------------------------------------------------------------
-// $Id$
+
include_once("lib/RssWriter.php");
class RSSWriter091 extends RSSWriter
{
@@ -140,4 +140,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Property changes on: trunk/lib/RSSWriter091.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/Request.php
===================================================================
--- trunk/lib/Request.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/Request.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// $Id$
+
/*
* Copyright (C) 2002,2004,2005,2006,2009 $ThePhpWikiProgrammingTeam
*
@@ -1348,4 +1348,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Property changes on: trunk/lib/Request.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/RssParser.php
===================================================================
--- trunk/lib/RssParser.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/RssParser.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// $Id$
+
/**
* Simple RSSParser Class
* Based on Duncan Gough RSSParser class
@@ -186,4 +186,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Property changes on: trunk/lib/RssParser.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/RssWriter.php
===================================================================
--- trunk/lib/RssWriter.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/RssWriter.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
/*
* Code for creating RSS 1.0.
*/
@@ -257,4 +257,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Property changes on: trunk/lib/RssWriter.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/RssWriter2.php
===================================================================
--- trunk/lib/RssWriter2.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/RssWriter2.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
/*
* Code for creating RSS 2.0
* Author: Reini Urban for PhpWiki
@@ -82,4 +82,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Property changes on: trunk/lib/RssWriter2.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/SemanticWeb.php
===================================================================
--- trunk/lib/SemanticWeb.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/SemanticWeb.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
/**
* What to do on ?format=rdf What to do on ?format=owl
*
@@ -404,4 +404,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Property changes on: trunk/lib/SemanticWeb.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/SpamBlocklist.php
===================================================================
--- trunk/lib/SpamBlocklist.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/SpamBlocklist.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,5 +1,5 @@
<?php
-// $Id$
+
/* Copyright (C) 2005 Reini Urban
*
* This file is part of PhpWiki.
@@ -126,4 +126,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Property changes on: trunk/lib/SpamBlocklist.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/Template.php
===================================================================
--- trunk/lib/Template.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/Template.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,6 +1,6 @@
<?php //-*-php-*-
-// $Id$
+
require_once("lib/ErrorManager.php");
/** An HTML template.
@@ -299,4 +299,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Property changes on: trunk/lib/Template.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/TextSearchQuery.php
===================================================================
--- trunk/lib/TextSearchQuery.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/TextSearchQuery.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
/**
* A text search query, converting queries to PCRE and SQL matchers.
*
@@ -1222,4 +1222,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Property changes on: trunk/lib/TextSearchQuery.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/Units.php
===================================================================
--- trunk/lib/Units.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/Units.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
/**
*
* Interface to man units(1), /usr/share/units.dat
Property changes on: trunk/lib/Units.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/WikiCallback.php
===================================================================
--- trunk/lib/WikiCallback.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiCallback.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,6 +1,6 @@
<?php //-*-php-*-
-// $Id$
+
/**
* A callback
*
@@ -162,4 +162,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Property changes on: trunk/lib/WikiCallback.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/WikiDB/ADODB.php
===================================================================
--- trunk/lib/WikiDB/ADODB.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/ADODB.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,6 +1,6 @@
<?php // -*-php-*-
-// $Id$
+
require_once('lib/WikiDB.php');
/**
@@ -106,4 +106,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Modified: trunk/lib/WikiDB/PDO.php
===================================================================
--- trunk/lib/WikiDB/PDO.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/PDO.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,6 +1,6 @@
<?php // -*-php-*-
-// $Id$
+
require_once('lib/WikiDB.php');
/**
@@ -114,4 +114,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Modified: trunk/lib/WikiDB/SQL.php
===================================================================
--- trunk/lib/WikiDB/SQL.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/SQL.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
require_once('lib/WikiDB.php');
//require_once('lib/WikiDB/backend/PearDB.php');
@@ -97,4 +97,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Modified: trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -240,4 +240,3 @@
$rs->InitArrayFields($arr,$flds);
return $rs;
}
-?>
Modified: trunk/lib/WikiDB/adodb/adodb-error.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-error.inc.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/adodb/adodb-error.inc.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -250,4 +250,3 @@
return $MAP;
}
-?>
Modified: trunk/lib/WikiDB/adodb/adodb-errorhandler.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-errorhandler.inc.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/adodb/adodb-errorhandler.inc.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -74,4 +74,3 @@
//print "<p>$s</p>";
trigger_error($s,ADODB_ERROR_HANDLER_TYPE);
}
-?>
Modified: trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -85,4 +85,3 @@
return $ADODB_Last_PEAR_Error;
}
-?>
Modified: trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -74,4 +74,3 @@
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-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/adodb/adodb-iterator.inc.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -69,4 +69,3 @@
}
}
-?>
Modified: trunk/lib/WikiDB/adodb/adodb-lib.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-lib.inc.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/adodb/adodb-lib.inc.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -669,4 +669,3 @@
return $sql;
}
-?>
Modified: trunk/lib/WikiDB/adodb/adodb-pear.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-pear.inc.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/adodb/adodb-pear.inc.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -355,4 +355,3 @@
}
}
-?>
Modified: trunk/lib/WikiDB/adodb/adodb-php4.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-php4.inc.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/adodb/adodb-php4.inc.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -12,4 +12,3 @@
class ADODB_BASE_RS {
}
-?>
Modified: trunk/lib/WikiDB/adodb/adodb-time.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-time.inc.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/adodb/adodb-time.inc.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -904,4 +904,3 @@
return $ret;
}
-?>
Modified: trunk/lib/WikiDB/adodb/adodb.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb.inc.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/adodb/adodb.inc.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -3685,4 +3685,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-access.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-access.inc.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-access.inc.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -80,4 +80,3 @@
}
}// class
}
-?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -602,4 +602,3 @@
}
-?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -42,4 +42,3 @@
return $this->ADORecordSet_ado($id,$mode);
}
}
-?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ado_mssql.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-ado_mssql.inc.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-ado_mssql.inc.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -59,4 +59,3 @@
return $this->ADORecordSet_ado($id,$mode);
}
}
-?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -75,4 +75,3 @@
$this->ADORecordSet_ibase($id,$mode);
}
}
-?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-csv.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-csv.inc.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-csv.inc.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -194,4 +194,3 @@
} // define
-?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -304,4 +304,3 @@
}
} //define
-?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -256,4 +256,3 @@
} //class
} // defined
-?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -63,4 +63,3 @@
$this->ADORecordSet_ibase($id,$mode);
}
}
-?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -804,4 +804,3 @@
}
}
-?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-informix.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-informix.inc.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-informix.inc.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -27,4 +27,3 @@
$this->ADORecordset_informix72($id,$mode);
}
}
-?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-informix72.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-informix72.inc.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-informix72.inc.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -383,4 +383,3 @@
}
}
-?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ldap.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-ldap.inc.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-ldap.inc.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -302,4 +302,3 @@
}
}
-?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -916,4 +916,3 @@
http://www.databasejournal.com/scripts/article.php/1440551
*/
-?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -917,4 +917,3 @@
http://www.databasejournal.com/scripts/article.php/1440551
*/
-?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mssqlpo.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-mssqlpo.inc.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-mssqlpo.inc.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -55,4 +55,3 @@
$this->ADORecordset_mssql($id,$mode);
}
}
-?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mysql.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-mysql.inc.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-mysql.inc.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -674,4 +674,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mysqli.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-mysqli.inc.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-mysqli.inc.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -823,4 +823,3 @@
}
-?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mysqlt.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-mysqlt.inc.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-mysqlt.inc.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -71,4 +71,3 @@
return false;
}
}
-?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-netezza.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-netezza.inc.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-netezza.inc.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -163,4 +163,3 @@
}
}
-?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1169,4 +1169,3 @@
}
}
}
-?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-oci805.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-oci805.inc.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-oci805.inc.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -53,4 +53,3 @@
$this->ADORecordset_oci8($id,$mode);
}
}
-?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-oci8po.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-oci8po.inc.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-oci8po.inc.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -187,4 +187,3 @@
}
}
-?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -702,4 +702,3 @@
}
-?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-odbc_mssql.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-odbc_mssql.inc.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-odbc_mssql.inc.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -234,4 +234,3 @@
return $this->ADORecordSet_odbc($id,$mode);
}
}
-?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-odbc_oracle.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-odbc_oracle.inc.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-odbc_oracle.inc.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -110,4 +110,3 @@
return $this->ADORecordSet_odbc($id,$mode);
}
}
-?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-odbtp.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-odbtp.inc.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-odbtp.inc.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -625,4 +625,3 @@
}
}
-?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-odbtp_unicode.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-odbtp_unicode.inc.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-odbtp_unicode.inc.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -56,4 +56,3 @@
}
}
}
-?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-oracle.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-oracle.inc.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-oracle.inc.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -277,4 +277,3 @@
}
}
}
-?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-postgres.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-postgres.inc.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-postgres.inc.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -11,4 +11,3 @@
job, so hopefully this will ensure greater consistency and fewer bugs.
*/
-?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -943,4 +943,3 @@
}
}
-?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-postgres7.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-postgres7.inc.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-postgres7.inc.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -182,4 +182,3 @@
}
}
-?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-proxy.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-proxy.inc.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-proxy.inc.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -27,4 +27,3 @@
};
} // define
-?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-sapdb.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-sapdb.inc.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-sapdb.inc.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -59,4 +59,3 @@
}
} //define
-?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-sqlanywhere.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-sqlanywhere.inc.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-sqlanywhere.inc.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -161,4 +161,3 @@
}; //class
} //define
-?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-sqlite.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-sqlite.inc.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-sqlite.inc.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -315,4 +315,3 @@
}
}
-?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -399,4 +399,3 @@
return mktime($rr[4],$rr[5],0,$themth,$rr[2],$rr[3]);
}
}
-?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-vfp.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-vfp.inc.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-vfp.inc.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -96,4 +96,3 @@
}
} //define
-?>
Modified: trunk/lib/WikiDB/backend/ADODB.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/backend/ADODB.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,6 +1,6 @@
<?php // -*-php-*-
-// $Id$
+
/*
* Copyright 2002,2004,2005,2006 $ThePhpWikiProgrammingTeam
*
@@ -1567,4 +1567,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Modified: trunk/lib/WikiDB/backend/ADODB_mssql.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_mssql.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/backend/ADODB_mssql.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,6 +1,6 @@
<?php // -*-php-*-
-// $Id$
+
/**
* MS SQL extensions for the ADODB DB backend.
*/
@@ -113,4 +113,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Modified: trunk/lib/WikiDB/backend/ADODB_mssqlnative.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_mssqlnative.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/backend/ADODB_mssqlnative.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,6 +1,6 @@
<?php // -*-php-*-
-// $Id$
+
/**
* MS SQL extensions for the ADODB DB backend.
*/
@@ -245,4 +245,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Modified: trunk/lib/WikiDB/backend/ADODB_mysql.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_mysql.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/backend/ADODB_mysql.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,6 +1,6 @@
<?php // -*-php-*-
-// $Id$
+
require_once('lib/WikiDB/backend/ADODB.php');
/*
@@ -239,4 +239,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Modified: trunk/lib/WikiDB/backend/ADODB_oci8po.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_oci8po.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/backend/ADODB_oci8po.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,6 +1,6 @@
<?php // -*-php-*-
-// $Id$
+
/**
* Oracle extensions for the ADODB DB backend.
* @author: Phi...@to...
@@ -173,4 +173,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Modified: trunk/lib/WikiDB/backend/ADODB_postgres7.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_postgres7.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/backend/ADODB_postgres7.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,6 +1,6 @@
<?php // -*-php-*-
-// $Id$
+
require_once('lib/WikiDB/backend/ADODB.php');
if (!defined("USE_BYTEA")) // see schemas/psql-initialize.sql
@@ -162,4 +162,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Modified: trunk/lib/WikiDB/backend/ADODB_sqlite.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_sqlite.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/backend/ADODB_sqlite.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,6 +1,6 @@
<?php // -*-php-*-
-// $Id$
+
require_once('lib/WikiDB/backend/ADODB.php');
/**
@@ -63,4 +63,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/backend/PDO.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,6 +1,6 @@
<?php // -*-php-*-
-// $Id$
+
/*
* Copyright 2005 $ThePhpWikiProgrammingTeam
*
@@ -1497,4 +1497,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Modified: trunk/lib/WikiDB/backend/PDO_mysql.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO_mysql.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/backend/PDO_mysql.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,6 +1,6 @@
<?php // -*-php-*-
-// $Id$
+
/*
* Copyright 2005 $ThePhpWikiProgrammingTeam
*
@@ -157,4 +157,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Modified: trunk/lib/WikiDB/backend/PDO_oci8.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO_oci8.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/backend/PDO_oci8.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,6 +1,6 @@
<?php // -*-php-*-
-// $Id$
+
/*
* Copyright 2007 $ThePhpWikiProgrammingTeam
*
@@ -94,4 +94,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Modified: trunk/lib/WikiDB/backend/PDO_pgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO_pgsql.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/backend/PDO_pgsql.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,6 +1,6 @@
<?php // -*-php-*-
-// $Id$
+
/*
* Copyright 2005 $ThePhpWikiProgrammingTeam
*
@@ -57,4 +57,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Modified: trunk/lib/WikiDB/backend/PearDB.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/backend/PearDB.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,6 +1,6 @@
<?php // -*-php-*-
-// $Id$
+
require_once('lib/WikiDB/backend.php');
//require_once('lib/FileFinder.php');
//require_once('lib/ErrorManager.php');
@@ -1271,4 +1271,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,6 +1,6 @@
<?php // -*-php-*-
-// $Id$
+
/*
* Copyright (C) 2001-2009 $ThePhpWikiProgrammingTeam
* Copyright (C) 2010 Alain Peyrat, Alcatel-Lucent
@@ -705,4 +705,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Modified: trunk/lib/WikiDB/backend/PearDB_mysql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_mysql.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/backend/PearDB_mysql.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,6 +1,6 @@
<?php // -*-php-*-
-// $Id$
+
require_once('lib/WikiDB/backend/PearDB.php');
// See http://sql-info.de/mysql/gotchas.html for mysql specific quirks.
@@ -232,4 +232,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Modified: trunk/lib/WikiDB/backend/PearDB_oci8.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_oci8.php 2012-09-28 10:08:17 UTC (rev 8285)
+++ trunk/lib/WikiDB/backend/PearDB_oci8.php 2012-09-28 11:20:42 UTC (rev 8286)
@@ -1,6 +1,6 @@
<?php // -*-php-*-
-// $Id$
+
/**
* Oracle extensions for the Pear DB backend.
* @author: Phi...@to...
@@ -126,4 +126,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Modified: trunk/lib/WikiDB/backend/PearDB_pgsql.php
===================================================================
--- trunk/lib/WikiDB/ba...
[truncated message content] |
|
From: <var...@us...> - 2012-09-30 18:02:01
|
Revision: 8331
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8331&view=rev
Author: vargenau
Date: 2012-09-30 18:01:55 +0000 (Sun, 30 Sep 2012)
Log Message:
-----------
Remove svn:keywords
Modified Paths:
--------------
trunk/lib/fpdf/chinese.php
trunk/lib/fpdf/japanese.php
Property Changed:
----------------
trunk/lib/fpdf/chinese.php
trunk/lib/fpdf/courier.php
trunk/lib/fpdf/helvetica.php
trunk/lib/fpdf/helveticab.php
trunk/lib/fpdf/helveticabi.php
trunk/lib/fpdf/helveticai.php
trunk/lib/fpdf/japanese.php
trunk/lib/fpdf/symbol.php
trunk/lib/fpdf/times.php
trunk/lib/fpdf/timesb.php
trunk/lib/fpdf/timesbi.php
trunk/lib/fpdf/timesi.php
trunk/lib/fpdf/zapfdingbats.php
trunk/lib/wikilens/Buddy.php
trunk/lib/wikilens/CustomPrefs.php
trunk/lib/wikilens/PageListColumns.php
trunk/lib/wikilens/RatingsDb.php
trunk/lib/wikilens/RatingsUser.php
trunk/lib/wikilens/Utils.php
Modified: trunk/lib/fpdf/chinese.php
===================================================================
--- trunk/lib/fpdf/chinese.php 2012-09-30 17:13:29 UTC (rev 8330)
+++ trunk/lib/fpdf/chinese.php 2012-09-30 18:01:55 UTC (rev 8331)
@@ -1,5 +1,4 @@
<?php // -*-php-*-
-// $Id$
// PDF functions taken from FPDF http://www.fpdf.org
Property changes on: trunk/lib/fpdf/chinese.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/fpdf/courier.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/fpdf/helvetica.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/fpdf/helveticab.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/fpdf/helveticabi.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/fpdf/helveticai.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/fpdf/japanese.php
===================================================================
--- trunk/lib/fpdf/japanese.php 2012-09-30 17:13:29 UTC (rev 8330)
+++ trunk/lib/fpdf/japanese.php 2012-09-30 18:01:55 UTC (rev 8331)
@@ -1,6 +1,4 @@
-<?php // -*-php-*-
-// $Id$
-
+<?php
// PDF functions taken from FPDF http://www.fpdf.org
require_once 'lib/pdf.php';
Property changes on: trunk/lib/fpdf/japanese.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/fpdf/symbol.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/fpdf/times.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/fpdf/timesb.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/fpdf/timesbi.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/fpdf/timesi.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/fpdf/zapfdingbats.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/wikilens/Buddy.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/wikilens/CustomPrefs.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/wikilens/PageListColumns.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/wikilens/RatingsDb.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/wikilens/RatingsUser.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/wikilens/Utils.php
___________________________________________________________________
Deleted: svn:keywords
- Id
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-09-30 18:28:57
|
Revision: 8333
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8333&view=rev
Author: vargenau
Date: 2012-09-30 18:28:50 +0000 (Sun, 30 Sep 2012)
Log Message:
-----------
Remove $Id$
Modified Paths:
--------------
trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.cfg.php
trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.class.php
trunk/lib/ASCIIMathPHP/ASCIIMathPHP.cfg.php
trunk/lib/ASCIIMathPHP/ASCIIMathPHP.class.php
trunk/lib/pear/Cache.php
trunk/lib/pear/DB.php
trunk/lib/pear/File_Passwd.php
trunk/lib/pear/JSON.php
trunk/lib/pear/PEAR.php
Property Changed:
----------------
trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.cfg.php
trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.class.php
trunk/lib/ASCIIMathPHP/ASCIIMathPHP.cfg.php
trunk/lib/ASCIIMathPHP/ASCIIMathPHP.class.php
trunk/lib/WikiDB/ADODB.php
trunk/lib/WikiDB/PDO.php
trunk/lib/WikiDB/SQL.php
trunk/lib/WikiDB/backend.php
trunk/lib/WikiDB/cvs.php
trunk/lib/WikiDB/dba.php
trunk/lib/WikiDB/file.php
trunk/lib/WikiDB/flatfile.php
trunk/lib/WysiwygEdit/FCKeditor.php
trunk/lib/WysiwygEdit/Wikiwyg.php
trunk/lib/WysiwygEdit/htmlarea2.php
trunk/lib/WysiwygEdit/htmlarea3.php
trunk/lib/WysiwygEdit/spaw.php
trunk/lib/WysiwygEdit/tinymce.php
trunk/lib/XMLRPC/utils.php
trunk/lib/pear/Cache.php
trunk/lib/pear/DB.php
trunk/lib/pear/File_Passwd.php
trunk/lib/pear/JSON.php
trunk/lib/pear/PEAR.php
Modified: trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.cfg.php
===================================================================
--- trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.cfg.php 2012-09-30 18:19:24 UTC (rev 8332)
+++ trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.cfg.php 2012-09-30 18:28:50 UTC (rev 8333)
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
$symbol_arr = array(
Property changes on: trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.cfg.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.class.php
===================================================================
--- trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.class.php 2012-09-30 18:19:24 UTC (rev 8332)
+++ trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.class.php 2012-09-30 18:28:50 UTC (rev 8333)
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
/****
* ASCIIMathPHP and associated classes:
Property changes on: trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.class.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/ASCIIMathPHP/ASCIIMathPHP.cfg.php
===================================================================
--- trunk/lib/ASCIIMathPHP/ASCIIMathPHP.cfg.php 2012-09-30 18:19:24 UTC (rev 8332)
+++ trunk/lib/ASCIIMathPHP/ASCIIMathPHP.cfg.php 2012-09-30 18:28:50 UTC (rev 8333)
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
$symbol_arr = array(
Property changes on: trunk/lib/ASCIIMathPHP/ASCIIMathPHP.cfg.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/ASCIIMathPHP/ASCIIMathPHP.class.php
===================================================================
--- trunk/lib/ASCIIMathPHP/ASCIIMathPHP.class.php 2012-09-30 18:19:24 UTC (rev 8332)
+++ trunk/lib/ASCIIMathPHP/ASCIIMathPHP.class.php 2012-09-30 18:28:50 UTC (rev 8333)
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
/****
* ASCIIMathPHP and associated classes:
Property changes on: trunk/lib/ASCIIMathPHP/ASCIIMathPHP.class.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/WikiDB/ADODB.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/WikiDB/PDO.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/WikiDB/SQL.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/WikiDB/backend.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/WikiDB/cvs.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/WikiDB/dba.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/WikiDB/file.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/WikiDB/flatfile.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/WysiwygEdit/FCKeditor.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/WysiwygEdit/Wikiwyg.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/WysiwygEdit/htmlarea2.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/WysiwygEdit/htmlarea3.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/WysiwygEdit/spaw.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/WysiwygEdit/tinymce.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/XMLRPC/utils.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/pear/Cache.php
===================================================================
--- trunk/lib/pear/Cache.php 2012-09-30 18:19:24 UTC (rev 8332)
+++ trunk/lib/pear/Cache.php 2012-09-30 18:28:50 UTC (rev 8333)
@@ -16,7 +16,6 @@
// | Sebastian Bergmann <sb...@se...> |
// +----------------------------------------------------------------------+
//
-// $Id$
require_once('PEAR.php');
require_once('Cache/Error.php');
@@ -59,7 +58,7 @@
* bad circumstances (especially with the file container)
*
* @author Ulf Wendel <ulf...@ph...>
-* @version $Id$
+* @version
* @package Cache
* @access public
*/
Property changes on: trunk/lib/pear/Cache.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/pear/DB.php
===================================================================
--- trunk/lib/pear/DB.php 2012-09-30 18:19:24 UTC (rev 8332)
+++ trunk/lib/pear/DB.php 2012-09-30 18:28:50 UTC (rev 8333)
@@ -18,8 +18,6 @@
// | Maintainer: Daniel Convissor <da...@ph...> |
// +----------------------------------------------------------------------+
//
-// $Id$
-//
// Database independent query interface.
require_once 'PEAR.php';
@@ -254,7 +252,7 @@
* @author Stig Bakken <ss...@ph...>
* @author Tomas V.V.Cox <co...@id...>
* @since PHP 4.0
- * @version $Id$
+ * @version
* @category Database
*/
class DB
Property changes on: trunk/lib/pear/DB.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/pear/File_Passwd.php
===================================================================
--- trunk/lib/pear/File_Passwd.php 2012-09-30 18:19:24 UTC (rev 8332)
+++ trunk/lib/pear/File_Passwd.php 2012-09-30 18:28:50 UTC (rev 8333)
@@ -16,8 +16,6 @@
// | Author: Rasmus Lerdorf <ra...@ph...> |
// +----------------------------------------------------------------------+
//
-// $Id$
-//
// Manipulate standard UNIX passwd,.htpasswd and CVS pserver passwd files
require_once 'PEAR.php' ;
Property changes on: trunk/lib/pear/File_Passwd.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/pear/JSON.php
===================================================================
--- trunk/lib/pear/JSON.php 2012-09-30 18:19:24 UTC (rev 8332)
+++ trunk/lib/pear/JSON.php 2012-09-30 18:28:50 UTC (rev 8333)
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
/**
@@ -51,7 +51,7 @@
* @author Matt Knapp <mdknapp[at]gmail[dot]com>
* @author Brett Stimmerman <brettstimmerman[at]gmail[dot]com>
* @copyright 2005 Michal Migurski
- * @version CVS: $Id$
+ * @version CVS:
* @license http://www.opensource.org/licenses/bsd-license.php
* @link http://pear.php.net/pepr/pepr-proposal-show.php?id=198
*/
Property changes on: trunk/lib/pear/JSON.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/pear/PEAR.php
===================================================================
--- trunk/lib/pear/PEAR.php 2012-09-30 18:19:24 UTC (rev 8332)
+++ trunk/lib/pear/PEAR.php 2012-09-30 18:28:50 UTC (rev 8333)
@@ -18,7 +18,6 @@
// | Tomas V.V.Cox <co...@id...> |
// +----------------------------------------------------------------------+
//
-// $Id$
// From Pear CVS: Id: PEAR.php,v 1.59 2003/04/03 23:10:10 ssb Exp
//
Property changes on: trunk/lib/pear/PEAR.php
___________________________________________________________________
Deleted: svn:keywords
- Id
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-10-01 12:14:18
|
Revision: 8354
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8354&view=rev
Author: vargenau
Date: 2012-10-01 12:14:07 +0000 (Mon, 01 Oct 2012)
Log Message:
-----------
Whitespace only
Modified Paths:
--------------
trunk/lib/BlockParser.php
trunk/lib/DbSession/ADODB.php
trunk/lib/DbSession/PDO.php
trunk/lib/DbSession/SQL.php
trunk/lib/DbSession/dba.php
trunk/lib/DbaDatabase.php
trunk/lib/DbaListSet.php
trunk/lib/DbaPartition.php
trunk/lib/Google.php
trunk/lib/HtmlElement.php
trunk/lib/HttpClient.php
trunk/lib/diff.php
trunk/lib/editpage.php
Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php 2012-10-01 12:11:57 UTC (rev 8353)
+++ trunk/lib/BlockParser.php 2012-10-01 12:14:07 UTC (rev 8354)
@@ -1,4 +1,4 @@
-<?php
+<?php
/* Copyright (C) 2002 Geoffrey T. Dairiki <da...@da...>
* Copyright (C) 2004,2005 Reini Urban
* Copyright (C) 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/lib/DbSession/ADODB.php
===================================================================
--- trunk/lib/DbSession/ADODB.php 2012-10-01 12:11:57 UTC (rev 8353)
+++ trunk/lib/DbSession/ADODB.php 2012-10-01 12:14:07 UTC (rev 8354)
@@ -1,4 +1,4 @@
-<?php
+<?php
/*
* Copyright 2005 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/DbSession/PDO.php
===================================================================
--- trunk/lib/DbSession/PDO.php 2012-10-01 12:11:57 UTC (rev 8353)
+++ trunk/lib/DbSession/PDO.php 2012-10-01 12:14:07 UTC (rev 8354)
@@ -1,4 +1,4 @@
-<?php
+<?php
/**
* Db sessions for PDO, based on pear DB Sessions.
Modified: trunk/lib/DbSession/SQL.php
===================================================================
--- trunk/lib/DbSession/SQL.php 2012-10-01 12:11:57 UTC (rev 8353)
+++ trunk/lib/DbSession/SQL.php 2012-10-01 12:14:07 UTC (rev 8354)
@@ -1,4 +1,4 @@
-<?php
+<?php
/**
* DB sessions for pear DB
Modified: trunk/lib/DbSession/dba.php
===================================================================
--- trunk/lib/DbSession/dba.php 2012-10-01 12:11:57 UTC (rev 8353)
+++ trunk/lib/DbSession/dba.php 2012-10-01 12:14:07 UTC (rev 8354)
@@ -1,4 +1,4 @@
-<?php
+<?php
/** DBA Sessions
* session:
Modified: trunk/lib/DbaDatabase.php
===================================================================
--- trunk/lib/DbaDatabase.php 2012-10-01 12:11:57 UTC (rev 8353)
+++ trunk/lib/DbaDatabase.php 2012-10-01 12:14:07 UTC (rev 8354)
@@ -1,4 +1,4 @@
-<?php
+<?php
require_once 'lib/ErrorManager.php';
Modified: trunk/lib/DbaListSet.php
===================================================================
--- trunk/lib/DbaListSet.php 2012-10-01 12:11:57 UTC (rev 8353)
+++ trunk/lib/DbaListSet.php 2012-10-01 12:14:07 UTC (rev 8354)
@@ -1,4 +1,4 @@
-<?php
+<?php
class DbaListSet
{
Modified: trunk/lib/DbaPartition.php
===================================================================
--- trunk/lib/DbaPartition.php 2012-10-01 12:11:57 UTC (rev 8353)
+++ trunk/lib/DbaPartition.php 2012-10-01 12:14:07 UTC (rev 8354)
@@ -1,4 +1,4 @@
-<?php
+<?php
class DbaPartition
{
Modified: trunk/lib/Google.php
===================================================================
--- trunk/lib/Google.php 2012-10-01 12:11:57 UTC (rev 8353)
+++ trunk/lib/Google.php 2012-10-01 12:14:07 UTC (rev 8354)
@@ -1,4 +1,4 @@
-<?php // -*- php -*-
+<?php
/**
* Google API
*
Modified: trunk/lib/HtmlElement.php
===================================================================
--- trunk/lib/HtmlElement.php 2012-10-01 12:11:57 UTC (rev 8353)
+++ trunk/lib/HtmlElement.php 2012-10-01 12:14:07 UTC (rev 8354)
@@ -1,4 +1,4 @@
-<?php
+<?php
/**
* Code for writing the HTML subset of XML.
* @author: Jeff Dairiki
Modified: trunk/lib/HttpClient.php
===================================================================
--- trunk/lib/HttpClient.php 2012-10-01 12:11:57 UTC (rev 8353)
+++ trunk/lib/HttpClient.php 2012-10-01 12:14:07 UTC (rev 8354)
@@ -1,6 +1,5 @@
-<?php // -*-php-*-
+<?php
-
/**
Version 0.9, 6th April 2003 - Simon Willison ( http://simon.incutio.com/ )
Manual: http://scripts.incutio.com/httpclient/
Modified: trunk/lib/diff.php
===================================================================
--- trunk/lib/diff.php 2012-10-01 12:11:57 UTC (rev 8353)
+++ trunk/lib/diff.php 2012-10-01 12:14:07 UTC (rev 8354)
@@ -1,4 +1,4 @@
-<?php // -*-php-*-
+<?php
// diff.php
//
Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php 2012-10-01 12:11:57 UTC (rev 8353)
+++ trunk/lib/editpage.php 2012-10-01 12:14:07 UTC (rev 8354)
@@ -1,6 +1,4 @@
<?php
-
-
require_once 'lib/Template.php';
class PageEditor
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-10-01 14:25:51
|
Revision: 8356
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8356&view=rev
Author: vargenau
Date: 2012-10-01 14:25:41 +0000 (Mon, 01 Oct 2012)
Log Message:
-----------
Whitespace only
Modified Paths:
--------------
trunk/lib/DbSession.php
trunk/lib/WikiUser/AdoDb.php
trunk/lib/WikiUser/BogoLogin.php
trunk/lib/WikiUser/Db.php
trunk/lib/WikiUser/EMailConfirm.php
trunk/lib/WikiUser/Facebook.php
trunk/lib/WikiUser/File.php
trunk/lib/WikiUser/Forbidden.php
trunk/lib/WikiUser/FusionForge.php
trunk/lib/WikiUser/HttpAuth.php
trunk/lib/WikiUser/HttpAuthUpper.php
trunk/lib/WikiUser/IMAP.php
trunk/lib/WikiUser/LDAP.php
trunk/lib/WikiUser/LdapUpper.php
trunk/lib/WikiUser/OpenID.php
trunk/lib/WikiUser/POP3.php
trunk/lib/WikiUser/PdoDb.php
trunk/lib/WikiUser/PearDb.php
trunk/lib/WikiUser/PersonalPage.php
trunk/lib/WikiUser/Session.php
trunk/lib/imagecache.php
trunk/lib/imdb.php
Modified: trunk/lib/DbSession.php
===================================================================
--- trunk/lib/DbSession.php 2012-10-01 12:50:37 UTC (rev 8355)
+++ trunk/lib/DbSession.php 2012-10-01 14:25:41 UTC (rev 8356)
@@ -1,4 +1,4 @@
-<?php
+<?php
/**
* Store sessions data in Pear DB / ADODB / dba / PDO, ....
Modified: trunk/lib/WikiUser/AdoDb.php
===================================================================
--- trunk/lib/WikiUser/AdoDb.php 2012-10-01 12:50:37 UTC (rev 8355)
+++ trunk/lib/WikiUser/AdoDb.php 2012-10-01 14:25:41 UTC (rev 8356)
@@ -1,4 +1,4 @@
-<?php //-*-php-*-
+<?php
/*
* Copyright (C) 2004 ReiniUrban
Modified: trunk/lib/WikiUser/BogoLogin.php
===================================================================
--- trunk/lib/WikiUser/BogoLogin.php 2012-10-01 12:50:37 UTC (rev 8355)
+++ trunk/lib/WikiUser/BogoLogin.php 2012-10-01 14:25:41 UTC (rev 8356)
@@ -1,4 +1,4 @@
-<?php //-*-php-*-
+<?php
/*
* Copyright (C) 2004 ReiniUrban
Modified: trunk/lib/WikiUser/Db.php
===================================================================
--- trunk/lib/WikiUser/Db.php 2012-10-01 12:50:37 UTC (rev 8355)
+++ trunk/lib/WikiUser/Db.php 2012-10-01 14:25:41 UTC (rev 8356)
@@ -1,4 +1,4 @@
-<?php //-*-php-*-
+<?php
/*
* Copyright (C) 2004 ReiniUrban
Modified: trunk/lib/WikiUser/EMailConfirm.php
===================================================================
--- trunk/lib/WikiUser/EMailConfirm.php 2012-10-01 12:50:37 UTC (rev 8355)
+++ trunk/lib/WikiUser/EMailConfirm.php 2012-10-01 14:25:41 UTC (rev 8356)
@@ -1,4 +1,4 @@
-<?php //-*-php-*-
+<?php
/*
* Copyright (C) 2006 ReiniUrban
Modified: trunk/lib/WikiUser/Facebook.php
===================================================================
--- trunk/lib/WikiUser/Facebook.php 2012-10-01 12:50:37 UTC (rev 8355)
+++ trunk/lib/WikiUser/Facebook.php 2012-10-01 14:25:41 UTC (rev 8356)
@@ -1,4 +1,4 @@
-<?php //-*-php-*-
+<?php
/*
* Copyright (C) 2009 Reini Urban
Modified: trunk/lib/WikiUser/File.php
===================================================================
--- trunk/lib/WikiUser/File.php 2012-10-01 12:50:37 UTC (rev 8355)
+++ trunk/lib/WikiUser/File.php 2012-10-01 14:25:41 UTC (rev 8356)
@@ -1,4 +1,4 @@
-<?php //-*-php-*-
+<?php
/*
* Copyright (C) 2004 ReiniUrban
Modified: trunk/lib/WikiUser/Forbidden.php
===================================================================
--- trunk/lib/WikiUser/Forbidden.php 2012-10-01 12:50:37 UTC (rev 8355)
+++ trunk/lib/WikiUser/Forbidden.php 2012-10-01 14:25:41 UTC (rev 8356)
@@ -1,4 +1,4 @@
-<?php //-*-php-*-
+<?php
/*
* Copyright (C) 2004 ReiniUrban
Modified: trunk/lib/WikiUser/FusionForge.php
===================================================================
--- trunk/lib/WikiUser/FusionForge.php 2012-10-01 12:50:37 UTC (rev 8355)
+++ trunk/lib/WikiUser/FusionForge.php 2012-10-01 14:25:41 UTC (rev 8356)
@@ -1,4 +1,4 @@
-<?php //-*-php-*-
+<?php
/*
* Copyright (C) 2006 Alain Peyrat
Modified: trunk/lib/WikiUser/HttpAuth.php
===================================================================
--- trunk/lib/WikiUser/HttpAuth.php 2012-10-01 12:50:37 UTC (rev 8355)
+++ trunk/lib/WikiUser/HttpAuth.php 2012-10-01 14:25:41 UTC (rev 8356)
@@ -1,4 +1,4 @@
-<?php //-*-php-*-
+<?php
/*
* Copyright (C) 2004 ReiniUrban
Modified: trunk/lib/WikiUser/HttpAuthUpper.php
===================================================================
--- trunk/lib/WikiUser/HttpAuthUpper.php 2012-10-01 12:50:37 UTC (rev 8355)
+++ trunk/lib/WikiUser/HttpAuthUpper.php 2012-10-01 14:25:41 UTC (rev 8356)
@@ -1,4 +1,4 @@
-<?php //-*-php-*-
+<?php
/*
* Copyright (C) 2004,2007 ReiniUrban
Modified: trunk/lib/WikiUser/IMAP.php
===================================================================
--- trunk/lib/WikiUser/IMAP.php 2012-10-01 12:50:37 UTC (rev 8355)
+++ trunk/lib/WikiUser/IMAP.php 2012-10-01 14:25:41 UTC (rev 8356)
@@ -1,4 +1,4 @@
-<?php //-*-php-*-
+<?php
/*
* Copyright (C) 2004 $ThePhpWikiProgrammingTeam
Modified: trunk/lib/WikiUser/LDAP.php
===================================================================
--- trunk/lib/WikiUser/LDAP.php 2012-10-01 12:50:37 UTC (rev 8355)
+++ trunk/lib/WikiUser/LDAP.php 2012-10-01 14:25:41 UTC (rev 8356)
@@ -1,4 +1,4 @@
-<?php //-*-php-*-
+<?php
/*
* Copyright (C) 2004,2007 $ThePhpWikiProgrammingTeam
Modified: trunk/lib/WikiUser/LdapUpper.php
===================================================================
--- trunk/lib/WikiUser/LdapUpper.php 2012-10-01 12:50:37 UTC (rev 8355)
+++ trunk/lib/WikiUser/LdapUpper.php 2012-10-01 14:25:41 UTC (rev 8356)
@@ -1,4 +1,4 @@
-<?php //-*-php-*-
+<?php
/*
* Copyright (C) 2007,2009 Reini Urban
Modified: trunk/lib/WikiUser/OpenID.php
===================================================================
--- trunk/lib/WikiUser/OpenID.php 2012-10-01 12:50:37 UTC (rev 8355)
+++ trunk/lib/WikiUser/OpenID.php 2012-10-01 14:25:41 UTC (rev 8356)
@@ -1,4 +1,4 @@
-<?php //-*-php-*-
+<?php
/*
* Copyright (C) 2010 ReiniUrban
Modified: trunk/lib/WikiUser/POP3.php
===================================================================
--- trunk/lib/WikiUser/POP3.php 2012-10-01 12:50:37 UTC (rev 8355)
+++ trunk/lib/WikiUser/POP3.php 2012-10-01 14:25:41 UTC (rev 8356)
@@ -1,4 +1,4 @@
-<?php //-*-php-*-
+<?php
/*
* Copyright (C) 2004 $ThePhpWikiProgrammingTeam
Modified: trunk/lib/WikiUser/PdoDb.php
===================================================================
--- trunk/lib/WikiUser/PdoDb.php 2012-10-01 12:50:37 UTC (rev 8355)
+++ trunk/lib/WikiUser/PdoDb.php 2012-10-01 14:25:41 UTC (rev 8356)
@@ -1,4 +1,4 @@
-<?php //-*-php-*-
+<?php
/*
* Copyright (C) 2004, 2005 ReiniUrban
Modified: trunk/lib/WikiUser/PearDb.php
===================================================================
--- trunk/lib/WikiUser/PearDb.php 2012-10-01 12:50:37 UTC (rev 8355)
+++ trunk/lib/WikiUser/PearDb.php 2012-10-01 14:25:41 UTC (rev 8356)
@@ -1,4 +1,4 @@
-<?php //-*-php-*-
+<?php
/*
* Copyright (C) 2004 ReiniUrban
Modified: trunk/lib/WikiUser/PersonalPage.php
===================================================================
--- trunk/lib/WikiUser/PersonalPage.php 2012-10-01 12:50:37 UTC (rev 8355)
+++ trunk/lib/WikiUser/PersonalPage.php 2012-10-01 14:25:41 UTC (rev 8356)
@@ -1,4 +1,4 @@
-<?php //-*-php-*-
+<?php
/*
* Copyright (C) 2004 ReiniUrban
Modified: trunk/lib/WikiUser/Session.php
===================================================================
--- trunk/lib/WikiUser/Session.php 2012-10-01 12:50:37 UTC (rev 8355)
+++ trunk/lib/WikiUser/Session.php 2012-10-01 14:25:41 UTC (rev 8356)
@@ -1,4 +1,4 @@
-<?php //-*-php-*-
+<?php
/*
* Copyright (C) 2004 ReiniUrban
Modified: trunk/lib/imagecache.php
===================================================================
--- trunk/lib/imagecache.php 2012-10-01 12:50:37 UTC (rev 8355)
+++ trunk/lib/imagecache.php 2012-10-01 14:25:41 UTC (rev 8356)
@@ -1,4 +1,4 @@
-<?php
+<?php
/*
* Copyright (C) 2002 Johannes Große
*
Modified: trunk/lib/imdb.php
===================================================================
--- trunk/lib/imdb.php 2012-10-01 12:50:37 UTC (rev 8355)
+++ trunk/lib/imdb.php 2012-10-01 14:25:41 UTC (rev 8356)
@@ -1,4 +1,4 @@
-<?php
+<?php
/**
* Copyright 2004 Reini Urban
*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-10-01 15:01:41
|
Revision: 8361
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8361&view=rev
Author: vargenau
Date: 2012-10-01 15:01:30 +0000 (Mon, 01 Oct 2012)
Log Message:
-----------
Whitespace only
Modified Paths:
--------------
trunk/lib/ErrorManager.php
trunk/lib/FileFinder.php
trunk/lib/HtmlParser.php
trunk/lib/install.php
trunk/lib/main.php
trunk/lib/pdf.php
Modified: trunk/lib/ErrorManager.php
===================================================================
--- trunk/lib/ErrorManager.php 2012-10-01 14:59:57 UTC (rev 8360)
+++ trunk/lib/ErrorManager.php 2012-10-01 15:01:30 UTC (rev 8361)
@@ -1,4 +1,4 @@
-<?php
+<?php
if (isset($GLOBALS['ErrorManager'])) return;
Modified: trunk/lib/FileFinder.php
===================================================================
--- trunk/lib/FileFinder.php 2012-10-01 14:59:57 UTC (rev 8360)
+++ trunk/lib/FileFinder.php 2012-10-01 15:01:30 UTC (rev 8361)
@@ -1,4 +1,4 @@
-<?php
+<?php
require_once(dirname(__FILE__).'/stdlib.php');
Modified: trunk/lib/HtmlParser.php
===================================================================
--- trunk/lib/HtmlParser.php 2012-10-01 14:59:57 UTC (rev 8360)
+++ trunk/lib/HtmlParser.php 2012-10-01 15:01:30 UTC (rev 8361)
@@ -1,4 +1,4 @@
-<?php // -*-php-*-
+<?php
/**
* HtmlParser Class: Conversion HTML => wikimarkup
Modified: trunk/lib/install.php
===================================================================
--- trunk/lib/install.php 2012-10-01 14:59:57 UTC (rev 8360)
+++ trunk/lib/install.php 2012-10-01 15:01:30 UTC (rev 8361)
@@ -1,6 +1,5 @@
-<?php //-*-php-*-
+<?php
-
/*
* Copyright 2004 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php 2012-10-01 14:59:57 UTC (rev 8360)
+++ trunk/lib/main.php 2012-10-01 15:01:30 UTC (rev 8361)
@@ -1,4 +1,4 @@
-<?php //-*-php-*-
+<?php
/*
* Copyright 1999-2008 $ThePhpWikiProgrammingTeam
Modified: trunk/lib/pdf.php
===================================================================
--- trunk/lib/pdf.php 2012-10-01 14:59:57 UTC (rev 8360)
+++ trunk/lib/pdf.php 2012-10-01 15:01:30 UTC (rev 8361)
@@ -1,4 +1,4 @@
-<?php // -*-php-*-
+<?php
/*
* Copyright (C) 2003 Olivier PLATHEY
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-10-02 09:03:30
|
Revision: 8368
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8368&view=rev
Author: vargenau
Date: 2012-10-02 09:03:19 +0000 (Tue, 02 Oct 2012)
Log Message:
-----------
Whitespace only
Modified Paths:
--------------
trunk/lib/HtmlElement5.php
trunk/lib/PagePerm.php
trunk/lib/PageType.php
trunk/lib/Request.php
trunk/lib/RssParser.php
trunk/lib/RssWriter.php
trunk/lib/RssWriter2.php
trunk/lib/SemanticWeb.php
trunk/lib/Template.php
trunk/lib/TextSearchQuery.php
trunk/lib/Units.php
trunk/lib/WikiCallback.php
trunk/lib/WikiPlugin.php
trunk/lib/WikiPluginCached.php
trunk/lib/WikiTheme.php
trunk/lib/WikiUser.php
trunk/lib/WikiUserNew.php
trunk/lib/XmlElement.php
trunk/lib/XmlParser.php
trunk/lib/XmlRpcClient.php
trunk/lib/plugin/RateIt.php
trunk/lib/plugin/WantedPages.php
trunk/lib/plugin/WantedPagesOld.php
trunk/lib/stdlib.php
trunk/lib/upgrade.php
trunk/lib/ziplib.php
Modified: trunk/lib/HtmlElement5.php
===================================================================
--- trunk/lib/HtmlElement5.php 2012-10-02 08:59:57 UTC (rev 8367)
+++ trunk/lib/HtmlElement5.php 2012-10-02 09:03:19 UTC (rev 8368)
@@ -1,4 +1,4 @@
-<?php
+<?php
/**
* Code for writing the HTML subset of XML.
* @author: Jeff Dairiki
Modified: trunk/lib/PagePerm.php
===================================================================
--- trunk/lib/PagePerm.php 2012-10-02 08:59:57 UTC (rev 8367)
+++ trunk/lib/PagePerm.php 2012-10-02 09:03:19 UTC (rev 8368)
@@ -1,4 +1,4 @@
-<?php // -*-php-*-
+<?php
/*
* Copyright 2004,2007 $ThePhpWikiProgrammingTeam
Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php 2012-10-02 08:59:57 UTC (rev 8367)
+++ trunk/lib/PageType.php 2012-10-02 09:03:19 UTC (rev 8368)
@@ -1,4 +1,4 @@
-<?php // -*-php-*-
+<?php
/*
* Copyright 1999,2000,2001,2002,2003,2004,2005,2006 $ThePhpWikiProgrammingTeam
Modified: trunk/lib/Request.php
===================================================================
--- trunk/lib/Request.php 2012-10-02 08:59:57 UTC (rev 8367)
+++ trunk/lib/Request.php 2012-10-02 09:03:19 UTC (rev 8368)
@@ -1,4 +1,4 @@
-<?php // -*-php-*-
+<?php
/*
* Copyright (C) 2002,2004,2005,2006,2009 $ThePhpWikiProgrammingTeam
Modified: trunk/lib/RssParser.php
===================================================================
--- trunk/lib/RssParser.php 2012-10-02 08:59:57 UTC (rev 8367)
+++ trunk/lib/RssParser.php 2012-10-02 09:03:19 UTC (rev 8368)
@@ -1,4 +1,4 @@
-<?php // -*-php-*-
+<?php
/**
* Simple RSSParser Class
Modified: trunk/lib/RssWriter.php
===================================================================
--- trunk/lib/RssWriter.php 2012-10-02 08:59:57 UTC (rev 8367)
+++ trunk/lib/RssWriter.php 2012-10-02 09:03:19 UTC (rev 8368)
@@ -1,4 +1,4 @@
-<?php
+<?php
/*
* Code for creating RSS 1.0.
*/
Modified: trunk/lib/RssWriter2.php
===================================================================
--- trunk/lib/RssWriter2.php 2012-10-02 08:59:57 UTC (rev 8367)
+++ trunk/lib/RssWriter2.php 2012-10-02 09:03:19 UTC (rev 8368)
@@ -1,4 +1,4 @@
-<?php
+<?php
/*
* Code for creating RSS 2.0
* Author: Reini Urban for PhpWiki
Modified: trunk/lib/SemanticWeb.php
===================================================================
--- trunk/lib/SemanticWeb.php 2012-10-02 08:59:57 UTC (rev 8367)
+++ trunk/lib/SemanticWeb.php 2012-10-02 09:03:19 UTC (rev 8368)
@@ -1,4 +1,4 @@
-<?php
+<?php
/**
* What to do on ?format=rdf What to do on ?format=owl
*
Modified: trunk/lib/Template.php
===================================================================
--- trunk/lib/Template.php 2012-10-02 08:59:57 UTC (rev 8367)
+++ trunk/lib/Template.php 2012-10-02 09:03:19 UTC (rev 8368)
@@ -1,6 +1,5 @@
-<?php //-*-php-*-
+<?php
-
require_once 'lib/ErrorManager.php';
/** An HTML template.
Modified: trunk/lib/TextSearchQuery.php
===================================================================
--- trunk/lib/TextSearchQuery.php 2012-10-02 08:59:57 UTC (rev 8367)
+++ trunk/lib/TextSearchQuery.php 2012-10-02 09:03:19 UTC (rev 8368)
@@ -1,4 +1,4 @@
-<?php
+<?php
/**
* A text search query, converting queries to PCRE and SQL matchers.
*
Modified: trunk/lib/Units.php
===================================================================
--- trunk/lib/Units.php 2012-10-02 08:59:57 UTC (rev 8367)
+++ trunk/lib/Units.php 2012-10-02 09:03:19 UTC (rev 8368)
@@ -1,4 +1,4 @@
-<?php
+<?php
/**
*
* Interface to man units(1), /usr/share/units.dat
Modified: trunk/lib/WikiCallback.php
===================================================================
--- trunk/lib/WikiCallback.php 2012-10-02 08:59:57 UTC (rev 8367)
+++ trunk/lib/WikiCallback.php 2012-10-02 09:03:19 UTC (rev 8368)
@@ -1,4 +1,4 @@
-<?php //-*-php-*-
+<?php
/**
Modified: trunk/lib/WikiPlugin.php
===================================================================
--- trunk/lib/WikiPlugin.php 2012-10-02 08:59:57 UTC (rev 8367)
+++ trunk/lib/WikiPlugin.php 2012-10-02 09:03:19 UTC (rev 8368)
@@ -1,4 +1,4 @@
-<?php //-*-php-*-
+<?php
class WikiPlugin
Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php 2012-10-02 08:59:57 UTC (rev 8367)
+++ trunk/lib/WikiPluginCached.php 2012-10-02 09:03:19 UTC (rev 8368)
@@ -1,4 +1,4 @@
-<?php
+<?php
/*
* Copyright (C) 2002 Johannes Große
* Copyright (C) 2004,2007 Reini Urban
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php 2012-10-02 08:59:57 UTC (rev 8367)
+++ trunk/lib/WikiTheme.php 2012-10-02 09:03:19 UTC (rev 8368)
@@ -1,4 +1,4 @@
-<?php
+<?php
/* Copyright (C) 2002,2004,2005,2006,2008,2009,2010 $ThePhpWikiProgrammingTeam
*
* This file is part of PhpWiki.
Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php 2012-10-02 08:59:57 UTC (rev 8367)
+++ trunk/lib/WikiUser.php 2012-10-02 09:03:19 UTC (rev 8368)
@@ -1,4 +1,4 @@
-<?php //-*-php-*-
+<?php
// It is anticipated that when userid support is added to phpwiki,
Modified: trunk/lib/WikiUserNew.php
===================================================================
--- trunk/lib/WikiUserNew.php 2012-10-02 08:59:57 UTC (rev 8367)
+++ trunk/lib/WikiUserNew.php 2012-10-02 09:03:19 UTC (rev 8368)
@@ -1,4 +1,4 @@
-<?php //-*-php-*-
+<?php
/* Copyright (C) 2004,2005,2006,2007,2009,2010 $ThePhpWikiProgrammingTeam
* Copyright (C) 2009-2010 Marc-Etienne Vargenau, Alcatel-Lucent
* Copyright (C) 2009-2010 Roger Guignard, Alcatel-Lucent
Modified: trunk/lib/XmlElement.php
===================================================================
--- trunk/lib/XmlElement.php 2012-10-02 08:59:57 UTC (rev 8367)
+++ trunk/lib/XmlElement.php 2012-10-02 09:03:19 UTC (rev 8368)
@@ -1,4 +1,4 @@
-<?php
+<?php
/**
* Code for writing XML.
* @package Markup
Modified: trunk/lib/XmlParser.php
===================================================================
--- trunk/lib/XmlParser.php 2012-10-02 08:59:57 UTC (rev 8367)
+++ trunk/lib/XmlParser.php 2012-10-02 09:03:19 UTC (rev 8368)
@@ -1,4 +1,4 @@
-<?php // -*-php-*-
+<?php
/**
* Base XmlParser Class.
Modified: trunk/lib/XmlRpcClient.php
===================================================================
--- trunk/lib/XmlRpcClient.php 2012-10-02 08:59:57 UTC (rev 8367)
+++ trunk/lib/XmlRpcClient.php 2012-10-02 09:03:19 UTC (rev 8368)
@@ -1,4 +1,4 @@
-<?php // -*- php -*-
+<?php
/* Copyright (C) 2002, Lawrence Akka <la...@us...>
* Copyright (C) 2004,2005,2006 $ThePhpWikiProgrammingTeam
Modified: trunk/lib/plugin/RateIt.php
===================================================================
--- trunk/lib/plugin/RateIt.php 2012-10-02 08:59:57 UTC (rev 8367)
+++ trunk/lib/plugin/RateIt.php 2012-10-02 09:03:19 UTC (rev 8368)
@@ -1,4 +1,4 @@
-<?php // -*-php-*-
+<?php
/*
* Copyright 2004,2007,2009 $ThePhpWikiProgrammingTeam
Modified: trunk/lib/plugin/WantedPages.php
===================================================================
--- trunk/lib/plugin/WantedPages.php 2012-10-02 08:59:57 UTC (rev 8367)
+++ trunk/lib/plugin/WantedPages.php 2012-10-02 09:03:19 UTC (rev 8368)
@@ -1,4 +1,4 @@
-<?php // -*-php-*-
+<?php
/*
* Copyright (C) 2002, 2004 $ThePhpWikiProgrammingTeam
Modified: trunk/lib/plugin/WantedPagesOld.php
===================================================================
--- trunk/lib/plugin/WantedPagesOld.php 2012-10-02 08:59:57 UTC (rev 8367)
+++ trunk/lib/plugin/WantedPagesOld.php 2012-10-02 09:03:19 UTC (rev 8368)
@@ -1,4 +1,4 @@
-<?php // -*-php-*-
+<?php
/*
* This file is part of PhpWiki.
Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php 2012-10-02 08:59:57 UTC (rev 8367)
+++ trunk/lib/stdlib.php 2012-10-02 09:03:19 UTC (rev 8368)
@@ -1,4 +1,4 @@
-<?php
+<?php
/*
* Copyright 1999-2008 $ThePhpWikiProgrammingTeam
* Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php 2012-10-02 08:59:57 UTC (rev 8367)
+++ trunk/lib/upgrade.php 2012-10-02 09:03:19 UTC (rev 8368)
@@ -1,4 +1,4 @@
-<?php //-*-php-*-
+<?php
/*
* Copyright 2004,2005,2006,2007 $ThePhpWikiProgrammingTeam
Modified: trunk/lib/ziplib.php
===================================================================
--- trunk/lib/ziplib.php 2012-10-02 08:59:57 UTC (rev 8367)
+++ trunk/lib/ziplib.php 2012-10-02 09:03:19 UTC (rev 8368)
@@ -1,4 +1,4 @@
-<?php
+<?php
/**
* GZIP stuff.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-10-02 09:21:27
|
Revision: 8371
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8371&view=rev
Author: vargenau
Date: 2012-10-02 09:21:20 +0000 (Tue, 02 Oct 2012)
Log Message:
-----------
trailing_spaces [PSR-2] Remove trailing whitespace at the end of lines.
Modified Paths:
--------------
trunk/lib/WikiDB/SQL.php
trunk/lib/WikiDB/backend/dba.php
trunk/lib/WikiDB/dba.php
trunk/lib/pear/Cache/Container/db.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/Graphics.php
trunk/lib/pear/Cache.php
trunk/lib/pear/DB/common.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/msql.php
trunk/lib/pear/DB/mssql.php
trunk/lib/pear/DB/mysql.php
trunk/lib/pear/DB/mysqli.php
trunk/lib/pear/DB/oci8.php
trunk/lib/pear/DB/sqlite.php
trunk/lib/pear/DB.php
Modified: trunk/lib/WikiDB/SQL.php
===================================================================
--- trunk/lib/WikiDB/SQL.php 2012-10-02 09:05:34 UTC (rev 8370)
+++ trunk/lib/WikiDB/SQL.php 2012-10-02 09:21:20 UTC (rev 8371)
@@ -1,4 +1,4 @@
-<?php
+<?php
require_once 'lib/WikiDB.php';
//require_once('lib/WikiDB/backend/PearDB.php');
Modified: trunk/lib/WikiDB/backend/dba.php
===================================================================
--- trunk/lib/WikiDB/backend/dba.php 2012-10-02 09:05:34 UTC (rev 8370)
+++ trunk/lib/WikiDB/backend/dba.php 2012-10-02 09:21:20 UTC (rev 8371)
@@ -1,4 +1,4 @@
-<?php
+<?php
require_once 'lib/WikiDB/backend/dbaBase.php';
require_once 'lib/DbaDatabase.php';
Modified: trunk/lib/WikiDB/dba.php
===================================================================
--- trunk/lib/WikiDB/dba.php 2012-10-02 09:05:34 UTC (rev 8370)
+++ trunk/lib/WikiDB/dba.php 2012-10-02 09:21:20 UTC (rev 8371)
@@ -1,4 +1,4 @@
-<?php
+<?php
require_once 'lib/WikiDB.php';
require_once 'lib/WikiDB/backend/dba.php';
Modified: trunk/lib/pear/Cache/Container/db.php
===================================================================
--- trunk/lib/pear/Cache/Container/db.php 2012-10-02 09:05:34 UTC (rev 8370)
+++ trunk/lib/pear/Cache/Container/db.php 2012-10-02 09:21:20 UTC (rev 8371)
@@ -50,7 +50,7 @@
* )
*
* @author Sebastian Bergmann <sb...@se...>
-* @version
+* @version
* @package Cache
*/
class Cache_Container_db extends Cache_Container {
Modified: trunk/lib/pear/Cache/Container/file.php
===================================================================
--- trunk/lib/pear/Cache/Container/file.php 2012-10-02 09:05:34 UTC (rev 8370)
+++ trunk/lib/pear/Cache/Container/file.php 2012-10-02 09:21:20 UTC (rev 8371)
@@ -22,7 +22,7 @@
* Stores cache contents in a file.
*
* @author Ulf Wendel <ulf...@ph...>
-* @version
+* @version
*/
class Cache_Container_file extends Cache_Container {
Modified: trunk/lib/pear/Cache/Container/imgfile.php
===================================================================
--- trunk/lib/pear/Cache/Container/imgfile.php 2012-10-02 09:05:34 UTC (rev 8370)
+++ trunk/lib/pear/Cache/Container/imgfile.php 2012-10-02 09:21:20 UTC (rev 8371)
@@ -22,7 +22,7 @@
* Stores cache contents in a file.
*
* @author Ulf Wendel <ulf...@ph...>
-* @version
+* @version
*/
class Cache_Container_file extends Cache_Container {
Modified: trunk/lib/pear/Cache/Container.php
===================================================================
--- trunk/lib/pear/Cache/Container.php 2012-10-02 09:05:34 UTC (rev 8370)
+++ trunk/lib/pear/Cache/Container.php 2012-10-02 09:21:20 UTC (rev 8371)
@@ -37,7 +37,7 @@
* not recommended!
*
* @author Ulf Wendel <ulf...@ph...>
-* @version
+* @version
* @package Cache
* @access public
* @abstract
Modified: trunk/lib/pear/Cache/Graphics.php
===================================================================
--- trunk/lib/pear/Cache/Graphics.php 2012-10-02 09:05:34 UTC (rev 8370)
+++ trunk/lib/pear/Cache/Graphics.php 2012-10-02 09:21:20 UTC (rev 8371)
@@ -64,7 +64,7 @@
* the output buffer. Modify it if required!
*
* @author Ulf Wendel <ulf...@ph...>
-* @version
+* @version
* @package Cache
*/
class Cache_Graphics extends Cache {
Modified: trunk/lib/pear/Cache.php
===================================================================
--- trunk/lib/pear/Cache.php 2012-10-02 09:05:34 UTC (rev 8370)
+++ trunk/lib/pear/Cache.php 2012-10-02 09:21:20 UTC (rev 8371)
@@ -58,7 +58,7 @@
* bad circumstances (especially with the file container)
*
* @author Ulf Wendel <ulf...@ph...>
-* @version
+* @version
* @package Cache
* @access public
*/
Modified: trunk/lib/pear/DB/common.php
===================================================================
--- trunk/lib/pear/DB/common.php 2012-10-02 09:05:34 UTC (rev 8370)
+++ trunk/lib/pear/DB/common.php 2012-10-02 09:21:20 UTC (rev 8371)
@@ -25,7 +25,7 @@
* inherited by all such
*
* @package DB
- * @version
+ * @version
* @category Database
* @author Stig Bakken <ss...@ph...>
* @author Tomas V.V.Cox <co...@id...>
Modified: trunk/lib/pear/DB/dbase.php
===================================================================
--- trunk/lib/pear/DB/dbase.php 2012-10-02 09:05:34 UTC (rev 8370)
+++ trunk/lib/pear/DB/dbase.php 2012-10-02 09:21:20 UTC (rev 8371)
@@ -27,7 +27,7 @@
* extension.
*
* @package DB
- * @version
+ * @version
* @category Database
* @author Stig Bakken <ss...@ph...>
*/
Modified: trunk/lib/pear/DB/fbsql.php
===================================================================
--- trunk/lib/pear/DB/fbsql.php 2012-10-02 09:05:34 UTC (rev 8370)
+++ trunk/lib/pear/DB/fbsql.php 2012-10-02 09:21:20 UTC (rev 8371)
@@ -33,7 +33,7 @@
* extension.
*
* @package DB
- * @version
+ * @version
* @category Database
* @author Frank M. Kromann <fr...@fr...>
*/
Modified: trunk/lib/pear/DB/ibase.php
===================================================================
--- trunk/lib/pear/DB/ibase.php 2012-10-02 09:05:34 UTC (rev 8370)
+++ trunk/lib/pear/DB/ibase.php 2012-10-02 09:21:20 UTC (rev 8371)
@@ -27,7 +27,7 @@
* extension.
*
* @package DB
- * @version
+ * @version
* @category Database
* @author Sterling Hughes <ste...@ph...>
*/
Modified: trunk/lib/pear/DB/ifx.php
===================================================================
--- trunk/lib/pear/DB/ifx.php 2012-10-02 09:05:34 UTC (rev 8370)
+++ trunk/lib/pear/DB/ifx.php 2012-10-02 09:21:20 UTC (rev 8371)
@@ -32,7 +32,7 @@
* extension.
*
* @package DB
- * @version
+ * @version
* @category Database
* @author Tomas V.V.Cox <co...@id...>
*/
Modified: trunk/lib/pear/DB/msql.php
===================================================================
--- trunk/lib/pear/DB/msql.php 2012-10-02 09:05:34 UTC (rev 8370)
+++ trunk/lib/pear/DB/msql.php 2012-10-02 09:21:20 UTC (rev 8371)
@@ -24,7 +24,7 @@
* extension.
*
* @package DB
- * @version
+ * @version
* @category Database
* @author Sterling Hughes <ste...@ph...>
*/
Modified: trunk/lib/pear/DB/mssql.php
===================================================================
--- trunk/lib/pear/DB/mssql.php 2012-10-02 09:05:34 UTC (rev 8370)
+++ trunk/lib/pear/DB/mssql.php 2012-10-02 09:21:20 UTC (rev 8371)
@@ -24,7 +24,7 @@
* extension.
*
* @package DB
- * @version
+ * @version
* @category Database
* @author Sterling Hughes <ste...@ph...>
*/
Modified: trunk/lib/pear/DB/mysql.php
===================================================================
--- trunk/lib/pear/DB/mysql.php 2012-10-02 09:05:34 UTC (rev 8370)
+++ trunk/lib/pear/DB/mysql.php 2012-10-02 09:21:20 UTC (rev 8371)
@@ -35,7 +35,7 @@
* This is for MySQL versions 4.0 and below.
*
* @package DB
- * @version
+ * @version
* @category Database
* @author Stig Bakken <ss...@ph...>
*/
Modified: trunk/lib/pear/DB/mysqli.php
===================================================================
--- trunk/lib/pear/DB/mysqli.php 2012-10-02 09:05:34 UTC (rev 8370)
+++ trunk/lib/pear/DB/mysqli.php 2012-10-02 09:21:20 UTC (rev 8371)
@@ -34,7 +34,7 @@
* Note that persistent connections no longer exist.
*
* @package DB
- * @version
+ * @version
* @category Database
* @author Chaillan Nicolas <ni...@ph...>
*/
Modified: trunk/lib/pear/DB/oci8.php
===================================================================
--- trunk/lib/pear/DB/oci8.php 2012-10-02 09:05:34 UTC (rev 8370)
+++ trunk/lib/pear/DB/oci8.php 2012-10-02 09:21:20 UTC (rev 8371)
@@ -30,7 +30,7 @@
* Definitely works with versions 8 and 9 of Oracle.
*
* @package DB
- * @version
+ * @version
* @category Database
* @author James L. Pine <jl...@va...>
*/
Modified: trunk/lib/pear/DB/sqlite.php
===================================================================
--- trunk/lib/pear/DB/sqlite.php 2012-10-02 09:05:34 UTC (rev 8370)
+++ trunk/lib/pear/DB/sqlite.php 2012-10-02 09:21:20 UTC (rev 8371)
@@ -25,7 +25,7 @@
* PECL extension.
*
* @package DB
- * @version
+ * @version
* @category Database
* @author Urs Gehrig <ur...@ci...>
* @author Mika Tuupola <tu...@ap...>
Modified: trunk/lib/pear/DB.php
===================================================================
--- trunk/lib/pear/DB.php 2012-10-02 09:05:34 UTC (rev 8370)
+++ trunk/lib/pear/DB.php 2012-10-02 09:21:20 UTC (rev 8371)
@@ -252,7 +252,7 @@
* @author Stig Bakken <ss...@ph...>
* @author Tomas V.V.Cox <co...@id...>
* @since PHP 4.0
- * @version
+ * @version
* @category Database
*/
class DB
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-10-02 12:07:45
|
Revision: 8377
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8377&view=rev
Author: vargenau
Date: 2012-10-02 12:07:35 +0000 (Tue, 02 Oct 2012)
Log Message:
-----------
Whitespace only
Modified Paths:
--------------
trunk/lib/WikiPlugin.php
trunk/lib/WikiUser.php
trunk/lib/wikilens/RatingsDb.php
trunk/lib/wikilens/RatingsUser.php
trunk/lib/wikilens/Utils.php
Modified: trunk/lib/WikiPlugin.php
===================================================================
--- trunk/lib/WikiPlugin.php 2012-10-02 11:46:53 UTC (rev 8376)
+++ trunk/lib/WikiPlugin.php 2012-10-02 12:07:35 UTC (rev 8377)
@@ -1,6 +1,5 @@
<?php
-
class WikiPlugin
{
function getDefaultArguments() {
Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php 2012-10-02 11:46:53 UTC (rev 8376)
+++ trunk/lib/WikiUser.php 2012-10-02 12:07:35 UTC (rev 8377)
@@ -1,6 +1,5 @@
<?php
-
// It is anticipated that when userid support is added to phpwiki,
// this object will hold much more information (e-mail,
// home(wiki)page, etc.) about the user.
Modified: trunk/lib/wikilens/RatingsDb.php
===================================================================
--- trunk/lib/wikilens/RatingsDb.php 2012-10-02 11:46:53 UTC (rev 8376)
+++ trunk/lib/wikilens/RatingsDb.php 2012-10-02 12:07:35 UTC (rev 8377)
@@ -1,6 +1,5 @@
-<?php // -*-php-*-
+<?php
-
/*
* @author: Dan Frankowski (wikilens group manager), Reini Urban (as plugin)
*
Modified: trunk/lib/wikilens/RatingsUser.php
===================================================================
--- trunk/lib/wikilens/RatingsUser.php 2012-10-02 11:46:53 UTC (rev 8376)
+++ trunk/lib/wikilens/RatingsUser.php 2012-10-02 12:07:35 UTC (rev 8377)
@@ -1,4 +1,4 @@
-<?php //-*-php-*-
+<?php
/* Copyright (C) 2004 Dan Frankowski
* Copyright (C) 2010 Roger Guignard, Alcatel-Lucent
Modified: trunk/lib/wikilens/Utils.php
===================================================================
--- trunk/lib/wikilens/Utils.php 2012-10-02 11:46:53 UTC (rev 8376)
+++ trunk/lib/wikilens/Utils.php 2012-10-02 12:07:35 UTC (rev 8377)
@@ -1,4 +1,4 @@
-<?php // -*-php-*-
+<?php
/*
* Copyright 2004 Mike Cassano
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-10-02 12:58:51
|
Revision: 8384
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8384&view=rev
Author: vargenau
Date: 2012-10-02 12:58:40 +0000 (Tue, 02 Oct 2012)
Log Message:
-----------
Whitespace only
Modified Paths:
--------------
trunk/lib/WikiCallback.php
trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php
trunk/lib/WikiDB/cvs.php
trunk/lib/WikiDB/file.php
trunk/lib/WikiDB/flatfile.php
Modified: trunk/lib/WikiCallback.php
===================================================================
--- trunk/lib/WikiCallback.php 2012-10-02 12:51:40 UTC (rev 8383)
+++ trunk/lib/WikiCallback.php 2012-10-02 12:58:40 UTC (rev 8384)
@@ -1,6 +1,5 @@
<?php
-
/**
* A callback
*
Modified: trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php 2012-10-02 12:51:40 UTC (rev 8383)
+++ trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php 2012-10-02 12:58:40 UTC (rev 8384)
@@ -166,4 +166,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-
Modified: trunk/lib/WikiDB/cvs.php
===================================================================
--- trunk/lib/WikiDB/cvs.php 2012-10-02 12:51:40 UTC (rev 8383)
+++ trunk/lib/WikiDB/cvs.php 2012-10-02 12:58:40 UTC (rev 8384)
@@ -1,7 +1,5 @@
<?php
-
-
require_once 'lib/WikiDB.php';
require_once 'lib/WikiDB/backend/cvs.php';
Modified: trunk/lib/WikiDB/file.php
===================================================================
--- trunk/lib/WikiDB/file.php 2012-10-02 12:51:40 UTC (rev 8383)
+++ trunk/lib/WikiDB/file.php 2012-10-02 12:58:40 UTC (rev 8384)
@@ -1,7 +1,5 @@
<?php
-
-
/**
* Copyright 1999, 2000, 2001, 2002, 2003 $ThePhpWikiProgrammingTeam
*
@@ -55,4 +53,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-
Modified: trunk/lib/WikiDB/flatfile.php
===================================================================
--- trunk/lib/WikiDB/flatfile.php 2012-10-02 12:51:40 UTC (rev 8383)
+++ trunk/lib/WikiDB/flatfile.php 2012-10-02 12:58:40 UTC (rev 8384)
@@ -1,6 +1,5 @@
<?php
-
/**
* Copyright 1999, 2005 $ThePhpWikiProgrammingTeam
*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-10-02 13:43:17
|
Revision: 8385
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8385&view=rev
Author: vargenau
Date: 2012-10-02 13:43:06 +0000 (Tue, 02 Oct 2012)
Log Message:
-----------
Whitespace only
Modified Paths:
--------------
trunk/lib/ExternalReferrer.php
trunk/lib/RSSWriter091.php
trunk/lib/difflib.php
trunk/lib/plugin/BackLinks.php
trunk/lib/plugin/Calendar.php
trunk/lib/plugin/CalendarList.php
trunk/lib/plugin/Comment.php
Modified: trunk/lib/ExternalReferrer.php
===================================================================
--- trunk/lib/ExternalReferrer.php 2012-10-02 12:58:40 UTC (rev 8384)
+++ trunk/lib/ExternalReferrer.php 2012-10-02 13:43:06 UTC (rev 8385)
@@ -1,6 +1,5 @@
<?php
-
/**
* Detect external referrers
* Currently only search engines, and highlight the searched item.
Modified: trunk/lib/RSSWriter091.php
===================================================================
--- trunk/lib/RSSWriter091.php 2012-10-02 12:58:40 UTC (rev 8384)
+++ trunk/lib/RSSWriter091.php 2012-10-02 13:43:06 UTC (rev 8385)
@@ -21,8 +21,6 @@
// for outputting RecentChanges in RSS 0.91 format
// ----------------------------------------------------------------------
-
-
include_once 'lib/RssWriter.php';
class RSSWriter091 extends RSSWriter
{
Modified: trunk/lib/difflib.php
===================================================================
--- trunk/lib/difflib.php 2012-10-02 12:58:40 UTC (rev 8384)
+++ trunk/lib/difflib.php 2012-10-02 13:43:06 UTC (rev 8385)
@@ -1,6 +1,5 @@
<?php
-
// difflib.php
//
// A PHP diff engine for phpwiki.
Modified: trunk/lib/plugin/BackLinks.php
===================================================================
--- trunk/lib/plugin/BackLinks.php 2012-10-02 12:58:40 UTC (rev 8384)
+++ trunk/lib/plugin/BackLinks.php 2012-10-02 13:43:06 UTC (rev 8385)
@@ -1,4 +1,4 @@
-<?php // -*-php-*-
+<?php
/**
* Copyright 1999,2000,2001,2002,2006 $ThePhpWikiProgrammingTeam
Modified: trunk/lib/plugin/Calendar.php
===================================================================
--- trunk/lib/plugin/Calendar.php 2012-10-02 12:58:40 UTC (rev 8384)
+++ trunk/lib/plugin/Calendar.php 2012-10-02 13:43:06 UTC (rev 8385)
@@ -92,7 +92,6 @@
'title' => _("Next Month")),
'>');
-
$row = HTML::tr(HTML::td(array('align' => 'left'), $prev),
HTML::td(array('align' => 'center'),
HTML::strong(array('class' => 'cal-header'),
Modified: trunk/lib/plugin/CalendarList.php
===================================================================
--- trunk/lib/plugin/CalendarList.php 2012-10-02 12:58:40 UTC (rev 8384)
+++ trunk/lib/plugin/CalendarList.php 2012-10-02 13:43:06 UTC (rev 8385)
@@ -1,6 +1,5 @@
<?php
-
/**
* * Copyright 1999-2002,2005-2007 $ThePhpWikiProgrammingTeam
*
Modified: trunk/lib/plugin/Comment.php
===================================================================
--- trunk/lib/plugin/Comment.php 2012-10-02 12:58:40 UTC (rev 8384)
+++ trunk/lib/plugin/Comment.php 2012-10-02 13:43:06 UTC (rev 8385)
@@ -1,6 +1,5 @@
<?php
-
/*
* Copyright (C) 2003 Martin Geisler
* Copyright (C) 2003-2004 $ThePhpWikiProgrammingTeam
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-10-11 09:32:31
|
Revision: 8410
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8410&view=rev
Author: vargenau
Date: 2012-10-11 09:32:21 +0000 (Thu, 11 Oct 2012)
Log Message:
-----------
Remove useless semicolon
Modified Paths:
--------------
trunk/lib/HtmlElement.php
trunk/lib/HtmlElement5.php
trunk/lib/PageList.php
trunk/lib/RssWriter.php
trunk/lib/RssWriter2.php
trunk/lib/SemanticWeb.php
trunk/lib/Template.php
trunk/lib/TextSearchQuery.php
trunk/lib/WikiDB.php
trunk/lib/WikiPlugin.php
trunk/lib/WikiTheme.php
trunk/lib/XmlElement.php
trunk/lib/diff3.php
trunk/lib/imdb.php
trunk/lib/stdlib.php
Modified: trunk/lib/HtmlElement.php
===================================================================
--- trunk/lib/HtmlElement.php 2012-10-11 09:24:50 UTC (rev 8409)
+++ trunk/lib/HtmlElement.php 2012-10-11 09:32:21 UTC (rev 8410)
@@ -125,8 +125,8 @@
}
}
-;
+
function HTML( /* $content, ... */)
{
return new XmlContent(func_get_args());
Modified: trunk/lib/HtmlElement5.php
===================================================================
--- trunk/lib/HtmlElement5.php 2012-10-11 09:24:50 UTC (rev 8409)
+++ trunk/lib/HtmlElement5.php 2012-10-11 09:32:21 UTC (rev 8410)
@@ -125,8 +125,8 @@
}
}
-;
+
function HTML( /* $content, ... */)
{
return new XmlContent(func_get_args());
Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php 2012-10-11 09:24:50 UTC (rev 8409)
+++ trunk/lib/PageList.php 2012-10-11 09:32:21 UTC (rev 8410)
@@ -176,8 +176,8 @@
}
}
-;
+
class _PageList_Column extends _PageList_Column_base
{
function _PageList_Column($field, $default_heading, $align = false)
@@ -216,8 +216,8 @@
}
}
-;
+
/* overcome a call_user_func limitation by not being able to do:
* call_user_func_array(array(&$class, $class_name), $params);
* So we need $class = new $classname($params);
@@ -289,8 +289,8 @@
}
}
-;
+
class _PageList_Column_checkbox extends _PageList_Column
{
function _PageList_Column_checkbox($field, $default_heading, $name = 'p')
@@ -341,8 +341,8 @@
}
}
-;
+
class _PageList_Column_time extends _PageList_Column
{
function _PageList_Column_time($field, $default_heading)
@@ -364,8 +364,8 @@
}
}
-;
+
class _PageList_Column_version extends _PageList_Column
{
function _getValue($page_handle, &$revision_handle)
@@ -376,8 +376,8 @@
}
}
-;
+
// Output is hardcoded to limit of first 50 bytes. Otherwise
// on very large Wikis this will fail if used with AllPages
// (PHP memory limit exceeded)
@@ -485,9 +485,9 @@
}
}
-;
+
class _PageList_Column_author extends _PageList_Column
{
function _PageList_Column_author($field, $default_heading, $align = false)
@@ -511,8 +511,8 @@
}
}
-;
+
class _PageList_Column_owner extends _PageList_Column_author
{
function _getValue($page_handle, &$revision_handle)
@@ -530,8 +530,8 @@
}
}
-;
+
class _PageList_Column_creator extends _PageList_Column_author
{
function _getValue($page_handle, &$revision_handle)
@@ -549,8 +549,8 @@
}
}
-;
+
class _PageList_Column_pagename extends _PageList_Column_base
{
var $_field = 'pagename';
@@ -584,8 +584,8 @@
}
}
-;
+
class _PageList_Column_perm extends _PageList_Column
{
function _getValue($page_handle, &$revision_handle)
@@ -597,8 +597,8 @@
}
}
-;
+
class _PageList_Column_acl extends _PageList_Column
{
function _getValue($page_handle, &$revision_handle)
@@ -621,8 +621,8 @@
}
}
-;
+
class PageList
{
var $_group_rows = 3;
@@ -1875,8 +1875,8 @@
}
-;
+
/* List pages with checkboxes to select from.
* The [Select] button toggles via Javascript flipAll
*/
Modified: trunk/lib/RssWriter.php
===================================================================
--- trunk/lib/RssWriter.php 2012-10-11 09:24:50 UTC (rev 8409)
+++ trunk/lib/RssWriter.php 2012-10-11 09:32:21 UTC (rev 8410)
@@ -198,8 +198,8 @@
}
}
-;
+
/* Taken from mediawiki.
* See http://www.atomenabled.org/developers/syndication/
*/
Modified: trunk/lib/RssWriter2.php
===================================================================
--- trunk/lib/RssWriter2.php 2012-10-11 09:24:50 UTC (rev 8409)
+++ trunk/lib/RssWriter2.php 2012-10-11 09:32:21 UTC (rev 8410)
@@ -78,8 +78,8 @@
}
}
-;
+
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/SemanticWeb.php
===================================================================
--- trunk/lib/SemanticWeb.php 2012-10-11 09:24:50 UTC (rev 8409)
+++ trunk/lib/SemanticWeb.php 2012-10-11 09:32:21 UTC (rev 8410)
@@ -241,8 +241,8 @@
{
}
-;
+
/**
* OwlWriter - A class to represent a set of wiki pages (a DL model) as OWL.
* Requires an actionpage returning a pagelist.
@@ -256,8 +256,8 @@
{
}
-;
+
/**
* ModelWriter - Export a KB as set of wiki pages.
* Requires an actionpage returning a pagelist.
@@ -271,8 +271,8 @@
{
}
-;
+
/**
* NumericSearchQuery can do:
* ("population < 20000 and area > 1000000", array("population", "area"))
@@ -414,26 +414,26 @@
}
}
-;
+
class ReasonerBackend_LISA extends ReasonerBackend
{
}
-;
+
class ReasonerBackend_Racer extends ReasonerBackend
{
}
-;
+
class ReasonerBackend_KM extends ReasonerBackend
{
}
-;
+
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/Template.php
===================================================================
--- trunk/lib/Template.php 2012-10-11 09:24:50 UTC (rev 8409)
+++ trunk/lib/Template.php 2012-10-11 09:32:21 UTC (rev 8410)
@@ -224,8 +224,8 @@
}
}
-;
+
/**
* Get a templates
*
Modified: trunk/lib/TextSearchQuery.php
===================================================================
--- trunk/lib/TextSearchQuery.php 2012-10-11 09:24:50 UTC (rev 8409)
+++ trunk/lib/TextSearchQuery.php 2012-10-11 09:32:21 UTC (rev 8410)
@@ -404,8 +404,8 @@
}
}
-;
+
/**
* A simple algebraic matcher for numeric attributes.
* NumericSearchQuery can do ("population < 20000 and area > 1000000", array("population", "area"))
Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php 2012-10-11 09:24:50 UTC (rev 8409)
+++ trunk/lib/WikiDB.php 2012-10-11 09:32:21 UTC (rev 8410)
@@ -755,9 +755,9 @@
}
}
-;
+
/**
* A base class which representing a wiki-page within a
* WikiDB.
@@ -1539,8 +1539,8 @@
}
-;
+
/**
* This class represents a specific revision of a WikiDB_Page within
* a WikiDB.
@@ -1888,9 +1888,9 @@
}
}
-;
+
/**
* Class representing a sequence of WikiDB_Pages.
* TODO: Enhance to php5 iterators
@@ -2046,8 +2046,8 @@
}
-;
+
/**
* A class which represents a sequence of WikiDB_PageRevisions.
* TODO: Enhance to php5 iterators
@@ -2134,8 +2134,8 @@
}
}
-;
+
/** pseudo iterator
*/
class WikiDB_Array_PageIterator
@@ -2431,8 +2431,8 @@
}
}
-;
+
function _sql_debuglog($msg, $newline = true, $shutdown = false)
{
static $fp = false;
Modified: trunk/lib/WikiPlugin.php
===================================================================
--- trunk/lib/WikiPlugin.php 2012-10-11 09:24:50 UTC (rev 8409)
+++ trunk/lib/WikiPlugin.php 2012-10-11 09:32:21 UTC (rev 8410)
@@ -554,8 +554,8 @@
}
}
-;
+
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php 2012-10-11 09:24:50 UTC (rev 8409)
+++ trunk/lib/WikiTheme.php 2012-10-11 09:32:21 UTC (rev 8410)
@@ -1691,8 +1691,8 @@
}
-;
+
/**
* A class representing a clickable "button".
*
@@ -1735,9 +1735,9 @@
}
-;
+
/**
* A clickable image button.
*/
@@ -1771,8 +1771,8 @@
}
}
-;
+
/**
* A class representing a form <samp>submit</samp> button.
*/
@@ -1801,8 +1801,8 @@
}
-;
+
/**
* A class representing an image form <samp>submit</samp> button.
*/
@@ -1834,8 +1834,8 @@
}
-;
+
/**
* A sidebar box with title and body, narrow fixed-width.
* To represent abbrevated content of plugins, links or forms,
Modified: trunk/lib/XmlElement.php
===================================================================
--- trunk/lib/XmlElement.php 2012-10-11 09:24:50 UTC (rev 8409)
+++ trunk/lib/XmlElement.php 2012-10-11 09:32:21 UTC (rev 8410)
@@ -199,8 +199,8 @@
}
}
-;
+
/**
* An XML element.
*
@@ -459,8 +459,8 @@
}
-;
+
class RawXml
{
function RawXml($xml_text)
Modified: trunk/lib/diff3.php
===================================================================
--- trunk/lib/diff3.php 2012-10-11 09:24:50 UTC (rev 8409)
+++ trunk/lib/diff3.php 2012-10-11 09:32:21 UTC (rev 8410)
@@ -114,8 +114,8 @@
}
}
-;
+
class Diff3
{
function Diff3($orig, $final1, $final2)
Modified: trunk/lib/imdb.php
===================================================================
--- trunk/lib/imdb.php 2012-10-11 09:24:50 UTC (rev 8409)
+++ trunk/lib/imdb.php 2012-10-11 09:32:21 UTC (rev 8410)
@@ -441,8 +441,8 @@
}
-;
+
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php 2012-10-11 09:24:50 UTC (rev 8409)
+++ trunk/lib/stdlib.php 2012-10-11 09:32:21 UTC (rev 8410)
@@ -1665,8 +1665,8 @@
}
}
-;
+
// File globbing
// expands a list containing regex's to its matching entries
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-10-11 12:11:27
|
Revision: 8413
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8413&view=rev
Author: vargenau
Date: 2012-10-11 12:11:16 +0000 (Thu, 11 Oct 2012)
Log Message:
-----------
Remove extra white lines
Modified Paths:
--------------
trunk/lib/diff3.php
trunk/lib/imdb.php
Modified: trunk/lib/diff3.php
===================================================================
--- trunk/lib/diff3.php 2012-10-11 12:05:36 UTC (rev 8412)
+++ trunk/lib/diff3.php 2012-10-11 12:11:16 UTC (rev 8413)
@@ -114,8 +114,6 @@
}
}
-
-
class Diff3
{
function Diff3($orig, $final1, $final2)
Modified: trunk/lib/imdb.php
===================================================================
--- trunk/lib/imdb.php 2012-10-11 12:05:36 UTC (rev 8412)
+++ trunk/lib/imdb.php 2012-10-11 12:11:16 UTC (rev 8413)
@@ -441,8 +441,6 @@
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-10-26 13:14:52
|
Revision: 8420
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8420&view=rev
Author: vargenau
Date: 2012-10-26 13:14:46 +0000 (Fri, 26 Oct 2012)
Log Message:
-----------
elseif [PSR-2] The keyword elseif should be used instead of else if so that all control keywords looks like single words.
Modified Paths:
--------------
trunk/lib/WikiTheme.php
trunk/lib/wikilens/Buddy.php
trunk/lib/ziplib.php
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php 2012-10-26 13:07:18 UTC (rev 8419)
+++ trunk/lib/WikiTheme.php 2012-10-26 13:14:46 UTC (rev 8420)
@@ -266,7 +266,7 @@
}
if (isset($this->_default_theme)) {
return $this->_default_theme->_findFile($file, $missing_okay);
- } else if (!$missing_okay) {
+ } elseif (!$missing_okay) {
trigger_error("$this->_theme/$file: not found", E_USER_NOTICE);
if (DEBUG & _DEBUG_TRACE) {
echo "<pre>", printSimpleTrace(debug_backtrace()), "</pre>\n";
@@ -1691,8 +1691,6 @@
}
-
-
/**
* A class representing a clickable "button".
*
@@ -1735,9 +1733,6 @@
}
-
-
-
/**
* A clickable image button.
*/
@@ -1771,8 +1766,6 @@
}
}
-
-
/**
* A class representing a form <samp>submit</samp> button.
*/
@@ -1801,8 +1794,6 @@
}
-
-
/**
* A class representing an image form <samp>submit</samp> button.
*/
@@ -1834,8 +1825,6 @@
}
-
-
/**
* A sidebar box with title and body, narrow fixed-width.
* To represent abbrevated content of plugins, links or forms,
Modified: trunk/lib/wikilens/Buddy.php
===================================================================
--- trunk/lib/wikilens/Buddy.php 2012-10-26 13:07:18 UTC (rev 8419)
+++ trunk/lib/wikilens/Buddy.php 2012-10-26 13:14:46 UTC (rev 8420)
@@ -90,9 +90,9 @@
$buddy_rating = $buddy_rating_array['ratingvalue'];
if ($buddy_rating == "") {
$agree = 1;
- } else if ($agreePos && $buddy_rating >= $MIDDLE_RATING) {
+ } elseif ($agreePos && $buddy_rating >= $MIDDLE_RATING) {
$agree = 1;
- } else if (!$agreePos && $buddy_rating < $MIDDLE_RATING) {
+ } elseif (!$agreePos && $buddy_rating < $MIDDLE_RATING) {
$agree = 1;
} else {
$agree = 0;
@@ -101,7 +101,7 @@
}
if ($agree && $agreePos) {
return 1;
- } else if ($agree && !$agreePos) {
+ } elseif ($agree && !$agreePos) {
return -1;
} else {
return 0;
Modified: trunk/lib/ziplib.php
===================================================================
--- trunk/lib/ziplib.php 2012-10-26 13:07:18 UTC (rev 8419)
+++ trunk/lib/ziplib.php 2012-10-26 13:14:46 UTC (rev 8420)
@@ -492,7 +492,7 @@
if ($comp_type == ZIP_DEFLATE) {
$data = zip_inflate($data, $crc32, $uncomp_size);
- } else if ($comp_type == ZIP_STORE) {
+ } elseif ($comp_type == ZIP_STORE) {
$crc = zip_crc32($data);
if ($crc32 != $crc)
ExitWiki(sprintf("CRC mismatch %x != %x", $crc, $crc32));
@@ -813,7 +813,7 @@
}
if ("$type/$subtype" == 'multipart/mixed') {
return ParseMimeMultipart($data, $params['boundary']);
- } else if ("$type/$subtype" != 'application/x-phpwiki') {
+ } elseif ("$type/$subtype" != 'application/x-phpwiki') {
trigger_error(sprintf("Bad %s", "content-type: $type/$subtype"),
E_USER_WARNING);
return false;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-10-26 13:42:36
|
Revision: 8422
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8422&view=rev
Author: vargenau
Date: 2012-10-26 13:42:26 +0000 (Fri, 26 Oct 2012)
Log Message:
-----------
Remove useless blank lines
Modified Paths:
--------------
trunk/lib/RssWriter2.php
trunk/lib/SemanticWeb.php
trunk/lib/plugin/AllPages.php
trunk/lib/plugin/AsciiMath.php
Modified: trunk/lib/RssWriter2.php
===================================================================
--- trunk/lib/RssWriter2.php 2012-10-26 13:41:02 UTC (rev 8421)
+++ trunk/lib/RssWriter2.php 2012-10-26 13:42:26 UTC (rev 8422)
@@ -78,8 +78,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/SemanticWeb.php
===================================================================
--- trunk/lib/SemanticWeb.php 2012-10-26 13:41:02 UTC (rev 8421)
+++ trunk/lib/SemanticWeb.php 2012-10-26 13:42:26 UTC (rev 8422)
@@ -105,7 +105,6 @@
require_once 'lib/TextSearchQuery.php';
require_once 'lib/Units.php';
-
/**
* RdfWriter - A class to represent the links of a list of wikipages as RDF.
* Supports ?format=rdf
@@ -241,8 +240,6 @@
{
}
-
-
/**
* OwlWriter - A class to represent a set of wiki pages (a DL model) as OWL.
* Requires an actionpage returning a pagelist.
@@ -256,8 +253,6 @@
{
}
-
-
/**
* ModelWriter - Export a KB as set of wiki pages.
* Requires an actionpage returning a pagelist.
@@ -271,8 +266,6 @@
{
}
-
-
/**
* NumericSearchQuery can do:
* ("population < 20000 and area > 1000000", array("population", "area"))
@@ -414,26 +407,18 @@
}
}
-
-
class ReasonerBackend_LISA extends ReasonerBackend
{
}
-
-
class ReasonerBackend_Racer extends ReasonerBackend
{
}
-
-
class ReasonerBackend_KM extends ReasonerBackend
{
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/AllPages.php
===================================================================
--- trunk/lib/plugin/AllPages.php 2012-10-26 13:41:02 UTC (rev 8421)
+++ trunk/lib/plugin/AllPages.php 2012-10-26 13:42:26 UTC (rev 8422)
@@ -147,8 +147,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/AsciiMath.php
===================================================================
--- trunk/lib/plugin/AsciiMath.php 2012-10-26 13:41:02 UTC (rev 8421)
+++ trunk/lib/plugin/AsciiMath.php 2012-10-26 13:42:26 UTC (rev 8422)
@@ -82,8 +82,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-11-14 13:26:04
|
Revision: 8428
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8428&view=rev
Author: vargenau
Date: 2012-11-14 13:25:55 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Remove empty lines
Modified Paths:
--------------
trunk/lib/RssWriter.php
trunk/lib/Template.php
Modified: trunk/lib/RssWriter.php
===================================================================
--- trunk/lib/RssWriter.php 2012-11-14 13:25:20 UTC (rev 8427)
+++ trunk/lib/RssWriter.php 2012-11-14 13:25:55 UTC (rev 8428)
@@ -198,8 +198,6 @@
}
}
-
-
/* Taken from mediawiki.
* See http://www.atomenabled.org/developers/syndication/
*/
Modified: trunk/lib/Template.php
===================================================================
--- trunk/lib/Template.php 2012-11-14 13:25:20 UTC (rev 8427)
+++ trunk/lib/Template.php 2012-11-14 13:25:55 UTC (rev 8428)
@@ -224,8 +224,6 @@
}
}
-
-
/**
* Get a templates
*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-11-14 15:45:18
|
Revision: 8438
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8438&view=rev
Author: vargenau
Date: 2012-11-14 15:45:07 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Remove useless semicolon
Modified Paths:
--------------
trunk/lib/WikiDB/ADODB.php
trunk/lib/WikiDB/PDO.php
trunk/lib/WikiDB/SQL.php
trunk/lib/WikiDB/backend/ADODB.php
trunk/lib/WikiDB/backend/ADODB_mssql.php
trunk/lib/WikiDB/backend/ADODB_mssqlnative.php
trunk/lib/WikiDB/backend/ADODB_mysql.php
trunk/lib/WikiDB/backend/ADODB_oci8po.php
trunk/lib/WikiDB/backend/ADODB_postgres7.php
trunk/lib/WikiDB/backend/ADODB_sqlite.php
trunk/lib/WikiDB/backend/PDO.php
trunk/lib/WikiDB/backend/PearDB.php
trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
trunk/lib/WikiDB/backend/PearDB_mysql.php
trunk/lib/WikiDB/backend/PearDB_oci8.php
trunk/lib/WikiDB/backend/PearDB_pgsql.php
trunk/lib/WikiDB/backend/PearDB_sqlite.php
trunk/lib/WikiDB/backend/dba.php
trunk/lib/WikiDB/backend/dbaBase.php
trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php
trunk/lib/WikiDB/backend/dumb/TextSearchIter.php
trunk/lib/WikiDB/backend/file.php
trunk/lib/WikiDB/backend/flatfile.php
trunk/lib/WikiDB/backend.php
trunk/lib/WikiDB/dba.php
trunk/lib/WikiPlugin.php
trunk/lib/XmlElement.php
trunk/lib/wikilens/CustomPrefs.php
trunk/lib/wikilens/PageListColumns.php
Modified: trunk/lib/WikiDB/ADODB.php
===================================================================
--- trunk/lib/WikiDB/ADODB.php 2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/ADODB.php 2012-11-14 15:45:07 UTC (rev 8438)
@@ -106,8 +106,6 @@
}
-;
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/WikiDB/PDO.php
===================================================================
--- trunk/lib/WikiDB/PDO.php 2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/PDO.php 2012-11-14 15:45:07 UTC (rev 8438)
@@ -113,8 +113,6 @@
}
-;
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/WikiDB/SQL.php
===================================================================
--- trunk/lib/WikiDB/SQL.php 2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/SQL.php 2012-11-14 15:45:07 UTC (rev 8438)
@@ -103,8 +103,6 @@
}
-;
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/WikiDB/backend/ADODB.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB.php 2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/backend/ADODB.php 2012-11-14 15:45:07 UTC (rev 8438)
@@ -1330,8 +1330,6 @@
}
-;
-
class WikiDB_backend_ADODB_generic_iter
extends WikiDB_backend_iterator
{
Modified: trunk/lib/WikiDB/backend/ADODB_mssql.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_mssql.php 2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/backend/ADODB_mssql.php 2012-11-14 15:45:07 UTC (rev 8438)
@@ -113,8 +113,6 @@
}
-;
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/WikiDB/backend/ADODB_mssqlnative.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_mssqlnative.php 2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/backend/ADODB_mssqlnative.php 2012-11-14 15:45:07 UTC (rev 8438)
@@ -245,8 +245,6 @@
}
-;
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/WikiDB/backend/ADODB_mysql.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_mysql.php 2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/backend/ADODB_mysql.php 2012-11-14 15:45:07 UTC (rev 8438)
@@ -239,8 +239,6 @@
}
-;
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/WikiDB/backend/ADODB_oci8po.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_oci8po.php 2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/backend/ADODB_oci8po.php 2012-11-14 15:45:07 UTC (rev 8438)
@@ -154,8 +154,6 @@
}
-;
-
class WikiDB_backend_ADODB_oci8_search
extends WikiDB_backend_ADODB_search
{
Modified: trunk/lib/WikiDB/backend/ADODB_postgres7.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_postgres7.php 2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/backend/ADODB_postgres7.php 2012-11-14 15:45:07 UTC (rev 8438)
@@ -144,8 +144,6 @@
}
-;
-
class WikiDB_backend_ADODB_postgres7_search
extends WikiDB_backend_ADODB_search
{
Modified: trunk/lib/WikiDB/backend/ADODB_sqlite.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_sqlite.php 2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/backend/ADODB_sqlite.php 2012-11-14 15:45:07 UTC (rev 8438)
@@ -57,8 +57,6 @@
}
}
-;
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php 2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/backend/PDO.php 2012-11-14 15:45:07 UTC (rev 8438)
@@ -1327,8 +1327,6 @@
}
}
-;
-
class WikiDB_backend_PDO_generic_iter
extends WikiDB_backend_iterator
{
Modified: trunk/lib/WikiDB/backend/PearDB.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB.php 2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/backend/PearDB.php 2012-11-14 15:45:07 UTC (rev 8438)
@@ -1210,8 +1210,6 @@
}
}
-;
-
/**
* This class is a generic iterator.
*
Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2012-11-14 15:45:07 UTC (rev 8438)
@@ -666,8 +666,6 @@
}
}
-;
-
class WikiDB_backend_PearDB_ffpgsql_search
extends WikiDB_backend_PearDB_pgsql_search
{
Modified: trunk/lib/WikiDB/backend/PearDB_mysql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_mysql.php 2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/backend/PearDB_mysql.php 2012-11-14 15:45:07 UTC (rev 8438)
@@ -218,8 +218,6 @@
}
-;
-
class WikiDB_backend_PearDB_mysql_search
extends WikiDB_backend_PearDB_search
{
Modified: trunk/lib/WikiDB/backend/PearDB_oci8.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_oci8.php 2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/backend/PearDB_oci8.php 2012-11-14 15:45:07 UTC (rev 8438)
@@ -106,8 +106,6 @@
}
-;
-
class WikiDB_backend_PearDB_oci8_search
extends WikiDB_backend_PearDB_search
{
Modified: trunk/lib/WikiDB/backend/PearDB_pgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_pgsql.php 2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/backend/PearDB_pgsql.php 2012-11-14 15:45:07 UTC (rev 8438)
@@ -273,8 +273,6 @@
}
-;
-
class WikiDB_backend_PearDB_pgsql_search
extends WikiDB_backend_PearDB_search
{
Modified: trunk/lib/WikiDB/backend/PearDB_sqlite.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_sqlite.php 2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/backend/PearDB_sqlite.php 2012-11-14 15:45:07 UTC (rev 8438)
@@ -97,8 +97,6 @@
}
-;
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/WikiDB/backend/dba.php
===================================================================
--- trunk/lib/WikiDB/backend/dba.php 2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/backend/dba.php 2012-11-14 15:45:07 UTC (rev 8438)
@@ -36,8 +36,6 @@
}
}
-;
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/WikiDB/backend/dbaBase.php
===================================================================
--- trunk/lib/WikiDB/backend/dbaBase.php 2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/backend/dbaBase.php 2012-11-14 15:45:07 UTC (rev 8438)
@@ -609,8 +609,6 @@
}
}
-;
-
function WikiDB_backend_dbaBase_sortby_pagename_ASC($a, $b)
{
return strcasecmp($a, $b);
@@ -717,8 +715,6 @@
}
}
-;
-
class WikiDB_backend_dbaBase_linktable
{
function WikiDB_backend_dbaBase_linktable(&$dba)
Modified: trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php 2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php 2012-11-14 15:45:07 UTC (rev 8438)
@@ -68,8 +68,6 @@
}
}
-;
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/WikiDB/backend/dumb/TextSearchIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/TextSearchIter.php 2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/backend/dumb/TextSearchIter.php 2012-11-14 15:45:07 UTC (rev 8438)
@@ -86,8 +86,6 @@
}
}
-;
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/WikiDB/backend/file.php
===================================================================
--- trunk/lib/WikiDB/backend/file.php 2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/backend/file.php 2012-11-14 15:45:07 UTC (rev 8438)
@@ -730,8 +730,6 @@
}
-;
-
class WikiDB_backend_file_iter extends WikiDB_backend_iterator
{
function WikiDB_backend_file_iter(&$backend, &$query_result, $options = array())
Modified: trunk/lib/WikiDB/backend/flatfile.php
===================================================================
--- trunk/lib/WikiDB/backend/flatfile.php 2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/backend/flatfile.php 2012-11-14 15:45:07 UTC (rev 8438)
@@ -196,8 +196,6 @@
}
}
-;
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/WikiDB/backend.php
===================================================================
--- trunk/lib/WikiDB/backend.php 2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/backend.php 2012-11-14 15:45:07 UTC (rev 8438)
@@ -699,8 +699,6 @@
}
}
-;
-
/**
* Iterator returned by backend methods which (possibly) return
* multiple records.
@@ -773,8 +771,6 @@
}
}
-;
-
/**
* search baseclass, pcre-specific
*/
Modified: trunk/lib/WikiDB/dba.php
===================================================================
--- trunk/lib/WikiDB/dba.php 2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiDB/dba.php 2012-11-14 15:45:07 UTC (rev 8438)
@@ -20,8 +20,6 @@
}
}
-;
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/WikiPlugin.php
===================================================================
--- trunk/lib/WikiPlugin.php 2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/WikiPlugin.php 2012-11-14 15:45:07 UTC (rev 8438)
@@ -554,8 +554,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/XmlElement.php
===================================================================
--- trunk/lib/XmlElement.php 2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/XmlElement.php 2012-11-14 15:45:07 UTC (rev 8438)
@@ -199,8 +199,6 @@
}
}
-
-
/**
* An XML element.
*
@@ -459,8 +457,6 @@
}
-
-
class RawXml
{
function RawXml($xml_text)
Modified: trunk/lib/wikilens/CustomPrefs.php
===================================================================
--- trunk/lib/wikilens/CustomPrefs.php 2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/wikilens/CustomPrefs.php 2012-11-14 15:45:07 UTC (rev 8438)
@@ -23,8 +23,6 @@
}
}
-;
-
class _UserPreference_recalgo // recommendation engine algorithm
extends _UserPreference
{
@@ -44,15 +42,11 @@
}
}
-;
-
class _UserPreference_recnnbr // recommendation engine key clustering, neighborhood size
extends _UserPreference_numeric
{
}
-;
-
$WikiTheme->customUserPreferences
(array
(
Modified: trunk/lib/wikilens/PageListColumns.php
===================================================================
--- trunk/lib/wikilens/PageListColumns.php 2012-11-14 14:28:09 UTC (rev 8437)
+++ trunk/lib/wikilens/PageListColumns.php 2012-11-14 15:45:07 UTC (rev 8438)
@@ -1,6 +1,5 @@
-<?php // -*-php-*-
+<?php
-
/*
* Copyright 2004 Mike Cassano
*
@@ -56,8 +55,6 @@
}
}
-;
-
class _PageList_Column_coagreement extends _PageList_Column_custom
{
function _PageList_Column_coagreement($params)
@@ -143,8 +140,6 @@
}
}
-;
-
/**
* Show the value of a rating as a digit (or "-" if no value), given the
* user who is the rater.
@@ -216,8 +211,6 @@
}
}
-;
-
/**
* Ratings widget for the logged-in user and the given page
* This uses the column name "rating".
@@ -260,8 +253,6 @@
}
}
-;
-
class _PageList_Column_prediction extends _PageList_Column
{
var $_active_ratings_user;
@@ -313,8 +304,6 @@
}
}
-;
-
class _PageList_Column_top3recs extends _PageList_Column_custom
{
@@ -385,8 +374,6 @@
}
}
-;
-
// register custom PageList type
global $WikiTheme;
$WikiTheme->addPageListColumn
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-11-14 16:04:34
|
Revision: 8442
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8442&view=rev
Author: vargenau
Date: 2012-11-14 16:04:21 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
elseif
Modified Paths:
--------------
trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mysql.inc.php
trunk/lib/plugin/FoafViewer.php
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php 2012-11-14 15:54:02 UTC (rev 8441)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php 2012-11-14 16:04:21 UTC (rev 8442)
@@ -194,7 +194,7 @@
//$o->max_length = -1; // fbsql returns the max length less spaces -- so it is unrealiable
$f = @fbsql_field_flags($this->_queryID, $fieldOffset);
$o->binary = (strpos($f, 'binary') !== false);
- } else if ($fieldOffset == -1) { /* The $fieldOffset argument is not provided thus its -1 */
+ } elseif ($fieldOffset == -1) { /* The $fieldOffset argument is not provided thus its -1 */
$o = @fbsql_fetch_field($this->_queryID); // fbsql returns the max length less spaces -- so it is unrealiable
//$o->max_length = -1;
}
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php 2012-11-14 15:54:02 UTC (rev 8441)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php 2012-11-14 16:04:21 UTC (rev 8442)
@@ -697,7 +697,7 @@
{
if ($fieldOffset != -1) {
return @mssql_fetch_field($this->_queryID, $fieldOffset);
- } else if ($fieldOffset == -1) { /* The $fieldOffset argument is not provided thus its -1 */
+ } elseif ($fieldOffset == -1) { /* The $fieldOffset argument is not provided thus its -1 */
return @mssql_fetch_field($this->_queryID);
}
return null;
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mysql.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-mysql.inc.php 2012-11-14 15:54:02 UTC (rev 8441)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-mysql.inc.php 2012-11-14 16:04:21 UTC (rev 8442)
@@ -541,7 +541,7 @@
$o->max_length = @mysql_field_len($this->_queryID, $fieldOffset); // suggested by: Jim Nicholson (jn...@at...)
//$o->max_length = -1; // mysql returns the max length less spaces -- so it is unrealiable
$o->binary = (strpos($f, 'binary') !== false);
- } else if ($fieldOffset == -1) { /* The $fieldOffset argument is not provided thus its -1 */
+ } elseif ($fieldOffset == -1) { /* The $fieldOffset argument is not provided thus its -1 */
$o = @mysql_fetch_field($this->_queryID);
$o->max_length = @mysql_field_len($this->_queryID); // suggested by: Jim Nicholson (jn...@at...)
//$o->max_length = -1; // mysql returns the max length less spaces -- so it is unrealiable
Modified: trunk/lib/plugin/FoafViewer.php
===================================================================
--- trunk/lib/plugin/FoafViewer.php 2012-11-14 15:54:02 UTC (rev 8441)
+++ trunk/lib/plugin/FoafViewer.php 2012-11-14 16:04:21 UTC (rev 8442)
@@ -208,9 +208,9 @@
if ($index == "mboxsha1sum") {
$string = '<a href="http://beta.plink.org/profile/' . $array[$index][$i] . '">'
. '<img src="http://beta.plink.org/images/plink.png" alt="Plink - ' . $array[$index][$i] . '" /></a>';
- } else if ($index == "depiction") {
+ } elseif ($index == "depiction") {
$string = '<img src="' . $array[$index][$i] . '" />';
- } else if ((substr($array[$index][$i], 0, 7) == "http://") || (substr($array[$index][$i], 0, 7) == "mailto:")) {
+ } elseif ((substr($array[$index][$i], 0, 7) == "http://") || (substr($array[$index][$i], 0, 7) == "mailto:")) {
$string = '<a href="' . $array[$index][$i] . '"';
if (@$dc["description"][$array[$index][$i]]) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
![http://beta.plink.org/images/plink.png"](http://beta.plink.org/images/plink.png"){kind=link}
|
From: <var...@us...> - 2012-11-14 16:49:32
|
Revision: 8454
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8454&view=rev
Author: vargenau
Date: 2012-11-14 16:49:23 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
elseif
Modified Paths:
--------------
trunk/lib/difflib.php
trunk/lib/gif.php
Modified: trunk/lib/difflib.php
===================================================================
--- trunk/lib/difflib.php 2012-11-14 16:44:11 UTC (rev 8453)
+++ trunk/lib/difflib.php 2012-11-14 16:49:23 UTC (rev 8454)
@@ -275,7 +275,7 @@
$this->in_seq[$this->seq[$k]] = false;
$this->seq[$k] = $y;
$this->in_seq[$y] = 1;
- } else if (empty($this->in_seq[$y])) {
+ } elseif (empty($this->in_seq[$y])) {
$k = $this->_lcs_pos($y);
assert($k > 0);
$ymids[$k] = $ymids[$k - 1];
Modified: trunk/lib/gif.php
===================================================================
--- trunk/lib/gif.php 2012-11-14 16:44:11 UTC (rev 8453)
+++ trunk/lib/gif.php 2012-11-14 16:49:23 UTC (rev 8454)
@@ -86,7 +86,7 @@
if (isSet($gif) && (@get_class($gif) == "cgif") && $gif->loaded()) {
$width = $gif->width();
$height = $gif->height();
- } else if (@file_exists($gif)) {
+ } elseif (@file_exists($gif)) {
$myGIF = new CGIF();
if (!$myGIF->getSize($gif, $width, $height)) {
return false;
@@ -763,7 +763,7 @@
if ($bgColor != -1) {
$bgColor = $this->m_img->m_gih->m_colorTable->colorIndex($bgColor);
}
- } else if ($this->m_gfh->m_bGlobalClr) {
+ } elseif ($this->m_gfh->m_bGlobalClr) {
$nColors = $this->m_gfh->m_nTableSize;
$rgbq = $this->m_gfh->m_colorTable->toRGBQuad();
if ($bgColor != -1) {
@@ -862,7 +862,7 @@
if ($bgColor != -1) {
$bgColor = $this->m_img->m_gih->m_colorTable->colorIndex($bgColor);
}
- } else if ($this->m_gfh->m_bGlobalClr) {
+ } elseif ($this->m_gfh->m_bGlobalClr) {
$nColors = $this->m_gfh->m_nTableSize;
$pal = $this->m_gfh->m_colorTable->toString();
if ($bgColor != -1) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-11-15 10:34:35
|
Revision: 8469
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8469&view=rev
Author: vargenau
Date: 2012-11-15 10:34:21 +0000 (Thu, 15 Nov 2012)
Log Message:
-----------
PHP 5 only
Modified Paths:
--------------
trunk/lib/plugin/AsciiMath.php
Added Paths:
-----------
trunk/lib/ASCIIMathPHP/ASCIIMathPHP.cfg.php
trunk/lib/ASCIIMathPHP/ASCIIMathPHP.class.php
Removed Paths:
-------------
trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.cfg.php
trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.class.php
trunk/lib/ASCIIMathPHP/ASCIIMathPHP.cfg.php
trunk/lib/ASCIIMathPHP/ASCIIMathPHP.class.php
Deleted: trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.cfg.php
===================================================================
--- trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.cfg.php 2012-11-15 10:29:20 UTC (rev 8468)
+++ trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.cfg.php 2012-11-15 10:34:21 UTC (rev 8469)
@@ -1,217 +0,0 @@
-<?php
-
-$symbol_arr = array(
-
-// Greek symbols
-'alpha' => array( 'input'=>'alpha','tag'=>'mi', 'output'=>'&#' . hexdec('03B1') . ';'),
-'beta' => array( 'input'=>'beta','tag'=>'mi', 'output'=>'&#' . hexdec('03B2') . ';'),
-'chi' => array( 'input'=>'chi','tag'=>'mi', 'output'=>'&#' . hexdec('03C7') . ';'),
-'delta' => array( 'input'=>'delta','tag'=>'mi', 'output'=>'&#' . hexdec('03B4') . ';'),
-'Delta' => array( 'input'=>'Delta','tag'=>'mo', 'output'=>'&#' . hexdec('0394') . ';'),
-'epsi' => array( 'input'=>'epsi','tag'=>'mi', 'output'=>'&#' . hexdec('03B5') . ';'),
-'varepsilon' => array( 'input'=>'varepsilon','tag'=>'mi', 'output'=>'&#' . hexdec('025B') . ';'),
-'eta' => array( 'input'=>'eta','tag'=>'mi', 'output'=>'&#' . hexdec('03B7') . ';'),
-'gamma' => array( 'input'=>'gamma','tag'=>'mi', 'output'=>'&#' . hexdec('03B3') . ';'),
-'Gamma' => array( 'input'=>'Gamma','tag'=>'mi', 'output'=>'&#' . hexdec('0393') . ';'),
-'iota' => array( 'input'=>'iota','tag'=>'mi', 'output'=>'&#' . hexdec('03B9') . ';'),
-'kappa' => array( 'input'=>'kappa','tag'=>'mi', 'output'=>'&#' . hexdec('03BA') . ';'),
-'lambda' => array( 'input'=>'lambda','tag'=>'mi', 'output'=>'&#' . hexdec('03BB') . ';'),
-'Lambda' => array( 'input'=>'Lambda','tag'=>'mo', 'output'=>'&#' . hexdec('039B') . ';'),
-'mu' => array( 'input'=>'mu','tag'=>'mi', 'output'=>'&#' . hexdec('03BC') . ';'),
-'nu' => array( 'input'=>'nu','tag'=>'mi', 'output'=>'&#' . hexdec('03BD') . ';'),
-'omega' => array( 'input'=>'omega','tag'=>'mi', 'output'=>'&#' . hexdec('03C9') . ';'),
-'Omega' => array( 'input'=>'Omega','tag'=>'mo', 'output'=>'&#' . hexdec('03A9') . ';'),
-'phi' => array( 'input'=>'phi','tag'=>'mi', 'output'=>'&#' . hexdec('03C6') . ';'),
-'varphi' => array( 'input'=>'varphi','tag'=>'mi', 'output'=>'&#' . hexdec('03D5') . ';'),
-'Phi' => array( 'input'=>'Phi','tag'=>'mo', 'output'=>'&#' . hexdec('03A6') . ';'),
-'pi' => array( 'input'=>'pi','tag'=>'mi', 'output'=>'&#' . hexdec('03C0') . ';'),
-'Pi' => array( 'input'=>'Pi','tag'=>'mo', 'output'=>'&#' . hexdec('03A0') . ';'),
-'psi' => array( 'input'=>'psi','tag'=>'mi', 'output'=>'&#' . hexdec('03C8') . ';'),
-'rho' => array( 'input'=>'rho','tag'=>'mi', 'output'=>'&#' . hexdec('03C1') . ';'),
-'sigma' => array( 'input'=>'sigma','tag'=>'mi', 'output'=>'&#' . hexdec('03C3') . ';'),
-'Sigma' => array( 'input'=>'Sigma','tag'=>'mo', 'output'=>'&#' . hexdec('03A3') . ';'),
-'tau' => array( 'input'=>'tau','tag'=>'mi', 'output'=>'&#' . hexdec('03C4') . ';'),
-'theta' => array( 'input'=>'theta','tag'=>'mi', 'output'=>'&#' . hexdec('03B8') . ';'),
-'vartheta' => array( 'input'=>'vartheta','tag'=>'mi', 'output'=>'&#' . hexdec('03D1') . ';'),
-'Theta' => array( 'input'=>'Theta','tag'=>'mo', 'output'=>'&#' . hexdec('0398') . ';'),
-'upsilon' => array( 'input'=>'upsilon','tag'=>'mi', 'output'=>'&#' . hexdec('03C5') . ';'),
-'xi' => array( 'input'=>'xi','tag'=>'mi', 'output'=>'&#' . hexdec('03BE') . ';'),
-'Xi' => array( 'input'=>'alpha','tag'=>'mo', 'output'=>'&#' . hexdec('039E') . ';'),
-'zeta' => array( 'input'=>'zeta','tag'=>'mi', 'output'=>'&#' . hexdec('03B6') . ';'),
-
-// Binary operation symbols
-'*' => array( 'input'=>'*','tag'=>'mo', 'output'=>'&#' . hexdec('22C5') . ';'),
-'**' => array( 'input'=>'**','tag'=>'mo', 'output'=>'&#' . hexdec('22C6') . ';'),
-'//' => array( 'input'=>'//','tag'=>'mo', 'output'=>'/'),
-'\\\\' => array( 'input'=>'\\\\','tag'=>'mo', 'output'=>'\\'),
-'xx' => array( 'input'=>'xx','tag'=>'mo', 'output'=>'&#' . hexdec('00D7') . ';'),
-'-:' => array( 'input'=>'-:','tag'=>'mo', 'output'=>'&#' . hexdec('00F7') . ';'),
-'@' => array( 'input'=>'@','tag'=>'mo', 'output'=>'&#' . hexdec('2218') . ';'),
-'o+' => array( 'input'=>'o+','tag'=>'mo', 'output'=>'&#' . hexdec('2295') . ';'),
-'ox' => array( 'input'=>'ox','tag'=>'mo', 'output'=>'&#' . hexdec('2297') . ';'),
-'sum' => array( 'input'=>'sum','tag'=>'mo', 'output'=>'&#' . hexdec('2211') . ';', 'underover'=>TRUE),
-'prod' => array( 'input'=>'prod','tag'=>'mo', 'output'=>'&#' . hexdec('220F') . ';', 'underover'=>TRUE),
-'^^' => array( 'input'=>'^^','tag'=>'mo', 'output'=>'&#' . hexdec('2227') . ';'),
-'^^^' => array( 'input'=>'^^^','tag'=>'mo', 'output'=>'&#' . hexdec('22C0') . ';', 'underover'=>TRUE),
-'vv' => array( 'input'=>'vv','tag'=>'mo', 'output'=>'&#' . hexdec('2228') . ';'),
-'vvv' => array( 'input'=>'vvv','tag'=>'mo', 'output'=>'&#' . hexdec('22C1') . ';', 'underover'=>TRUE),
-'nn' => array( 'input'=>'nn','tag'=>'mo', 'output'=>'&#' . hexdec('2229') . ';'),
-'nnn' => array( 'input'=>'nnn','tag'=>'mo', 'output'=>'&#' . hexdec('22C5') . ';', 'underover'=>TRUE),
-'uu' => array( 'input'=>'uu','tag'=>'mo', 'output'=>'&#' . hexdec('222A') . ';'),
-'uuu' => array( 'input'=>'uuu','tag'=>'mo', 'output'=>'&#' . hexdec('22C3') . ';', 'underover'=>TRUE),
-
-// Binary relation symbols
-'!=' => array( 'input'=>'!=','tag'=>'mo', 'output'=>'&#' . hexdec('2260') . ';'),
-':=' => array( 'input'=>':=','tag'=>'mo', 'output'=>':=' ), /* 2005-06-05 wes */
-'<' => array( 'input'=>'<','tag'=>'mo', 'output'=>'<'),
-'lt' => array( 'input'=>'lt','tag'=>'mo', 'output'=>'<'), /* 2005-06-05 wes */
-'<=' => array( 'input'=>'<=','tag'=>'mo', 'output'=>'&#' . hexdec('2264') . ';'),
-'lt=' => array( 'input'=>'lt=','tag'=>'mo', 'output'=>'&#' . hexdec('2264') . ';'),
-'le' => array( 'input'=>'le','tag'=>'mo', 'output'=>'&#' . hexdec('2264') . ';'), /* 2005-06-05 wes */
-'>' => array( 'input'=>'>','tag'=>'mo', 'output'=>'>'),
-'>=' => array( 'input'=>'>=','tag'=>'mo', 'output'=>'&#' . hexdec('2265') . ';'),
-'qeq' => array( 'input'=>'geq','tag'=>'mo', 'output'=>'&#' . hexdec('2265') . ';'),
-'-<' => array( 'input'=>'-<','tag'=>'mo', 'output'=>'&#' . hexdec('227A') . ';'),
-'-lt' => array( 'input'=>'-lt','tag'=>'mo', 'output'=>'&#' . hexdec('227A') . ';'),
-'>-' => array( 'input'=>'>-','tag'=>'mo', 'output'=>'&#' . hexdec('227B') . ';'),
-'in' => array( 'input'=>'in','tag'=>'mo', 'output'=>'&#' . hexdec('2208') . ';'),
-'!in' => array( 'input'=>'!in','tag'=>'mo', 'output'=>'&#' . hexdec('2209') . ';'),
-'sub' => array( 'input'=>'sub','tag'=>'mo', 'output'=>'&#' . hexdec('2282') . ';'),
-'sup' => array( 'input'=>'sup','tag'=>'mo', 'output'=>'&#' . hexdec('2283') . ';'),
-'sube' => array( 'input'=>'sube','tag'=>'mo', 'output'=>'&#' . hexdec('2286') . ';'),
-'supe' => array( 'input'=>'supe','tag'=>'mo', 'output'=>'&#' . hexdec('2287') . ';'),
-'-=' => array( 'input'=>'-=','tag'=>'mo', 'output'=>'&#' . hexdec('2261') . ';'),
-'~=' => array( 'input'=>'~=','tag'=>'mo', 'output'=>'&#' . hexdec('2245') . ';'),
-'~~' => array( 'input'=>'~~','tag'=>'mo', 'output'=>'&#' . hexdec('2248') . ';'),
-'prop' => array( 'input'=>'prop','tag'=>'mo', 'output'=>'&#' . hexdec('221D') . ';'),
-
-// Logical symbols
-'and' => array( 'input'=>'and','tag'=>'mtext', 'output'=>'and', 'space'=>'1ex'),
-'or' => array( 'input'=>'or','tag'=>'mtext', 'output'=>'or', 'space'=>'1ex'),
-'not' => array( 'input'=>'not','tag'=>'mo', 'output'=>'&#' . hexdec('00AC') . ';'),
-'=>' => array( 'input'=>'=>','tag'=>'mo', 'output'=>'&#' . hexdec('21D2') . ';'),
-'if' => array( 'input'=>'if','tag'=>'mo', 'output'=>'if', 'space'=>'1ex'),
-'iff' => array( 'input'=>'iff','tag'=>'mo', 'output'=>'&#' . hexdec('21D4') . ';'),
-'<=>' => array( 'input'=>'iff','tag'=>'mo', 'output'=>'&#' . hexdec('21D4') . ';'), /* 2005-06-07 wes */
-'AA' => array( 'input'=>'AA','tag'=>'mo', 'output'=>'&#' . hexdec('2200') . ';'),
-'EE' => array( 'input'=>'EE','tag'=>'mo', 'output'=>'&#' . hexdec('2203') . ';'),
-'_|_' => array( 'input'=>'_|_','tag'=>'mo', 'output'=>'&#' . hexdec('22A5') . ';'),
-'TT' => array( 'input'=>'TT','tag'=>'mo', 'output'=>'&#' . hexdec('22A4') . ';'),
-'|-' => array( 'input'=>'|-','tag'=>'mo', 'output'=>'&#' . hexdec('22A2') . ';'),
-'|=' => array( 'input'=>'|=','tag'=>'mo', 'output'=>'&#' . hexdec('22A8') . ';'),
-
-// Miscellaneous symbols
-'ang' => array('input'=>'ang','tag'=>'mo','output'=>'&#' . hexdec('2220') . ';'),
-'deg' => array('input'=>'deg','tag'=>'mo','output'=>'&#' . hexdec('00B0') . ';'),
-'int' => array( 'input'=>'int','tag'=>'mo', 'output'=>'&#' . hexdec('222B') . ';'),
-'dx' => array( 'input'=>'dx','tag'=>'mi', 'output'=>'{:d x:}', 'definition'=>TRUE), /* 2005-06-11 wes */
-'dy' => array( 'input'=>'dy','tag'=>'mi', 'output'=>'{:d y:}', 'definition'=>TRUE), /* 2005-06-11 wes */
-'dz' => array( 'input'=>'dz','tag'=>'mi', 'output'=>'{:d z:}', 'definition'=>TRUE), /* 2005-06-11 wes */
-'dt' => array( 'input'=>'dt','tag'=>'mi', 'output'=>'{:d t:}', 'definition'=>TRUE), /* 2005-06-11 wes */
-'oint' => array( 'input'=>'oint','tag'=>'mo', 'output'=>'&#' . hexdec('222E') . ';'),
-'del' => array( 'input'=>'del','tag'=>'mo', 'output'=>'&#' . hexdec('2202') . ';'),
-'grad' => array( 'input'=>'grad','tag'=>'mo', 'output'=>'&#' . hexdec('2207') . ';'),
-'+-' => array( 'input'=>'+-','tag'=>'mo', 'output'=>'&#' . hexdec('00B1') . ';'),
-'O/' => array( 'input'=>'0/','tag'=>'mo', 'output'=>'&#' . hexdec('2205') . ';'),
-'oo' => array( 'input'=>'oo','tag'=>'mo', 'output'=>'&#' . hexdec('221E') . ';'),
-'aleph' => array( 'input'=>'aleph','tag'=>'mo', 'output'=>'&#' . hexdec('2135') . ';'),
-'...' => array( 'input'=>'int','tag'=>'mo', 'output'=>'...'),
-'~' => array( 'input'=>'!~','tag'=>'mo', 'output'=>'&#' . hexdec('0020') . ';'),
-'\\ ' => array( 'input'=>'~','tag'=>'mo', 'output'=>'&#' . hexdec('00A0') . ';'),
-'quad' => array( 'input'=>'quad','tag'=>'mo', 'output'=>'&#' . hexdec('00A0') . ';&#' . hexdec('00A0') . ';'),
-'qquad' => array( 'input'=>'qquad','tag'=>'mo', 'output'=> '&#' . hexdec('00A0') . ';&#' . hexdec('00A0') . ';&#' . hexdec('00A0') . ';'),
-'cdots' => array( 'input'=>'cdots','tag'=>'mo', 'output'=>'&#' . hexdec('22EF') . ';'),
-'vdots' => array( 'input'=>'vdots','tag'=>'mo', 'output'=>'&#' . hexdec('22EE') . ';'), /* 2005-06-11 wes */
-'ddots' => array( 'input'=>'ddots','tag'=>'mo', 'output'=>'&#' . hexdec('22F1') . ';'), /* 2005-06-11 wes */
-'diamond' => array( 'input'=>'diamond','tag'=>'mo', 'output'=>'&#' . hexdec('22C4') . ';'),
-'square' => array( 'input'=>'square','tag'=>'mo', 'output'=>'&#' . hexdec('25A1') . ';'),
-'|_' => array( 'input'=>'|_','tag'=>'mo', 'output'=>'&#' . hexdec('230A') . ';'),
-'_|' => array( 'input'=>'_|','tag'=>'mo', 'output'=>'&#' . hexdec('230B') . ';'),
-'|~' => array( 'input'=>'|~','tag'=>'mo', 'output'=>'&#' . hexdec('2308') . ';'),
-'~|' => array( 'input'=>'~|','tag'=>'mo', 'output'=>'&#' . hexdec('2309') . ';'),
-'CC' => array( 'input'=>'CC','tag'=>'mo', 'output'=>'&#' . hexdec('2102') . ';'),
-'NN' => array( 'input'=>'NN','tag'=>'mo', 'output'=>'&#' . hexdec('2115') . ';'),
-'QQ' => array( 'input'=>'QQ','tag'=>'mo', 'output'=>'&#' . hexdec('211A') . ';'),
-'RR' => array( 'input'=>'RR','tag'=>'mo', 'output'=>'&#' . hexdec('211D') . ';'),
-'ZZ' => array( 'input'=>'ZZ','tag'=>'mo', 'output'=>'&#' . hexdec('2124') . ';'),
-
-// Standard functions
-'lim' => array( 'input'=>'lim','tag'=>'mo', 'output'=>'lim', 'underover'=>TRUE),
-'Lim' => array( 'input'=>'Lim','tag'=>'mo', 'output'=>'Lim', 'underover'=>TRUE), /* 2005-06-11 wes */
-'sin' => array( 'input'=>'sin','tag'=>'mo', 'output'=>'sin', 'unary'=>TRUE, 'func'=>TRUE),
-'cos' => array( 'input'=>'cos', 'tag'=>'mo', 'output'=>'cos', 'unary'=>TRUE, 'func'=>TRUE),
-'tan' => array( 'input'=>'tan', 'tag'=>'mo', 'output'=>'tan', 'unary'=>TRUE, 'func'=>TRUE),
-'arcsin' => array( 'input'=>'arcsin','tag'=>'mo', 'output'=>'arcsin', 'unary'=>TRUE, 'func'=>TRUE), //2006-9-7 DL
-'arccos' => array( 'input'=>'arccos', 'tag'=>'mo', 'output'=>'arccos', 'unary'=>TRUE, 'func'=>TRUE), //2006-9-7 DL
-'arctan' => array( 'input'=>'arctan', 'tag'=>'mo', 'output'=>'arctan', 'unary'=>TRUE, 'func'=>TRUE), //2006-9-7 DL
-'sinh' => array( 'input'=>'sinh','tag'=>'mo', 'output'=>'sinh', 'unary'=>TRUE, 'func'=>TRUE),
-'cosh' => array( 'input'=>'cosh', 'tag'=>'mo', 'output'=>'cosh', 'unary'=>TRUE, 'func'=>TRUE),
-'tanh' => array( 'input'=>'tanh', 'tag'=>'mo', 'output'=>'tanh', 'unary'=>TRUE, 'func'=>TRUE),
-'cot' => array( 'input'=>'cot','tag'=>'mo', 'output'=>'cot', 'unary'=>TRUE, 'func'=>TRUE),
-'sec' => array( 'input'=>'sec', 'tag'=>'mo', 'output'=>'sec', 'unary'=>TRUE, 'func'=>TRUE),
-'csc' => array( 'input'=>'csc', 'tag'=>'mo', 'output'=>'csc', 'unary'=>TRUE, 'func'=>TRUE),
-'coth' => array( 'input'=>'coth','tag'=>'mo', 'output'=>'coth', 'unary'=>TRUE, 'func'=>TRUE),
-'sech' => array( 'input'=>'sech', 'tag'=>'mo', 'output'=>'sech', 'unary'=>TRUE, 'func'=>TRUE),
-'csch' => array( 'input'=>'csch', 'tag'=>'mo', 'output'=>'csch', 'unary'=>TRUE, 'func'=>TRUE),
-'log' => array( 'input'=>'log', 'tag'=>'mo', 'output'=>'log', 'unary'=>TRUE, 'func'=>TRUE),
-'ln' => array( 'input'=>'ln', 'tag'=>'mo', 'output'=>'ln', 'unary'=>TRUE, 'func'=>TRUE),
-'det' => array( 'input'=>'det', 'tag'=>'mo', 'output'=>'det', 'unary'=>TRUE, 'func'=>TRUE),
-'dim' => array( 'input'=>'dim', 'tag'=>'mo', 'output'=>'dim'),
-'mod' => array( 'input'=>'mod', 'tag'=>'mo', 'output'=>'mod'),
-'gcd' => array( 'input'=>'gcd', 'tag'=>'mo', 'output'=>'gcd', 'unary'=>TRUE, 'func'=>TRUE),
-'lcm' => array( 'input'=>'lcm', 'tag'=>'mo', 'output'=>'lcm', 'unary'=>TRUE, 'func'=>TRUE),
-'lub' => array( 'input'=>'lub', 'tag'=>'mo', 'output'=>'lub'), /* 2005-06-11 wes */
-'glb' => array( 'input'=>'glb', 'tag'=>'mo', 'output'=>'glb'), /* 2005-06-11 wes */
-'min' => array( 'input'=>'min', 'tag'=>'mo', 'output'=>'min', 'underover'=>TRUE), /* 2005-06-11 wes */
-'max' => array( 'input'=>'max', 'tag'=>'mo', 'output'=>'max', 'underover'=>TRUE), /* 2005-06-11 wes */
-'f' => array( 'input'=>'f','tag'=>'mi', 'output'=>'f', 'unary'=>TRUE, 'func'=>TRUE), //2006-9-7 DL
-'g' => array( 'input'=>'g', 'tag'=>'mi', 'output'=>'g', 'unary'=>TRUE, 'func'=>TRUE), //2006-9-7 DL
-
-// Arrows
-'uarr' => array( 'input'=>'uarr', 'tag'=>'mo', 'output'=>'&#' . hexdec('2191') . ';'),
-'darr' => array( 'input'=>'darr', 'tag'=>'mo', 'output'=>'&#' . hexdec('2193') . ';'),
-'rarr' => array( 'input'=>'rarr', 'tag'=>'mo', 'output'=>'&#' . hexdec('2192') . ';'),
-'->' => array( 'input'=>'->', 'tag'=>'mo', 'output'=>'&#' . hexdec('2192') . ';'),
-'|->' => array( 'input'=>'|->', 'tag'=>'mo', 'output'=>'&#' . hexdec('21A6') . ';'), /* 2005-06-11 wes */
-'larr' => array( 'input'=>'larr', 'tag'=>'mo', 'output'=>'&#' . hexdec('2190') . ';'),
-'harr' => array( 'input'=>'harr', 'tag'=>'mo', 'output'=>'&#' . hexdec('2194') . ';'),
-'rArr' => array( 'input'=>'rArr', 'tag'=>'mo', 'output'=>'&#' . hexdec('21D2') . ';'),
-'lArr' => array( 'input'=>'lArr', 'tag'=>'mo', 'output'=>'&#' . hexdec('21D0') . ';'),
-'hArr' => array( 'input'=>'hArr', 'tag'=>'mo', 'output'=>'&#' . hexdec('21D4') . ';'),
-
-// Commands with argument
-'sqrt' => array( 'input'=>'sqrt', 'tag'=>'msqrt', 'output'=>'sqrt', 'unary'=>TRUE ),
-'root' => array( 'input'=>'root', 'tag'=>'mroot', 'output'=>'root', 'binary'=>TRUE ),
-'frac' => array( 'input'=>'frac', 'tag'=>'mfrac', 'output'=>'/', 'binary'=>TRUE),
-'/' => array( 'input'=>'/', 'tag'=>'mfrac', 'output'=>'/', 'infix'=>TRUE),
-'_' => array( 'input'=>'_', 'tag'=>'msub', 'output'=>'_', 'infix'=>TRUE),
-'^' => array( 'input'=>'^', 'tag'=>'msup', 'output'=>'^', 'infix'=>TRUE),
-'hat' => array( 'input'=>'hat', 'tag'=>'mover', 'output'=>'&#' . hexdec('005E') . ';', 'unary'=>TRUE, 'acc'=>TRUE),
-'bar' => array( 'input'=>'bar', 'tag'=>'mover', 'output'=>'&#' . hexdec('00AF') . ';', 'unary'=>TRUE, 'acc'=>TRUE),
-'vec' => array( 'input'=>'vec', 'tag'=>'mover', 'output'=>'&#' . hexdec('2192') . ';', 'unary'=>TRUE, 'acc'=>TRUE),
-'dot' => array( 'input'=>'dot', 'tag'=>'mover', 'output'=>'.', 'unary'=>TRUE, 'acc'=>TRUE),
-'ddot' => array( 'input'=>'ddot', 'tag'=>'mover', 'output'=>'..', 'unary'=>TRUE, 'acc'=>TRUE),
-'ul' => array( 'input'=>'ul', 'tag'=>'munder', 'output'=>'&#' . hexdec('0332') . ';', 'unary'=>TRUE, 'acc'=>TRUE),
-'avec' => array( 'input'=>'avec', 'tag'=>'munder', 'output'=>'~', 'unary'=>TRUE, 'acc'=>TRUE),
-'text' => array( 'input'=>'text', 'tag'=>'mtext', 'output'=>'text', 'unary'=>TRUE),
-'mbox' => array( 'input'=>'mbox', 'tag'=>'mtext', 'output'=>'mbox', 'unary'=>TRUE),
-'"' => array( 'input'=>'"', 'tag'=>'mtext','output'=>'mbox', 'unary'=>TRUE),
-
-/* 2005-06-05 wes: added stackrel */
-'stackrel' => array( 'input'=>'stackrel', 'tag'=>'mover', 'output'=>'stackrel', 'binary'=>TRUE),
-
-// Grouping brackets
-'(' => array( 'input'=>'(', 'tag'=>'mo', 'output'=>'(', 'left_bracket'=>TRUE),
-')' => array( 'input'=>')', 'tag'=>'mo', 'output'=>')', 'right_bracket'=>TRUE),
-'[' => array( 'input'=>'[', 'tag'=>'mo', 'output'=>'[', 'left_bracket'=>TRUE),
-']' => array( 'input'=>']', 'tag'=>'mo', 'output'=>']', 'right_bracket'=>TRUE),
-'{' => array( 'input'=>'{', 'tag'=>'mo', 'output'=>'{', 'left_bracket'=>TRUE),
-'}' => array( 'input'=>'}', 'tag'=>'mo', 'output'=>'}', 'right_bracket'=>TRUE),
-'(:' => array( 'input'=>'(:', 'tag'=>'mo', 'output'=>'&#' . hexdec('2329') . ';', 'left_bracket'=>TRUE),
-':)' => array( 'input'=>':)', 'tag'=>'mo', 'output'=>'&#' . hexdec('232A') . ';', 'right_bracket'=>TRUE),
-'{:' => array( 'input'=>'{:', 'tag'=>'mo', 'output'=>'{:', 'left_bracket'=>TRUE, 'invisible'=>TRUE),
-':}' => array( 'input'=>':}', 'tag'=>'mo', 'output'=>':}', 'right_bracket'=>TRUE ,'invisible'=>TRUE),
-'<<' => array( 'input'=>'<<', 'tag'=>'mo', 'output'=>'&#' . hexdec('2329') . ';', 'left_bracket'=>TRUE), // 2005-06-07 wes
-'>>' => array( 'input'=>'>>', 'tag'=>'mo', 'output'=>'&#' . hexdec('232A') . ';', 'right_bracket'=>TRUE) // 2005-06-07 wes
-);
-
Deleted: trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.class.php
===================================================================
--- trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.class.php 2012-11-15 10:29:20 UTC (rev 8468)
+++ trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.class.php 2012-11-15 10:34:21 UTC (rev 8469)
@@ -1,1118 +0,0 @@
-<?php
-
-/****
- * ASCIIMathPHP and associated classes:
- * -- XMLNode
- * -- MathMLNode extends XMLNode
- *
- * These classes are a PHP port of ASCIIMath
- * Version 1.3 Feb 19 2004, (c) Peter Jipsen http://www.chapman.edu/~jipsen
- *
- * ASCIIMathPHP Version 1.11, 26 April 2006, (c) Kee-Lin Steven Chan (kc...@co...)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License (at http://www.gnu.org/copyleft/gpl.html)
- * for more details.
- *
- * ChangeLog
- *
- * Ver 2.0
- * -- PHP5 only version of ASCIIMathPHP
- *
- * Ver 1.12.1
- * -- Included the missing setCurrExpr() method
- *
- * Ver 1.12
- * -- Added changes that David Lippman <DLi...@pi...> made to bring ASCIIMathPHP up to
- * ASCIIMath 1.4.7 functionality.
- * -- Added parseIntExpr, for intermediate expression parsing rule, allowing x^2/x^3 to render as (x^2)/(x^3)
- * -- Added quotes as another way of designating text; "hello" is equivalent to text(hello)
- * -- Added FUNC designator to allow sin, cos, etc to act as functions, so sin(x)/x renders as {sin(x)}/x
- *
- * Ver 1.11
- * -- Fixed bug that stopped script execution for incomplete expressions
- * -- Changed the algorithm for parsing expressions so that it matches the longest string possible (greedy)
- *
- * Ver 1.10
- * -- Added definition support
- * -- Added stackrel support
- * -- Added a bunch of different symbols etc. >>, << and definitions like dx, dy, dz etc.
- *
- * Ver 1.02
- * -- Fixed bug with mbox and text
- * -- Fixed spacing bug with mbox and text
- *
- * Ver 1.01
- * -- Fixed Bug that did not parse symbols greater than a single character
- * correctly when appearing at end of expression.
- *
- ***/
-
-class XMLNode
-{
- // Private variables
- var $_id;
- var $_name;
- var $_content;
- var $_mt_elem_flg;
- var $_attr_arr;
- var $_child_arr;
- var $_nmspc;
- var $_nmspc_alias;
- var $_parent_id;
- var $_parent_node;
-
- function XMLNode($id = NULL)
- {
- $this->_id = isset($id) ? $id : md5(uniqid(rand(),1));
- $this->_name = '';
- $this->_content = '';
- $this->_mt_elem_flg = FALSE;
- $this->_attr_arr = array();
- $this->_child_arr = array();
- $this->_nmspc = '';
- $this->_nmspc_alias = '';
- $this->_parent_id = FALSE;
- $this->_parent_node = NULL;
- }
-
- function addChild(&$node)
- {
- $this->_child_arr[$node->getId()] = $node;
- $node->setParentId($this->_id);
- $node->setParentNode($this);
- }
-
- function addChildArr(&$node_arr)
- {
- $key_arr = array_keys($node_arr);
- $num_key = count($key_arr);
-
- for ($i = 0; $i < $num_key; $i++) {
- $node = $node_arr[$key_arr[$i]];
- $this->addChild($node);
- }
- }
-
- function insertChildBefore($idx,&$node)
- {
- $key_arr = array_keys($this->_child_arr);
- $num_key = count($key_arr);
- $tmp_arr = arry();
-
- for ($i = 0;$i < $num_key;$i++) {
- if ($i == $idx) {
- $tmp_arr[$node->getId()] = $node;
- }
- $tmp_arr[$key_arr[$i]] = $this->_child_arr[$key_arr[$i]];
- }
- $this->_child_arr = $tmp_arr;
- }
-
- function insertChildAfter($idx,&$node)
- {
- $key_arr = array_keys($this->_child_arr);
- $num_key = count($key_arr);
- $tmp_arr = arry();
-
- for ($i = 0;$i < $num_key;$i++) {
- $tmp_arr[$key_arr[$i]] = $this->_child_arr[$key_arr[$i]];
- if ($i == $idx) {
- $tmp_arr[$node->getId()] = $node;
- }
- }
- $this->_child_arr = $tmp_arr;
- }
-
- function setId($id)
- {
- $this->_id = $id;
- }
-
- function setName($name)
- {
- $this->_name = $name;
- }
-
- function setNamepace($nmspc)
- {
- $this->_nmspc = $nmspc;
- }
-
- function setNamespaceAlias($nmspc_alias)
- {
- $this->_nmspc_alias = $nmspc_alias;
- }
-
- function setContent($content)
- {
- $this->_content = $content;
- }
-
- function setEmptyElem($mt_elem_flg)
- {
- $this->_mt_elem_flg = $mt_elem_flg;
- }
-
- function setAttr($attr_nm,$attr_val)
- {
- $this->_attr_arr[$attr_nm] = $attr_val;
- }
-
- function setAttrArr($attr_arr)
- {
- $this->_attr_arr = $attr_arr;
- }
-
- function setParentId($id)
- {
- $this->_parent_id = $id;
- }
-
- function setParentNode(&$node)
- {
- $this->_parent_node = $node;
- }
-
- function getId()
- {
- return($this->_id);
- }
-
- function getName()
- {
- return($this->_name);
- }
-
- function getNamespace()
- {
- return($this->_nmspc);
- }
-
- function getNamespaceAlias()
- {
- return($this->_nmspc_alias);
- }
-
- function getContent()
- {
- return($this->_content);
- }
-
- function getAttr($attr_nm)
- {
- if (isset($this->_attr_arr[$attr_nm])) {
- return($this->_attr_arr[$attr_nm]);
- } else {
- return(NULL);
- }
- }
-
- function getAttrArr()
- {
- return($this->_attr_arr);
- }
-
- function getParentId()
- {
- return($this->parent_id);
- }
-
- function getParentNode()
- {
- return($this->_parent_node);
- }
-
- function getChild($id)
- {
- if (isset($this->_child_arr[$id])) {
- return($this->_child_arr[$id]);
- } else {
- return(FALSE);
- }
- }
-
- function getFirstChild()
- {
- $id_arr = array_keys($this->_child_arr);
- $num_child = count($id_arr);
-
- if ($num_child > 0) {
- return($this->_child_arr[$id_arr[0]]);
- } else {
- return(FALSE);
- }
- }
-
- function getLastChild()
- {
- $id_arr = array_keys($this->_child_arr);
- $num_child = count($id_arr);
-
- if ($num_child > 0) {
- return($this->_child_arr[$id_arr[$num_child - 1]]);
- } else {
- return(FALSE);
- }
- }
-
- function getChildByIdx($idx)
- {
- $id_arr = array_keys($this->_child_arr);
-
- if (isset($this->_child_arr[$id_arr[$idx]])) {
- return($this->_child_arr[$id_arr[$idx]]);
- } else {
- return(FALSE);
- }
- }
-
- function getNumChild()
- {
- return(count($this->_child_arr));
- }
-
- function removeChild($id)
- {
- unset($this->_child_arr[$id]);
- }
-
- function removeChildByIdx($idx)
- {
- $key_arr = array_keys($this->_child_arr);
- unset($this->_child_arr[$key_arr[$idx]]);
- }
-
- function removeFirstChild()
- {
- $key_arr = array_keys($this->_child_arr);
- unset($this->_child_arr[$key_arr[0]]);
- }
-
- function removeLastChild()
- {
- $key_arr = array_keys($this->_child_arr);
- unset($this->_child_arr[$key_arr[count($key_arr)-1]]);
- }
-
- function dumpXML($indent_str = "\t")
- {
- $attr_txt = $this->_dumpAttr();
- $name = $this->_dumpName();
- $xmlns = $this->_dumpXmlns();
- $lvl = $this->_getCurrentLevel();
- $indent = str_pad('',$lvl,$indent_str);
-
- if ($this->_mt_elem_flg) {
- $tag = "$indent<$name$xmlns$attr_txt />";
- return($tag);
- } else {
- $key_arr = array_keys($this->_child_arr);
- $num_child = count($key_arr);
-
- $tag = "$indent<$name$xmlns$attr_txt>$this->_content";
-
- for ($i = 0;$i < $num_child;$i++) {
- $node = $this->_child_arr[$key_arr[$i]];
-
- $child_txt = $node->dumpXML($indent_str);
- $tag .= "\n$child_txt";
- }
-
- $tag .= ($num_child > 0 ? "\n$indent</$name>" : "</$name>");
- return($tag);
- }
- }
-
- function _dumpAttr()
- {
- $id_arr = array_keys($this->_attr_arr);
- $id_arr_cnt = count($id_arr);
- $attr_txt = '';
-
- for($i = 0;$i < $id_arr_cnt;$i++) {
- $key = $id_arr[$i];
- $attr_txt .= " $key=\"{$this->_attr_arr[$key]}\"";
- }
-
- return($attr_txt);
- }
-
- function _dumpName()
- {
- $alias = $this->getNamespaceAlias();
- if ($alias == '') {
- return($this->getName());
- } else {
- return("$alias:" . $this->getName());
- }
- }
-
- function _dumpXmlns()
- {
- $nmspc = $this->getNamespace();
- $alias = $this->getNamespaceAlias();
-
- if ($nmspc != '') {
- if ($alias == '') {
- return(" xmlns=\"" . $nmspc . "\"");
- } else {
- return(" xmlns:$alias=\"" . $nmspc . "\"");
- }
- } else {
- return('');
- }
- }
-
- function _getCurrentLevel()
- {
- if ($this->_parent_id === FALSE) {
- return(0);
- } else {
- $node = $this->getParentNode();
- $lvl = $node->_getCurrentLevel();
- $lvl++;
- return($lvl);
- }
- }
-}
-
-class MathMLNode extends XMLNode
-{
- function MathMLNode($id = NULL)
- {
- parent::XMLNode($id);
- }
-
- function removeBrackets()
- {
- if ($this->_name == 'mrow') {
- if ($c_node_0 = $this->getFirstChild()) {
- $c_node_0->isLeftBracket() ? $this->removeFirstChild() : 0;
- }
-
- if ($c_node_0 = $this->getLastChild()) {
- $c_node_0->isRightBracket() ? $this->removeLastChild() : 0;
- }
- }
- }
-
- function isLeftBracket()
- {
- switch ($this->_content) {
- case '{':
- case '[':
- case '(':
- return(TRUE);
- break;
- }
- return(FALSE);
- }
-
- function isRightBracket()
- {
- switch ($this->_content) {
- case '}':
- case ']':
- case ')':
- return(TRUE);
- break;
- }
- return(FALSE);
- }
-}
-
-class ASCIIMathPHP
-{
- var $_expr;
- var $_curr_expr;
- var $_prev_expr;
- var $_symbol_arr;
- var $_node_arr;
- var $_node_cntr;
-
- function ASCIIMathPHP($symbol_arr,$expr = NULL)
- {
- $this->_symbol_arr = $symbol_arr;
- if (isset($expr)) {
- $this->setExpr($expr);
- }
- }
-
- /**
- * Returns an empty node (containing a non-breaking space) 26-Apr-2006
- *
- * Used when an expression is incomplete
- *
- * @return object
- *
- * @access private
- */
- function emptyNode()
- {
- $tmp_node = $this->createNode();
- $tmp_node->setName('mn');
- $tmp_node->setContent('&#' . hexdec('200B') . ';');
- return $tmp_node;
- }
-
- function pushExpr($prefix) // 2005-06-11 wes
- {
- $this->_curr_expr = $prefix . $this->_curr_expr;
- }
-
- function setExpr($expr)
- {
- $this->_expr = $expr;
- $this->_curr_expr = $expr;
- $this->_prev_expr = $expr;
-
- $this->_node_arr = array();
- $this->_node_cntr = 0;
- }
-
- function genMathML($attr_arr = NULL)
- {
- // <math> node
- $node_0 = $this->createNode();
- $node_0->setName('math');
- $node_0->setNamepace('http://www.w3.org/1998/Math/MathML');
-
- // <mstyle> node
- if (isset($attr_arr)) {
- $node_1 = $this->createNode();
- $node_1->setName('mstyle');
- $node_1->setAttrArr($attr_arr);
-
- $node_arr = $this->parseExpr();
-
- $node_1->addChildArr($node_arr);
- $node_0->addChild($node_1);
- } else {
- $node_arr = $this->parseExpr();
- $node_0->addChildArr($node_arr);
- }
-
- return TRUE;
- }
-
- /*
- function mergeNodeArr(&$node_arr_0,&$node_arr_1)
- {
- $key_arr_0 = array_keys($node_arr_0);
- $key_arr_1 = array_keys($node_arr_1);
-
- $num_key_0 = count($key_arr_0);
- $num_key_1 = count($key_arr_1);
-
- $merge_arr = array();
-
- for ($i = 0;$i < $num_key_0;$i++) {
- $merge_arr[$key_arr_0[$i]] = $node_arr_0[$key_arr_0[$i]];
- }
-
- for ($j = 0;$j < $num_key_1;$i++) {
- $merge_arr[$key_arr_1[$i]] = $node_arr_1[$key_arr_1[$i]];
- }
-
- return($merge_arr);
- }
- */
-
- //Broken out of parseExpr Sept 7, 2006 David Lippman for
- //ASCIIMathML 1.4.7 compatibility
- function parseIntExpr()
- {
- $sym_0 = $this->getSymbol();
- $node_0 = $this->parseSmplExpr();
- $sym = $this->getSymbol();
-
- if (isset($sym['infix']) && $sym['input'] != '/') {
- $this->chopExpr($sym['symlen']);
- $node_1 = $this->parseSmplExpr();
-
- if ($node_1 === FALSE) { //show box in place of missing argument
- $node_1 = $this->emptyNode();//??
- } else {
- $node_1->removeBrackets();
- }
-
- // If 'sub' -- subscript
- if ($sym['input'] == '_') {
-
- $sym_1 = $this->getSymbol();
-
- // If 'sup' -- superscript
- if ($sym_1['input'] == '^') {
- $this->chopExpr($sym_1['symlen']);
- $node_2 = $this->parseSmplExpr();
- $node_2->removeBrackets();
-
- $node_3 = $this->createNode();
- $node_3->setName(isset($sym_0['underover']) ? 'munderover' : 'msubsup');
- $node_3->addChild($node_0);
- $node_3->addChild($node_1);
- $node_3->addChild($node_2);
-
- $node_4 = $this->createNode();
- $node_4->setName('mrow');
- $node_4->addChild($node_3);
-
- return $node_4;
- } else {
- $node_2 = $this->createNode();
- $node_2->setName(isset($sym_0['underover']) ? 'munder' : 'msub');
- $node_2->addChild($node_0);
- $node_2->addChild($node_1);
-
- return $node_2;
- }
- } else {
- $node_2 = $this->createNode();
- $node_2->setName($sym['tag']);
- $node_2->addChild($node_0);
- $node_2->addChild($node_1);
-
- return($node_2);
- }
- } elseif ($node_0 !== FALSE) {
- return($node_0);
- } else {
- return $this->emptyNode();
- }
-
- }
-
- function parseExpr()
- {
- // Child/Fragment array
- $node_arr = array();
-
- // Deal whole expressions like 'ax + by + c = 0' etc.
- do {
- $sym_0 = $this->getSymbol();
- $node_0 = $this->parseIntExpr();
- $sym = $this->getSymbol();
- // var_dump($sym);
-
- if (isset($sym['infix']) && $sym['input'] == '/') {
- $this->chopExpr($sym['symlen']);
- $node_1 = $this->parseIntExpr();
-
- if ($node_1 === FALSE) { //should show box in place of missing argument
- $node_1 = $this->emptyNode();
- continue;
- }
-
- $node_1->removeBrackets();
-
- // If 'div' -- divide
- $node_0->removeBrackets();
- $node_2 = $this->createNode();
- $node_2->setName($sym['tag']);
- $node_2->addChild($node_0);
- $node_2->addChild($node_1);
- $node_arr[$node_2->getId()] = $node_2;
-
- } elseif ($node_0 !== FALSE) {
- $node_arr[$node_0->getId()] = $node_0;
- }
- } while (!isset($sym['right_bracket']) && $sym !== FALSE && $sym['output'] != '');
-
- //var_dump($sym);
- // Possibly to deal with matrices
- if (isset($sym['right_bracket'])) {
- $node_cnt = count($node_arr);
- $key_node_arr = array_keys($node_arr);
-
- if ($node_cnt > 1) {
- $node_5 = $node_arr[$key_node_arr[$node_cnt-1]];
- $node_6 = $node_arr[$key_node_arr[$node_cnt-2]];
- } else {
- $node_5 = FALSE;
- $node_6 = FALSE;
- }
-
- // Dealing with matrices
- if ($node_5 !== FALSE && $node_6 !== FALSE &&
- $node_cnt > 1 &&
- $node_5->getName() == 'mrow' &&
- $node_6->getName() == 'mo' &&
- $node_6->getContent() == ',') {
-
- // Checking if Node 5 has a LastChild
- if ($node_7 = $node_5->getLastChild()) {
- $node_7_cntnt = $node_7->getContent();
- } else {
- $node_7_cntnt = FALSE;
- }
-
- // If there is a right bracket
- if ($node_7 !== FALSE && ($node_7_cntnt == ']' || $node_7_cntnt == ')')) {
-
- // Checking if Node 5 has a firstChild
- if ($node_8 = $node_5->getFirstChild()) {
- $node_8_cntnt = $node_8->getContent();
- } else {
- $node_8_cntnt = FALSE;
- }
-
- // If there is a matching left bracket
- if ($node_8 !== FALSE &&
- (($node_8_cntnt == '(' && $node_7_cntnt == ')' && $sym['output'] != '}') ||
- ($node_8_cntnt == '[' && $node_7_cntnt == ']'))) {
-
- $is_mtrx_flg = TRUE;
- $comma_pos_arr = array();
-
- $i = 0;
-
- while ($i < $node_cnt && $is_mtrx_flg) {
- $tmp_node = $node_arr[$key_node_arr[$i]];
-
- if($tmp_node_first = $tmp_node->getFirstChild()) {
- $tnfc = $tmp_node_first->getContent();
- } else {
- $tnfc = FALSE;
- }
-
- if($tmp_node_last = $tmp_node->getLastChild()) {
- $tnlc = $tmp_node_last->getContent();
- } else {
- $tnlc = FALSE;
- }
-
- if (isset($key_node_arr[$i+1])) {
- $next_tmp_node = $node_arr[$key_node_arr[$i+1]];
- $ntnn = $next_tmp_node->getName();
- $ntnc = $next_tmp_node->getContent();
- } else {
- $ntnn = FALSE;
- $ntnc = FALSE;
- }
-
- // Checking each node in node array for matrix criteria
- if ($is_mtrx_flg) {
- $is_mtrx_flg = $tmp_node->getName() == 'mrow' &&
- ($i == $node_cnt-1 || $ntnn == 'mo' && $ntnc == ',') &&
- $tnfc == $node_8_cntnt && $tnlc == $node_7_cntnt;
- }
-
- if ($is_mtrx_flg) {
- for ($j = 0;$j < $tmp_node->getNumChild();$j++) {
- $tmp_c_node = $tmp_node->getChildByIdx($j);
-
- if ($tmp_c_node->getContent() == ',') {
- $comma_pos_arr[$i][] = $j;
- }
- }
- }
-
- if ($is_mtrx_flg && $i > 1) {
-
- $cnt_cpan = isset($comma_pos_arr[$i]) ? count($comma_pos_arr[$i]) : NULL;
- $cnt_cpap = isset($comma_pos_arr[$i-2]) ? count($comma_pos_arr[$i-2]) : NULL;
- $is_mtrx_flg = $cnt_cpan == $cnt_cpap;
- }
-
- $i += 2;
- }
-
- // If the node passes the matrix tests
- if ($is_mtrx_flg) {
- $tab_node_arr = array();
-
- for ($i = 0;$i < $node_cnt;$i += 2) {
- $tmp_key_node_arr = array_keys($node_arr);
- if (!($tmp_node = $node_arr[$tmp_key_node_arr[0]])) {
- break;
- }
- $num_child = $tmp_node->getNumChild();
- $k = 0;
-
- $tmp_node->removeFirstChild();
-
- $row_node_arr = array();
- $row_frag_node_arr = array();
-
- for ($j = 1;$j < ($num_child-1);$j++) {
- if (isset($comma_pos_arr[$i][$k]) &&
- $j == $comma_pos_arr[$i][$k]) {
-
- $tmp_node->removeFirstChild();
-
- $tmp_c_node = $this->createNode();
- $tmp_c_node->setName('mtd');
- $tmp_c_node->addChildArr($row_frag_node_arr);
- $row_frag_node_arr = array();
-
- $row_node_arr[$tmp_c_node->getId()] = $tmp_c_node;
-
- $k++;
- } else {
-
- if ($tmp_c_node = $tmp_node->getFirstChild()) {
- $row_frag_node_arr[$tmp_c_node->getId()] = $tmp_c_node;
- $tmp_node->removeFirstChild();
- }
- }
- }
-
- $tmp_c_node = $this->createNode();
- $tmp_c_node->setName('mtd');
- $tmp_c_node->addChildArr($row_frag_node_arr);
-
- $row_node_arr[$tmp_c_node->getId()] = $tmp_c_node;
-
- if (count($node_arr) > 2) {
- $tmp_key_node_arr = array_keys($node_arr);
- unset($node_arr[$tmp_key_node_arr[0]]);
- unset($node_arr[$tmp_key_node_arr[1]]);
- }
-
- $tmp_c_node = $this->createNode();
- $tmp_c_node->setName('mtr');
- $tmp_c_node->addChildArr($row_node_arr);
-
- $tab_node_arr[$tmp_c_node->getId()] = $tmp_c_node;
- }
-
- $tmp_c_node = $this->createNode();
- $tmp_c_node->setName('mtable');
- $tmp_c_node->addChildArr($tab_node_arr);
-
- if (isset($sym['invisible'])) {
- $tmp_c_node->setAttr('columnalign','left');
- }
-
- $key_node_arr = array_keys($node_arr);
- $tmp_c_node->setId($key_node_arr[0]);
-
- $node_arr[$tmp_c_node->getId()] = $tmp_c_node;
- }
- }
- }
- }
-
- $this->chopExpr($sym['symlen']);
- if (!isset($sym['invisible'])) {
- $node_7 = $this->createNode();
- $node_7->setName('mo');
- $node_7->setContent($sym['output']);
- $node_arr[$node_7->getId()] = $node_7;
- }
- }
-
- return($node_arr);
- }
-
- function parseSmplExpr()
- {
- $sym = $this->getSymbol();
-
- if (!$sym || isset($sym['right_bracket'])) //return FALSE;
- return $this->emptyNode();
-
- $this->chopExpr($sym['symlen']);
-
- // 2005-06-11 wes: add definition type support
- if(isset($sym['definition'])) {
- $this->pushExpr($sym['output']);
- $sym = $this->getSymbol();
- $this->chopExpr($sym['symlen']);
- }
-
- if (isset($sym['left_bracket'])) {
- $node_arr = $this->parseExpr();
-
- if (isset($sym['invisible'])) {
- $node_0 = $this->createNode();
- $node_0->setName('mrow');
- $node_0->addChildArr($node_arr);
-
- return($node_0);
- } else {
- $node_0 = $this->createNode();
- $node_0->setName('mo');
- $node_0->setContent($sym['output']);
-
- $node_1 = $this->createNode();
- $node_1->setName('mrow');
- $node_1->addChild($node_0);
- $node_1->addChildArr($node_arr);
-
- return($node_1);
- }
- } elseif (isset($sym['unary'])) {
-
- if ($sym['input'] == 'sqrt') {
- $node_0 = $this->parseSmplExpr();
- $node_0->removeBrackets();
-
- $node_1 = $this->createNode();
- $node_1->setName($sym['tag']);
- $node_1->addChild($node_0);
-
- return($node_1);
- } elseif (isset($sym['func'])) { //added 2006-9-7 David Lippman
- $expr = ltrim($this->getCurrExpr());
- $st = $expr{0};
- $node_0 = $this->parseSmplExpr();
- //$node_0->removeBrackets();
- if ($st=='^' || $st == '_' || $st=='/' || $st=='|' || $st==',') {
- $node_1 = $this->createNode();
- $node_1->setName($sym['tag']);
- $node_1->setContent($sym['output']);
- $this->setCurrExpr($expr);
- return($node_1);
- } else {
- $node_1 = $this->createNode();
- $node_1->setName('mrow');
- $node_2 = $this->createNode();
- $node_2->setName($sym['tag']);
- $node_2->setContent($sym['output']);
- $node_1->addChild($node_2);
- $node_1->addChild($node_0);
- return($node_1);
- }
- } elseif ($sym['input'] == 'text' || $sym['input'] == 'mbox' || $sym['input'] == '"') {
- $expr = ltrim($this->getCurrExpr());
- if ($sym['input']=='"') {
- $end_brckt = '"';
- $txt = substr($expr,0,strpos($expr,$end_brckt));
- } else {
- switch($expr{0}) {
- case '(':
- $end_brckt = ')';
- break;
- case '[':
- $end_brckt = ']';
- break;
- case '{':
- $end_brckt = '}';
- break;
- default:
- $end_brckt = chr(11); // A character that will never be matched.
- break;
- }
- $txt = substr($expr,1,strpos($expr,$end_brckt)-1);
- }
-
- //$txt = substr($expr,1,strpos($expr,$end_brckt)-1);
- $len = strlen($txt);
-
- $node_0 = $this->createNode();
- $node_0->setName('mrow');
-
- if ($len > 0) {
- if ($txt{0} == " ") {
- $node_1 = $this->createNode();
- $node_1->setName('mspace');
- $node_1->setAttr('width','1ex');
-
- $node_0->addChild($node_1);
- }
-
- $node_3 = $this->createNode();
- $node_3->setName($sym['tag']);
- $node_3->setContent(trim($txt));
-
- $node_0->addChild($node_3);
-
- if ($len > 1 && $txt{$len-1} == " ") {
- $node_2 = $this->createNode();
- $node_2->setName('mspace');
- $node_2->setAttr('width','1ex');
-
- $node_0->addChild($node_2);
- }
-
- $this->chopExpr($len+2);
- }
- return($node_0);
-
- } elseif (isset($sym['acc'])) {
- $node_0 = $this->parseSmplExpr();
- $node_0->removeBrackets();
-
- $node_1 = $this->createNode();
- $node_1->setName($sym['tag']);
- $node_1->addChild($node_0);
-
- $node_2 = $this->createNode();
- $node_2->setName('mo');
- $node_2->setContent($sym['output']);
-
- $node_1->addChild($node_2);
- return($node_1);
- } else {
- // Font change commands -- to complete
- }
- } elseif (isset($sym['binary'])) {
- $node_arr = array();
-
- $node_0 = $this->parseSmplExpr();
- $node_0->removeBrackets();
-
- $node_1 = $this->parseSmplExpr();
- $node_1->removeBrackets();
-
- /* 2005-06-05 wes: added stackrel */
- if ($sym['input'] == 'root' || $sym['input'] == 'stackrel') {
- $node_arr[$node_1->getId()] = $node_1;
- $node_arr[$node_0->getId()] = $node_0;
- } elseif ($sym['input'] == 'frac') {
- $node_arr[$node_0->getId()] = $node_0;
- $node_arr[$node_1->getId()] = $node_1;
- }
-
- $node_2 = $this->createNode();
- $node_2->setName($sym['tag']);
- $node_2->addChildArr($node_arr);
-
- return($node_2);
- } elseif (isset($sym['infix'])) {
- $node_0 = $this->createNode();
- $node_0->setName('mo');
- $node_0->setContent($sym['output']);
-
- return($node_0);
- } elseif (isset($sym['space'])) {
- $node_0 = $this->createNode();
- $node_0->setName('mrow');
-
- $node_1 = $this->createNode();
- $node_1->setName('mspace');
- $node_1->setAttr('width',$sym['space']);
-
- $node_2 = $this->createNode();
- $node_2->setName($sym['tag']);
- $node_2->setContent($sym['output']);
-
- $node_3 = $this->createNode();
- $node_3->setName('mspace');
- $node_3->setAttr('width',$sym['space']);
-
- $node_0->addChild($node_1);
- $node_0->addChild($node_2);
- $node_0->addChild($node_3);
-
- return($node_0);
- } else {
-
- // A constant
- $node_0 = $this->createNode();
- $node_0->setName($sym['tag']);
- $node_0->setContent($sym['output']);
- return($node_0);
- }
-
- // Return an empty node
- return $this->emptyNode();
- }
-
- function getMathML()
- {
- $root = $this->_node_arr[0];
- return($root->dumpXML());
- }
-
- function getCurrExpr()
- {
- return($this->_curr_expr);
- }
-
- function setCurrExpr($str)
- {
- $this->_curr_expr = $str;
- }
-
- function getExpr()
- {
- return($this->_expr);
- }
-
- function getPrevExpr()
- {
- return($this->_prev_expr);
- }
-
- function createNode()
- {
- $node = new MathMLNode($this->_node_cntr);
- // $node->setNamespaceAlias('m');
- $this->_node_arr[$this->_node_cntr] = $node;
- $this->_node_cntr++;
- return($node);
- }
-
- /**
- * Gets the largest symbol in the expression (greedy). Changed from non-greedy 26-Apr-2006
- *
- * @parameter boolean[optional] Chop original string?
- *
- * @return mixed
- *
- * @access private
- */
- function getSymbol($chop_flg = FALSE)
- {
- // Implemented a reverse symbol matcher.
- // Instead of going front to back, it goes back to front. Steven 26-Apr-2006
- $chr_cnt = strlen($this->_curr_expr);
-
- if ($chr_cnt == 0) return FALSE;
-
- for ($i = $chr_cnt; $i > 0; $i--) {
- $sym_0 = substr($this->_curr_expr,0,$i);
-
- // Reading string for numeric values
- if (is_numeric($sym_0)) {
-
- if ($chop_flg) $this->chopExpr($i);
- return array('input'=>$sym_0, 'tag'=>'mn', 'output'=>$sym_0, 'symlen'=>$i);
-
- } elseif (isset($this->_symbol_arr[$sym_0])) {
-
- if ($chop_flg) $this->chopExpr($i);
- $sym_arr = $this->_symbol_arr[$sym_0];
- $sym_arr['symlen'] = $i;
- return $sym_arr;
- }
- }
-
- // Reading string for alphabetic constants and the minus sign
- $char = $this->_curr_expr{0};
- $len_left = $chop_flg ? $this->chopExpr(1) : strlen($this->_curr_expr)-1;
-
- // Deals with expressions of length 1
- if ($len_left == 0 && isset($this->_symbol_arr[$char])) {
- $sym_arr = $this->_symbol_arr[$char];
- $sym_arr['symlen'] = 1;
- return $sym_arr;
- } else {
- $tag = preg_match('/[a-z]/i',$char) ? 'mi' : 'mo';
- return array('input'=>$char, 'tag'=>$tag, 'output'=>$char, 'symlen'=>1);
- }
- }
-
- function chopExpr($strlen)
- {
- $this->_prev_expr = $this->_curr_expr;
-
- if ($strlen == strlen($this->_curr_expr)) {
- $this->_curr_expr = '';
- return(0);
- } else {
- $this->_curr_expr = ltrim(substr($this->_curr_expr,$strlen));
- return(strlen($this->_curr_expr));
- }
- }
-}
Deleted: trunk/lib/ASCIIMathPHP/ASCIIMathPHP.cfg.php
===================================================================
--- trunk/lib/ASCIIMathPHP/ASCIIMathPHP.cfg.php 2012-11-15 10:29:20 UTC (rev 8468)
+++ trunk/lib/ASCIIMathPHP/ASCIIMathPHP.cfg.php 2012-11-15 10:34:21 UTC (rev 8469)
@@ -1,217 +0,0 @@
-<?php
-
-$symbol_arr = array(
-
-// Greek symbols
-'alpha' => array( 'input'=>'alpha','tag'=>'mi', 'output'=>'&#' . hexdec('03B1') . ';'),
-'beta' => array( 'input'=>'beta','tag'=>'mi', 'output'=>'&#' . hexdec('03B2') . ';'),
-'chi' => array( 'input'=>'chi','tag'=>'mi', 'output'=>'&#' . hexdec('03C7') . ';'),
-'delta' => array( 'input'=>'delta','tag'=>'mi', 'output'=>'&#' . hexdec('03B4') . ';'),
-'Delta' => array( 'input'=>'Delta','tag'=>'mo', 'output'=>'&#' . hexdec('0394') . ';'),
-'epsi' => array( 'input'=>'epsi','tag'=>'mi', 'output'=>'&#' . hexdec('03B5') . ';'),
-'varepsilon' => array( 'input'=>'varepsilon','tag'=>'mi', 'output'=>'&#' . hexdec('025B') . ';'),
-'eta' => array( 'input'=>'eta','tag'=>'mi', 'output'=>'&#' . hexdec('03B7') . ';'),
-'gamma' => array( 'input'=>'gamma','tag'=>'mi', 'output'=>'&#' . hexdec('03B3') . ';'),
-'Gamma' => array( 'input'=>'Gamma','tag'=>'mi', 'output'=>'&#' . hexdec('0393') . ';'),
-'iota' => array( 'input'=>'iota','tag'=>'mi', 'output'=>'&#' . hexdec('03B9') . ';'),
-'kappa' => array( 'input'=>'kappa','tag'=>'mi', 'output'=>'&#' . hexdec('03BA') . ';'),
-'lambda' => array( 'input'=>'lambda','tag'=>'mi', 'output'=>'&#' . hexdec('03BB') . ';'),
-'Lambda' => array( 'input'=>'Lambda','tag'=>'mo', 'output'=>'&#' . hexdec('039B') . ';'),
-'mu' => array( 'input'=>'mu','tag'=>'mi', 'output'=>'&#' . hexdec('03BC') . ';'),
-'nu' => array( 'input'=>'nu','tag'=>'mi', 'output'=>'&#' . hexdec('03BD') . ';'),
-'omega' => array( 'input'=>'omega','tag'=>'mi', 'output'=>'&#' . hexdec('03C9') . ';'),
-'Omega' => array( 'input'=>'Omega','tag'=>'mo', 'output'=>'&#' . hexdec('03A9') . ';'),
-'phi' => array( 'input'=>'phi','tag'=>'mi', 'output'=>'&#' . hexdec('03C6') . ';'),
-'varphi' => array( 'input'=>'varphi','tag'=>'mi', 'output'=>'&#' . hexdec('03D5') . ';'),
-'Phi' => array( 'input'=>'Phi','tag'=>'mo', 'output'=>'&#' . hexdec('03A6') . ';'),
-'pi' => array( 'input'=>'pi','tag'=>'mi', 'output'=>'&#' . hexdec('03C0') . ';'),
-'Pi' => array( 'input'=>'Pi','tag'=>'mo', 'output'=>'&#' . hexdec('03A0') . ';'),
-'psi' => array( 'input'=>'psi','tag'=>'mi', 'output'=>'&#' . hexdec('03C8') . ';'),
-'rho' => array( 'input'=>'rho','tag'=>'mi', 'output'=>'&#' . hexdec('03C1') . ';'),
-'sigma' => array( 'input'=>'sigma','tag'=>'mi', 'output'=>'&#' . hexdec('03C3') . ';'),
-'Sigma' => array( 'input'=>'Sigma','tag'=>'mo', 'output'=>'&#' . hexdec('03A3') . ';'),
-'tau' => array( 'input'=>'tau','tag'=>'mi', 'output'=>'&#' . hexdec('03C4') . ';'),
-'theta' => array( 'input'=>'theta','tag'=>'mi', 'output'=>'&#' . hexdec('03B8') . ';'),
-'vartheta' => array( 'input'=>'vartheta','tag'=>'mi', 'output'=>'&#' . hexdec('03D1') . ';'),
-'Theta' => array( 'input'=>'Theta','tag'=>'mo', 'output'=>'&#' . hexdec('0398') . ';'),
-'upsilon' => array( 'input'=>'upsilon','tag'=>'mi', 'output'=>'&#' . hexdec('03C5') . ';'),
-'xi' => array( 'input'=>'xi','tag'=>'mi', 'output'=>'&#' . hexdec('03BE') . ';'),
-'Xi' => array( 'input'=>'alpha','tag'=>'mo', 'output'=>'&#' . hexdec('039E') . ';'),
-'zeta' => array( 'input'=>'zeta','tag'=>'mi', 'output'=>'&#' . hexdec('03B6') . ';'),
-
-// Binary operation symbols
-'*' => array( 'input'=>'*','tag'=>'mo', 'output'=>'&#' . hexdec('22C5') . ';'),
-'**' => array( 'input'=>'**','tag'=>'mo', 'output'=>'&#' . hexdec('22C6') . ';'),
-'//' => array( 'input'=>'//','tag'=>'mo', 'output'=>'/'),
-'\\\\' => array( 'input'=>'\\\\','tag'=>'mo', 'output'=>'\\'),
-'xx' => array( 'input'=>'xx','tag'=>'mo', 'output'=>'&#' . hexdec('00D7') . ';'),
-'-:' => array( 'input'=>'-:','tag'=>'mo', 'output'=>'&#' . hexdec('00F7') . ';'),
-'@' => array( 'input'=>'@','tag'=>'mo', 'output'=>'&#' . hexdec('2218') . ';'),
-'o+' => array( 'input'=>'o+','tag'=>'mo', 'output'=>'&#' . hexdec('2295') . ';'),
-'ox' => array( 'input'=>'ox','tag'=>'mo', 'output'=>'&#' . hexdec('2297') . ';'),
-'sum' => array( 'input'=>'sum','tag'=>'mo', 'output'=>'&#' . hexdec('2211') . ';', 'underover'=>TRUE),
-'prod' => array( 'input'=>'prod','tag'=>'mo', 'output'=>'&#' . hexdec('220F') . ';', 'underover'=>TRUE),
-'^^' => array( 'input'=>'^^','tag'=>'mo', 'output'=>'&#' . hexdec('2227') . ';'),
-'^^^' => array( 'input'=>'^^^','tag'=>'mo', 'output'=>'&#' . hexdec('22C0') . ';', 'underover'=>TRUE),
-'vv' => array( 'input'=>'vv','tag'=>'mo', 'output'=>'&#' . hexdec('2228') . ';'),
-'vvv' => array( 'input'=>'vvv','tag'=>'mo', 'output'=>'&#' . hexdec('22C1') . ';', 'underover'=>TRUE),
-'nn' => array( 'input'=>'nn','tag'=>'mo', 'output'=>'&#' . hexdec('2229') . ';'),
-'nnn' => array( 'input'=>'nnn','tag'=>'mo', 'output'=>'&#' . hexdec('22C5') . ';', 'underover'=>TRUE),
-'uu' => array( 'input'=>'uu','tag'=>'mo', 'output'=>'&#' . hexdec('222A') . ';'),
-'uuu' => array( 'input'=>'uuu','tag'=>'mo', 'output'=>'&#' . hexdec('22C3') . ';', 'underover'=>TRUE),
-
-// Binary relation symbols
-'!=' => array( 'input'=>'!=','tag'=>'mo', 'output'=>'&#' . hexdec('2260') . ';'),
-':=' => array( 'input'=>':=','tag'=>'mo', 'output'=>':=' ), /* 2005-06-05 wes */
-'<' => array( 'input'=>'<','tag'=>'mo', 'output'=>'<'),
-'lt' => array( 'input'=>'lt','tag'=>'mo', 'output'=>'<'), /* 2005-06-05 wes */
-'<=' => array( 'input'=>'<=','tag'=>'mo', 'output'=>'&#' . hexdec('2264') . ';'),
-'lt=' => array( 'input'=>'lt=','tag'=>'mo', 'output'=>'&#' . hexdec('2264') . ';'),
-'le' => array( 'input'=>'le','tag'=>'mo', 'output'=>'&#' . hexdec('2264') . ';'), /* 2005-06-05 wes */
-'>' => array( 'input'=>'>','tag'=>'mo', 'output'=>'>'),
-'>=' => array( 'input'=>'>=','tag'=>'mo', 'output'=>'&#' . hexdec('2265') . ';'),
-'qeq' => array( 'input'=>'geq','tag'=>'mo', 'output'=>'&#' . hexdec('2265') . ';'),
-'-<' => array( 'input'=>'-<','tag'=>'mo', 'output'=>'&#' . hexdec('227A') . ';'),
-'-lt' => array( 'input'=>'-lt','tag'=>'mo', 'output'=>'&#' . hexdec('227A') . ';'),
-'>-' => array( 'input'=>'>-','tag'=>'mo', 'output'=>'&#' . hexdec('227B') . ';'),
-'in' => array( 'input'=>'in','tag'=>'mo', 'output'=>'&#' . hexdec('2208') . ';'),
-'!in' => array( 'input'=>'!in','tag'=>'mo', 'output'=>'&#' . hexdec('2209') . ';'),
-'sub' => array( 'input'=>'sub','tag'=>'mo', 'output'=>'&#' . hexdec('2282') . ';'),
-'sup' => array( 'input'=>'sup','tag'=>'mo', 'output'=>'&#' . hexdec('2283') . ';'),
-'sube' => array( 'input'=>'sube','tag'=>'mo', 'output'=>'&#' . hexdec('2286') . ';'),
-'supe' => ...
[truncated message content] |
|
From: <var...@us...> - 2012-11-15 10:44:44
|
Revision: 8471
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8471&view=rev
Author: vargenau
Date: 2012-11-15 10:44:32 +0000 (Thu, 15 Nov 2012)
Log Message:
-----------
PHP 5 only
Modified Paths:
--------------
trunk/lib/ErrorManager.php
Added Paths:
-----------
trunk/lib/HtmlElement.php
Removed Paths:
-------------
trunk/lib/HtmlElement.php
trunk/lib/HtmlElement5.php
Modified: trunk/lib/ErrorManager.php
===================================================================
--- trunk/lib/ErrorManager.php 2012-11-15 10:41:15 UTC (rev 8470)
+++ trunk/lib/ErrorManager.php 2012-11-15 10:44:32 UTC (rev 8471)
@@ -679,11 +679,7 @@
}
}
-if (check_php_version(5, 2)) {
- require_once(dirname(__FILE__) . '/HtmlElement5.php');
-} else {
- require_once(dirname(__FILE__) . '/HtmlElement.php');
-}
+require_once(dirname(__FILE__) . '/HtmlElement.php');
if (!isset($GLOBALS['ErrorManager'])) {
$GLOBALS['ErrorManager'] = new ErrorManager;
Deleted: trunk/lib/HtmlElement.php
===================================================================
--- trunk/lib/HtmlElement.php 2012-11-15 10:41:15 UTC (rev 8470)
+++ trunk/lib/HtmlElement.php 2012-11-15 10:44:32 UTC (rev 8471)
@@ -1,682 +0,0 @@
-<?php
-/**
- * Code for writing the HTML subset of XML.
- * @author: Jeff Dairiki
- *
- * This code is now php5 compatible. --2004-04-19 23:51:43 rurban
- * php-5.3 uses now HtmlElement5.php with public static
- *
- * Todo: Add support for a JavaScript backend, a php2js compiler.
- * HTML::div(array('onClick' => 'HTML::div(...)'))
- */
-if (!class_exists("XmlElement"))
- require_once(dirname(__FILE__) . "/XmlElement.php");
-if (class_exists("HtmlElement"))
- return;
-
-/**
- * An XML element.
- */
-//apd_set_session_trace(35);
-
-class HtmlElement extends XmlElement
-{
- function __construct($tagname /* , $attr_or_content , ...*/)
- {
- $this->_init(func_get_args());
- $this->_properties = HTML::getTagProperties($tagname);
- }
-
- function _init($args)
- {
- if (!is_array($args))
- $args = func_get_args();
-
- assert(count($args) >= 1);
- assert(is_string($args[0]));
- $this->_tag = array_shift($args);
-
- if ($args && is_array($args[0]))
- $this->_attr = array_shift($args);
- else {
- $this->_attr = array();
- if ($args && $args[0] === false)
- array_shift($args);
- }
- $this->setContent($args);
- $this->_properties = HTML::getTagProperties($this->_tag);
- }
-
- /**
- * @access protected
- * This is used by the static factory methods is class HTML.
- */
- function _init2($args)
- {
- if ($args) {
- if (is_array($args[0]))
- $this->_attr = array_shift($args);
- elseif ($args[0] === false)
- array_shift($args);
- }
-
- if (count($args) == 1 && is_array($args[0]))
- $args = $args[0];
- $this->_content = $args;
- return $this;
- }
-
- /** Add a "tooltip" to an element.
- *
- * @param $tooltip_text string The tooltip text.
- */
- function addTooltip($tooltip_text, $accesskey = null)
- {
- $this->setAttr('title', $tooltip_text);
- if ($accesskey) $this->setAccesskey($accesskey);
-
- // FIXME: this should be initialized from title by an onLoad() function.
- // (though, that may not be possible.)
- $qtooltip = str_replace("'", "\\'", $tooltip_text);
- $this->setAttr('onmouseover',
- sprintf('window.status="%s"; return true;',
- addslashes($tooltip_text)));
- $this->setAttr('onmouseout', "window.status='';return true;");
- }
-
- function setAccesskey($key)
- {
- global $WikiTheme;
- if (strlen($key) != 1) return;
- $this->setAttr("accesskey", $key);
-
- if (!empty($this->_attr['title'])) {
- if (preg_match("/\[(alt-)?(.)\]$/", $this->_attr['title'], $m)) {
- $this->_attr['title'] = preg_replace
- ("/\[(alt-)?(.)\]$/",
- "[" . $WikiTheme->tooltipAccessKeyPrefix() . "-\\2]",
- $this->_attr['title']);
- } else {
- $this->_attr['title'] .=
- " [" . $WikiTheme->tooltipAccessKeyPrefix() . "-$key]";
- }
- } else {
- $this->_attr['title'] =
- "[" . $WikiTheme->tooltipAccessKeyPrefix() . "-$key]";
- }
- }
-
- function emptyTag()
- {
- if (($this->_properties & HTMLTAG_EMPTY) == 0)
- return $this->startTag() . "</$this->_tag>";
-
- return substr($this->startTag(), 0, -1) . " />";
- }
-
- function hasInlineContent()
- {
- return ($this->_properties & HTMLTAG_ACCEPTS_INLINE) != 0;
- }
-
- function isInlineElement()
- {
- return ($this->_properties & HTMLTAG_INLINE) != 0;
- }
-}
-
-
-
-function HTML( /* $content, ... */)
-{
- return new XmlContent(func_get_args());
-}
-
-class HTML extends HtmlElement
-{
- function raw($html_text)
- {
- return new RawXml($html_text);
- }
-
- function getTagProperties($tag)
- {
- $props = &$GLOBALS['HTML_TagProperties'];
- return isset($props[$tag]) ? $props[$tag] : 0;
- }
-
- function _setTagProperty($prop_flag, $tags)
- {
- $props = &$GLOBALS['HTML_TagProperties'];
- if (is_string($tags))
- $tags = preg_split('/\s+/', $tags);
- foreach ($tags as $tag) {
- $tag = trim($tag);
- if ($tag)
- if (isset($props[$tag]))
- $props[$tag] |= $prop_flag;
- else
- $props[$tag] = $prop_flag;
- }
- }
-
- // See admin/mkfuncs shell script to generate the following static methods
-
- function link( /*...*/)
- {
- $el = new HtmlElement('link');
- return $el->_init2(func_get_args());
- }
-
- function meta( /*...*/)
- {
- $el = new HtmlElement('meta');
- return $el->_init2(func_get_args());
- }
-
- function style( /*...*/)
- {
- $el = new HtmlElement('style');
- return $el->_init2(func_get_args());
- }
-
- function script( /*...*/)
- {
- $el = new HtmlElement('script');
- return $el->_init2(func_get_args());
- }
-
- function noscript( /*...*/)
- {
- $el = new HtmlElement('noscript');
- return $el->_init2(func_get_args());
- }
-
- /****************************************/
- function a( /*...*/)
- {
- $el = new HtmlElement('a');
- return $el->_init2(func_get_args());
- }
-
- function img( /*...*/)
- {
- $el = new HtmlElement('img');
- return $el->_init2(func_get_args());
- }
-
- function br( /*...*/)
- {
- $el = new HtmlElement('br');
- return $el->_init2(func_get_args());
- }
-
- function span( /*...*/)
- {
- $el = new HtmlElement('span');
- return $el->_init2(func_get_args());
- }
-
- /****************************************/
- function h1( /*...*/)
- {
- $el = new HtmlElement('h1');
- return $el->_init2(func_get_args());
- }
-
- function h2( /*...*/)
- {
- $el = new HtmlElement('h2');
- return $el->_init2(func_get_args());
- }
-
- function h3( /*...*/)
- {
- $el = new HtmlElement('h3');
- return $el->_init2(func_get_args());
- }
-
- function h4( /*...*/)
- {
- $el = new HtmlElement('h4');
- return $el->_init2(func_get_args());
- }
-
- function h5( /*...*/)
- {
- $el = new HtmlElement('h5');
- return $el->_init2(func_get_args());
- }
-
- function h6( /*...*/)
- {
- $el = new HtmlElement('h6');
- return $el->_init2(func_get_args());
- }
-
- /****************************************/
- function hr( /*...*/)
- {
- $el = new HtmlElement('hr');
- return $el->_init2(func_get_args());
- }
-
- function div( /*...*/)
- {
- $el = new HtmlElement('div');
- return $el->_init2(func_get_args());
- }
-
- function p( /*...*/)
- {
- $el = new HtmlElement('p');
- return $el->_init2(func_get_args());
- }
-
- function pre( /*...*/)
- {
- $el = new HtmlElement('pre');
- return $el->_init2(func_get_args());
- }
-
- function blockquote( /*...*/)
- {
- $el = new HtmlElement('blockquote');
- return $el->_init2(func_get_args());
- }
-
- /****************************************/
- function em( /*...*/)
- {
- $el = new HtmlElement('em');
- return $el->_init2(func_get_args());
- }
-
- function strong( /*...*/)
- {
- $el = new HtmlElement('strong');
- return $el->_init2(func_get_args());
- }
-
- function small( /*...*/)
- {
- $el = new HtmlElement('small');
- return $el->_init2(func_get_args());
- }
-
- /****************************************/
- function tt( /*...*/)
- {
- $el = new HtmlElement('tt');
- return $el->_init2(func_get_args());
- }
-
- function u( /*...*/)
- {
- $el = new HtmlElement('u');
- return $el->_init2(func_get_args());
- }
-
- function sup( /*...*/)
- {
- $el = new HtmlElement('sup');
- return $el->_init2(func_get_args());
- }
-
- function sub( /*...*/)
- {
- $el = new HtmlElement('sub');
- return $el->_init2(func_get_args());
- }
-
- /****************************************/
- function ul( /*...*/)
- {
- $el = new HtmlElement('ul');
- return $el->_init2(func_get_args());
- }
-
- function ol( /*...*/)
- {
- $el = new HtmlElement('ol');
- return $el->_init2(func_get_args());
- }
-
- function dl( /*...*/)
- {
- $el = new HtmlElement('dl');
- return $el->_init2(func_get_args());
- }
-
- function li( /*...*/)
- {
- $el = new HtmlElement('li');
- return $el->_init2(func_get_args());
- }
-
- function dt( /*...*/)
- {
- $el = new HtmlElement('dt');
- return $el->_init2(func_get_args());
- }
-
- function dd( /*...*/)
- {
- $el = new HtmlElement('dd');
- return $el->_init2(func_get_args());
- }
-
- /****************************************/
- function table( /*...*/)
- {
- $el = new HtmlElement('table');
- return $el->_init2(func_get_args());
- }
-
- function caption( /*...*/)
- {
- $el = new HtmlElement('caption');
- return $el->_init2(func_get_args());
- }
-
- function thead( /*...*/)
- {
- $el = new HtmlElement('thead');
- return $el->_init2(func_get_args());
- }
-
- function tbody( /*...*/)
- {
- $el = new HtmlElement('tbody');
- return $el->_init2(func_get_args());
- }
-
- function tfoot( /*...*/)
- {
- $el = new HtmlElement('tfoot');
- return $el->_init2(func_get_args());
- }
-
- function tr( /*...*/)
- {
- $el = new HtmlElement('tr');
- return $el->_init2(func_get_args());
- }
-
- function td( /*...*/)
- {
- $el = new HtmlElement('td');
- return $el->_init2(func_get_args());
- }
-
- function th( /*...*/)
- {
- $el = new HtmlElement('th');
- return $el->_init2(func_get_args());
- }
-
- function colgroup( /*...*/)
- {
- $el = new HtmlElement('colgroup');
- return $el->_init2(func_get_args());
- }
-
- function col( /*...*/)
- {
- $el = new HtmlElement('col');
- return $el->_init2(func_get_args());
- }
-
- /****************************************/
- function form( /*...*/)
- {
- $el = new HtmlElement('form');
- return $el->_init2(func_get_args());
- }
-
- function input( /*...*/)
- {
- $el = new HtmlElement('input');
- return $el->_init2(func_get_args());
- }
-
- function button( /*...*/)
- {
- $el = new HtmlElement('button');
- return $el->_init2(func_get_args());
- }
-
- function option( /*...*/)
- {
- $el = new HtmlElement('option');
- return $el->_init2(func_get_args());
- }
-
- function select( /*...*/)
- {
- $el = new HtmlElement('select');
- return $el->_init2(func_get_args());
- }
-
- function textarea( /*...*/)
- {
- $el = new HtmlElement('textarea');
- return $el->_init2(func_get_args());
- }
-
- function label( /*...*/)
- {
- $el = new HtmlElement('label');
- return $el->_init2(func_get_args());
- }
-
- /****************************************/
- function area( /*...*/)
- {
- $el = new HtmlElement('area');
- return $el->_init2(func_get_args());
- }
-
- function map( /*...*/)
- {
- $el = new HtmlElement('map');
- return $el->_init2(func_get_args());
- }
-
- function frame( /*...*/)
- {
- $el = new HtmlElement('frame');
- return $el->_init2(func_get_args());
- }
-
- function frameset( /*...*/)
- {
- $el = new HtmlElement('frameset');
- return $el->_init2(func_get_args());
- }
-
- function iframe( /*...*/)
- {
- $el = new HtmlElement('iframe');
- return $el->_init2(func_get_args());
- }
-
- function nobody( /*...*/)
- {
- $el = new HtmlElement('nobody');
- return $el->_init2(func_get_args());
- }
-
- function object( /*...*/)
- {
- $el = new HtmlElement('object');
- return $el->_init2(func_get_args());
- }
-
- function embed( /*...*/)
- {
- $el = new HtmlElement('embed');
- return $el->_init2(func_get_args());
- }
-
- function param( /*...*/)
- {
- $el = new HtmlElement('param');
- return $el->_init2(func_get_args());
- }
-
- function fieldset( /*...*/)
- {
- $el = new HtmlElement('fieldset');
- return $el->_init2(func_get_args());
- }
-
- function legend( /*...*/)
- {
- $el = new HtmlElement('legend');
- return $el->_init2(func_get_args());
- }
-
- /****************************************/
- function video( /*...*/)
- {
- $el = new HtmlElement('video');
- return $el->_init2(func_get_args());
- }
-}
-
-define('HTMLTAG_EMPTY', 1);
-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,
- // %inline elements:
- 'b big i small tt ' // %fontstyle
- . 's strike u ' // (deprecated)
- . 'abbr acronym cite code dfn em kbd samp strong var ' //%phrase
- . 'a img object embed br script map q sub sup span bdo ' //%special
- . 'button input label option select textarea label ' //%formctl
-
- // %block elements which contain inline content
- . 'address h1 h2 h3 h4 h5 h6 p pre '
- // %block elements which contain either block or inline content
- . 'div fieldset frameset'
-
- // other with inline content
- . 'caption dt label legend video '
- // other with either inline or block
- . 'dd del ins li td th colgroup');
-
-HTML::_setTagProperty(HTMLTAG_INLINE,
- // %inline elements:
- 'b big i small tt ' // %fontstyle
- . 's strike u ' // (deprecated)
- . 'abbr acronym cite code dfn em kbd samp strong var ' //%phrase
- . 'a img object br script map q sub sup span bdo ' //%special
- . 'button input label option select textarea ' //%formctl
- . 'nobody iframe'
-);
-
-/**
- * Generate hidden form input fields.
- *
- * @param $query_args hash A hash mapping names to values for the hidden inputs.
- * Values in the hash can themselves be hashes. The will result in hidden inputs
- * which will reconstruct the nested structure in the resulting query args as
- * processed by PHP.
- *
- * Example:
- *
- * $args = array('x' => '2',
- * 'y' => array('a' => 'aval', 'b' => 'bval'));
- * $inputs = HiddenInputs($args);
- *
- * Will result in:
- *
- * <input type="hidden" name="x" value = "2" />
- * <input type="hidden" name="y[a]" value = "aval" />
- * <input type="hidden" name="y[b]" value = "bval" />
- *
- * @return object An XmlContent object containing the inputs.
- */
-function HiddenInputs($query_args, $pfx = false, $exclude = array())
-{
- $inputs = HTML();
-
- foreach ($query_args as $key => $val) {
- if (in_array($key, $exclude)) continue;
- $name = $pfx ? $pfx . "[$key]" : $key;
- if (is_array($val))
- $inputs->pushContent(HiddenInputs($val, $name));
- else
- $inputs->pushContent(HTML::input(array('type' => 'hidden',
- 'name' => $name,
- 'value' => $val)));
- }
- return $inputs;
-}
-
-/** Generate a <script> tag containing javascript.
- *
- * @param string $js The javascript.
- * @param string $script_args (optional) hash of script tags options
- * e.g. to provide another version or the defer attr
- * @return HtmlElement A <script> element.
- */
-function JavaScript($js, $script_args = false)
-{
- $default_script_args = array( //'version' => 'JavaScript', // not xhtml conformant
- 'type' => 'text/javascript');
- $script_args = $script_args ? array_merge($default_script_args, $script_args)
- : $default_script_args;
- if (empty($js))
- return HTML(HTML::script($script_args), "\n");
- else
- // see http://devedge.netscape.com/viewsource/2003/xhtml-style-script/
- return HTML(HTML::script($script_args,
- new RawXml((ENABLE_XHTML_XML ? "\n//<![CDATA[" : "\n<!--//")
- . "\n" . trim($js) . "\n"
- . (ENABLE_XHTML_XML ? "//]]>\n" : "// -->"))), "\n");
-}
-
-/** Conditionally display content based of whether javascript is supported.
- *
- * This conditionally (on the client side) displays one of two alternate
- * contents depending on whether the client supports javascript.
- *
- * NOTE:
- * The content you pass as arguments to this function must be block-level.
- * (This is because the <noscript> tag is block-level.)
- *
- * @param mixed $if_content Content to display if the browser supports
- * javascript.
- *
- * @param mixed $else_content Content to display if the browser does
- * not support javascript.
- *
- * @return XmlContent
- */
-function IfJavaScript($if_content = false, $else_content = false)
-{
- $html = array();
- if ($if_content) {
- $xml = AsXML($if_content);
- $js = sprintf('document.write("%s");',
- addcslashes($xml, "\0..\37!@\\\177..\377"));
- $html[] = JavaScript($js);
- }
- if ($else_content) {
- $html[] = HTML::noscript(false, $else_content);
- }
- return HTML($html);
-}
-
-// Local Variables:
-// mode: php
-// tab-width: 8
-// c-basic-offset: 4
-// c-hanging-comment-ender-p: nil
-// indent-tabs-mode: nil
-// End:
Copied: trunk/lib/HtmlElement.php (from rev 8469, trunk/lib/HtmlElement5.php)
===================================================================
--- trunk/lib/HtmlElement.php (rev 0)
+++ trunk/lib/HtmlElement.php 2012-11-15 10:44:32 UTC (rev 8471)
@@ -0,0 +1,682 @@
+<?php
+/**
+ * Code for writing the HTML subset of XML.
+ * @author: Jeff Dairiki
+ *
+ * This code is now php5 compatible. --2004-04-19 23:51:43 rurban
+ * Specialized for php-5.3: added public static 2010-06-07 09:51:37 rurban
+ *
+ * Todo: Add support for a JavaScript backend, a php2js compiler.
+ * HTML::div(array('onclick' => 'HTML::div(...)'))
+ */
+if (!class_exists("XmlElement"))
+ require_once(dirname(__FILE__) . "/XmlElement.php");
+if (class_exists("HtmlElement"))
+ return;
+
+/**
+ * An XML element.
+ */
+//apd_set_session_trace(35);
+
+class HtmlElement extends XmlElement
+{
+ function __construct($tagname /* , $attr_or_content , ...*/)
+ {
+ $this->_init(func_get_args());
+ $this->_properties = HTML::getTagProperties($tagname);
+ }
+
+ function _init($args)
+ {
+ if (!is_array($args))
+ $args = func_get_args();
+
+ assert(count($args) >= 1);
+ assert(is_string($args[0]));
+ $this->_tag = array_shift($args);
+
+ if ($args && is_array($args[0]))
+ $this->_attr = array_shift($args);
+ else {
+ $this->_attr = array();
+ if ($args && $args[0] === false)
+ array_shift($args);
+ }
+ $this->setContent($args);
+ $this->_properties = HTML::getTagProperties($this->_tag);
+ }
+
+ /**
+ * @access protected
+ * This is used by the static factory methods is class HTML.
+ */
+ function _init2($args)
+ {
+ if ($args) {
+ if (is_array($args[0]))
+ $this->_attr = array_shift($args);
+ elseif ($args[0] === false)
+ array_shift($args);
+ }
+
+ if (count($args) == 1 && is_array($args[0]))
+ $args = $args[0];
+ $this->_content = $args;
+ return $this;
+ }
+
+ /** Add a "tooltip" to an element.
+ *
+ * @param $tooltip_text string The tooltip text.
+ */
+ function addTooltip($tooltip_text, $accesskey = null)
+ {
+ $this->setAttr('title', $tooltip_text);
+ if ($accesskey) $this->setAccesskey($accesskey);
+
+ // FIXME: this should be initialized from title by an onLoad() function.
+ // (though, that may not be possible.)
+ $qtooltip = str_replace("'", "\\'", $tooltip_text);
+ $this->setAttr('onmouseover',
+ sprintf('window.status="%s"; return true;',
+ addslashes($tooltip_text)));
+ $this->setAttr('onmouseout', "window.status='';return true;");
+ }
+
+ function setAccesskey($key)
+ {
+ global $WikiTheme;
+ if (strlen($key) != 1) return;
+ $this->setAttr("accesskey", $key);
+
+ if (!empty($this->_attr['title'])) {
+ if (preg_match("/\[(alt-)?(.)\]$/", $this->_attr['title'], $m)) {
+ $this->_attr['title'] = preg_replace
+ ("/\[(alt-)?(.)\]$/",
+ "[" . $WikiTheme->tooltipAccessKeyPrefix() . "-\\2]",
+ $this->_attr['title']);
+ } else {
+ $this->_attr['title'] .=
+ " [" . $WikiTheme->tooltipAccessKeyPrefix() . "-$key]";
+ }
+ } else {
+ $this->_attr['title'] =
+ "[" . $WikiTheme->tooltipAccessKeyPrefix() . "-$key]";
+ }
+ }
+
+ function emptyTag()
+ {
+ if (($this->_properties & HTMLTAG_EMPTY) == 0)
+ return $this->startTag() . "</$this->_tag>";
+
+ return substr($this->startTag(), 0, -1) . " />";
+ }
+
+ function hasInlineContent()
+ {
+ return ($this->_properties & HTMLTAG_ACCEPTS_INLINE) != 0;
+ }
+
+ function isInlineElement()
+ {
+ return ($this->_properties & HTMLTAG_INLINE) != 0;
+ }
+}
+
+
+
+function HTML( /* $content, ... */)
+{
+ return new XmlContent(func_get_args());
+}
+
+class HTML extends HtmlElement
+{
+ public static function raw($html_text)
+ {
+ return new RawXml($html_text);
+ }
+
+ public static function getTagProperties($tag)
+ {
+ $props = &$GLOBALS['HTML_TagProperties'];
+ return isset($props[$tag]) ? $props[$tag] : 0;
+ }
+
+ public static function _setTagProperty($prop_flag, $tags)
+ {
+ $props = &$GLOBALS['HTML_TagProperties'];
+ if (is_string($tags))
+ $tags = preg_split('/\s+/', $tags);
+ foreach ($tags as $tag) {
+ $tag = trim($tag);
+ if ($tag)
+ if (isset($props[$tag]))
+ $props[$tag] |= $prop_flag;
+ else
+ $props[$tag] = $prop_flag;
+ }
+ }
+
+ // See admin/mkfuncs shell script to generate the following static methods
+
+ public static function link( /*...*/)
+ {
+ $el = new HtmlElement('link');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function meta( /*...*/)
+ {
+ $el = new HtmlElement('meta');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function style( /*...*/)
+ {
+ $el = new HtmlElement('style');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function script( /*...*/)
+ {
+ $el = new HtmlElement('script');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function noscript( /*...*/)
+ {
+ $el = new HtmlElement('noscript');
+ return $el->_init2(func_get_args());
+ }
+
+ /****************************************/
+ public static function a( /*...*/)
+ {
+ $el = new HtmlElement('a');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function img( /*...*/)
+ {
+ $el = new HtmlElement('img');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function br( /*...*/)
+ {
+ $el = new HtmlElement('br');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function span( /*...*/)
+ {
+ $el = new HtmlElement('span');
+ return $el->_init2(func_get_args());
+ }
+
+ /****************************************/
+ public static function h1( /*...*/)
+ {
+ $el = new HtmlElement('h1');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function h2( /*...*/)
+ {
+ $el = new HtmlElement('h2');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function h3( /*...*/)
+ {
+ $el = new HtmlElement('h3');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function h4( /*...*/)
+ {
+ $el = new HtmlElement('h4');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function h5( /*...*/)
+ {
+ $el = new HtmlElement('h5');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function h6( /*...*/)
+ {
+ $el = new HtmlElement('h6');
+ return $el->_init2(func_get_args());
+ }
+
+ /****************************************/
+ public static function hr( /*...*/)
+ {
+ $el = new HtmlElement('hr');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function div( /*...*/)
+ {
+ $el = new HtmlElement('div');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function p( /*...*/)
+ {
+ $el = new HtmlElement('p');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function pre( /*...*/)
+ {
+ $el = new HtmlElement('pre');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function blockquote( /*...*/)
+ {
+ $el = new HtmlElement('blockquote');
+ return $el->_init2(func_get_args());
+ }
+
+ /****************************************/
+ public static function em( /*...*/)
+ {
+ $el = new HtmlElement('em');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function strong( /*...*/)
+ {
+ $el = new HtmlElement('strong');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function small( /*...*/)
+ {
+ $el = new HtmlElement('small');
+ return $el->_init2(func_get_args());
+ }
+
+ /****************************************/
+ public static function tt( /*...*/)
+ {
+ $el = new HtmlElement('tt');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function u( /*...*/)
+ {
+ $el = new HtmlElement('u');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function sup( /*...*/)
+ {
+ $el = new HtmlElement('sup');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function sub( /*...*/)
+ {
+ $el = new HtmlElement('sub');
+ return $el->_init2(func_get_args());
+ }
+
+ /****************************************/
+ public static function ul( /*...*/)
+ {
+ $el = new HtmlElement('ul');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function ol( /*...*/)
+ {
+ $el = new HtmlElement('ol');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function dl( /*...*/)
+ {
+ $el = new HtmlElement('dl');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function li( /*...*/)
+ {
+ $el = new HtmlElement('li');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function dt( /*...*/)
+ {
+ $el = new HtmlElement('dt');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function dd( /*...*/)
+ {
+ $el = new HtmlElement('dd');
+ return $el->_init2(func_get_args());
+ }
+
+ /****************************************/
+ public static function table( /*...*/)
+ {
+ $el = new HtmlElement('table');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function caption( /*...*/)
+ {
+ $el = new HtmlElement('caption');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function thead( /*...*/)
+ {
+ $el = new HtmlElement('thead');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function tbody( /*...*/)
+ {
+ $el = new HtmlElement('tbody');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function tfoot( /*...*/)
+ {
+ $el = new HtmlElement('tfoot');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function tr( /*...*/)
+ {
+ $el = new HtmlElement('tr');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function td( /*...*/)
+ {
+ $el = new HtmlElement('td');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function th( /*...*/)
+ {
+ $el = new HtmlElement('th');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function colgroup( /*...*/)
+ {
+ $el = new HtmlElement('colgroup');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function col( /*...*/)
+ {
+ $el = new HtmlElement('col');
+ return $el->_init2(func_get_args());
+ }
+
+ /****************************************/
+ public static function form( /*...*/)
+ {
+ $el = new HtmlElement('form');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function input( /*...*/)
+ {
+ $el = new HtmlElement('input');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function button( /*...*/)
+ {
+ $el = new HtmlElement('button');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function option( /*...*/)
+ {
+ $el = new HtmlElement('option');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function select( /*...*/)
+ {
+ $el = new HtmlElement('select');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function textarea( /*...*/)
+ {
+ $el = new HtmlElement('textarea');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function label( /*...*/)
+ {
+ $el = new HtmlElement('label');
+ return $el->_init2(func_get_args());
+ }
+
+ /****************************************/
+ public static function area( /*...*/)
+ {
+ $el = new HtmlElement('area');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function map( /*...*/)
+ {
+ $el = new HtmlElement('map');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function frame( /*...*/)
+ {
+ $el = new HtmlElement('frame');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function frameset( /*...*/)
+ {
+ $el = new HtmlElement('frameset');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function iframe( /*...*/)
+ {
+ $el = new HtmlElement('iframe');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function nobody( /*...*/)
+ {
+ $el = new HtmlElement('nobody');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function object( /*...*/)
+ {
+ $el = new HtmlElement('object');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function embed( /*...*/)
+ {
+ $el = new HtmlElement('embed');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function param( /*...*/)
+ {
+ $el = new HtmlElement('param');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function fieldset( /*...*/)
+ {
+ $el = new HtmlElement('fieldset');
+ return $el->_init2(func_get_args());
+ }
+
+ public static function legend( /*...*/)
+ {
+ $el = new HtmlElement('legend');
+ return $el->_init2(func_get_args());
+ }
+
+ /****************************************/
+ public static function video( /*...*/)
+ {
+ $el = new HtmlElement('video');
+ return $el->_init2(func_get_args());
+ }
+}
+
+define('HTMLTAG_EMPTY', 1);
+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,
+ // %inline elements:
+ 'b big i small tt ' // %fontstyle
+ . 's strike u ' // (deprecated)
+ . 'abbr acronym cite code dfn em kbd samp strong var ' //%phrase
+ . 'a img object embed br script map q sub sup span bdo ' //%special
+ . 'button input label option select textarea label ' //%formctl
+
+ // %block elements which contain inline content
+ . 'address h1 h2 h3 h4 h5 h6 p pre '
+ // %block elements which contain either block or inline content
+ . 'div fieldset frameset'
+
+ // other with inline content
+ . 'caption dt label legend video '
+ // other with either inline or block
+ . 'dd del ins li td th colgroup');
+
+HTML::_setTagProperty(HTMLTAG_INLINE,
+ // %inline elements:
+ 'b big i small tt ' // %fontstyle
+ . 's strike u ' // (deprecated)
+ . 'abbr acronym cite code dfn em kbd samp strong var ' //%phrase
+ . 'a img object br script map q sub sup span bdo ' //%special
+ . 'button input label option select textarea ' //%formctl
+ . 'nobody iframe'
+);
+
+/**
+ * Generate hidden form input fields.
+ *
+ * @param $query_args hash A hash mapping names to values for the hidden inputs.
+ * Values in the hash can themselves be hashes. The will result in hidden inputs
+ * which will reconstruct the nested structure in the resulting query args as
+ * processed by PHP.
+ *
+ * Example:
+ *
+ * $args = array('x' => '2',
+ * 'y' => array('a' => 'aval', 'b' => 'bval'));
+ * $inputs = HiddenInputs($args);
+ *
+ * Will result in:
+ *
+ * <input type="hidden" name="x" value = "2" />
+ * <input type="hidden" name="y[a]" value = "aval" />
+ * <input type="hidden" name="y[b]" value = "bval" />
+ *
+ * @return object An XmlContent object containing the inputs.
+ */
+function HiddenInputs($query_args, $pfx = false, $exclude = array())
+{
+ $inputs = HTML();
+
+ foreach ($query_args as $key => $val) {
+ if (in_array($key, $exclude)) continue;
+ $name = $pfx ? $pfx . "[$key]" : $key;
+ if (is_array($val))
+ $inputs->pushContent(HiddenInputs($val, $name));
+ else
+ $inputs->pushContent(HTML::input(array('type' => 'hidden',
+ 'name' => $name,
+ 'value' => $val)));
+ }
+ return $inputs;
+}
+
+/** Generate a <script> tag containing javascript.
+ *
+ * @param string $js The javascript.
+ * @param string $script_args (optional) hash of script tags options
+ * e.g. to provide another version or the defer attr
+ * @return HtmlElement A <script> element.
+ */
+function JavaScript($js, $script_args = false)
+{
+ $default_script_args = array( //'version' => 'JavaScript', // not xhtml conformant
+ 'type' => 'text/javascript');
+ $script_args = $script_args ? array_merge($default_script_args, $script_args)
+ : $default_script_args;
+ if (empty($js))
+ return HTML(HTML::script($script_args), "\n");
+ else
+ // see http://devedge.netscape.com/viewsource/2003/xhtml-style-script/
+ return HTML(HTML::script($script_args,
+ new RawXml((ENABLE_XHTML_XML ? "\n//<![CDATA[" : "\n<!--//")
+ . "\n" . trim($js) . "\n"
+ . (ENABLE_XHTML_XML ? "//]]>\n" : "// -->"))), "\n");
+}
+
+/** Conditionally display content based of whether javascript is supported.
+ *
+ * This conditionally (on the client side) displays one of two alternate
+ * contents depending on whether the client supports javascript.
+ *
+ * NOTE:
+ * The content you pass as arguments to this function must be block-level.
+ * (This is because the <noscript> tag is block-level.)
+ *
+ * @param mixed $if_content Content to display if the browser supports
+ * javascript.
+ *
+ * @param mixed $else_content Content to display if the browser does
+ * not support javascript.
+ *
+ * @return XmlContent
+ */
+function IfJavaScript($if_content = false, $else_content = false)
+{
+ $html = array();
+ if ($if_content) {
+ $xml = AsXML($if_content);
+ $js = sprintf('document.write("%s");',
+ addcslashes($xml, "\0..\37!@\\\177..\377"));
+ $html[] = JavaScript($js);
+ }
+ if ($else_content) {
+ $html[] = HTML::noscript(false, $else_content);
+ }
+ return HTML($html);
+}
+
+// Local Variables:
+// mode: php
+// tab-width: 8
+// c-basic-offset: 4
+// c-hanging-comment-ender-p: nil
+// indent-tabs-mode: nil
+// End:
Property changes on: trunk/lib/HtmlElement.php
___________________________________________________________________
Added: svn:mergeinfo
+
Deleted: trunk/lib/HtmlElement5.php
===================================================================
--- trunk/lib/HtmlElement5.php 2012-11-15 10:41:15 UTC (rev 8470)
+++ trunk/lib/HtmlElement5.php 2012-11-15 10:44:32 UTC (rev 8471)
@@ -1,682 +0,0 @@
-<?php
-/**
- * Code for writing the HTML subset of XML.
- * @author: Jeff Dairiki
- *
- * This code is now php5 compatible. --2004-04-19 23:51:43 rurban
- * Specialized for php-5.3: added public static 2010-06-07 09:51:37 rurban
- *
- * Todo: Add support for a JavaScript backend, a php2js compiler.
- * HTML::div(array('onclick' => 'HTML::div(...)'))
- */
-if (!class_exists("XmlElement"))
- require_once(dirname(__FILE__) . "/XmlElement.php");
-if (class_exists("HtmlElement"))
- return;
-
-/**
- * An XML element.
- */
-//apd_set_session_trace(35);
-
-class HtmlElement extends XmlElement
-{
- function __construct($tagname /* , $attr_or_content , ...*/)
- {
- $this->_init(func_get_args());
- $this->_properties = HTML::getTagProperties($tagname);
- }
-
- function _init($args)
- {
- if (!is_array($args))
- $args = func_get_args();
-
- assert(count($args) >= 1);
- assert(is_string($args[0]));
- $this->_tag = array_shift($args);
-
- if ($args && is_array($args[0]))
- $this->_attr = array_shift($args);
- else {
- $this->_attr = array();
- if ($args && $args[0] === false)
- array_shift($args);
- }
- $this->setContent($args);
- $this->_properties = HTML::getTagProperties($this->_tag);
- }
-
- /**
- * @access protected
- * This is used by the static factory methods is class HTML.
- */
- function _init2($args)
- {
- if ($args) {
- if (is_array($args[0]))
- $this->_attr = array_shift($args);
- elseif ($args[0] === false)
- array_shift($args);
- }
-
- if (count($args) == 1 && is_array($args[0]))
- $args = $args[0];
- $this->_content = $args;
- return $this;
- }
-
- /** Add a "tooltip" to an element.
- *
- * @param $tooltip_text string The tooltip text.
- */
- function addTooltip($tooltip_text, $accesskey = null)
- {
- $this->setAttr('title', $tooltip_text);
- if ($accesskey) $this->setAccesskey($accesskey);
-
- // FIXME: this should be initialized from title by an onLoad() function.
- // (though, that may not be possible.)
- $qtooltip = str_replace("'", "\\'", $tooltip_text);
- $this->setAttr('onmouseover',
- sprintf('window.status="%s"; return true;',
- addslashes($tooltip_text)));
- $this->setAttr('onmouseout', "window.status='';return true;");
- }
-
- function setAccesskey($key)
- {
- global $WikiTheme;
- if (strlen($key) != 1) return;
- $this->setAttr("accesskey", $key);
-
- if (!empty($this->_attr['title'])) {
- if (preg_match("/\[(alt-)?(.)\]$/", $this->_attr['title'], $m)) {
- $this->_attr['title'] = preg_replace
- ("/\[(alt-)?(.)\]$/",
- "[" . $WikiTheme->tooltipAccessKeyPrefix() . "-\\2]",
- $this->_attr['title']);
- } else {
- $this->_attr['title'] .=
- " [" . $WikiTheme->tooltipAccessKeyPrefix() . "-$key]";
- }
- } else {
- $this->_attr['title'] =
- "[" . $WikiTheme->tooltipAccessKeyPrefix() . "-$key]";
- }
- }
-
- function emptyTag()
- {
- if (($this->_properties & HTMLTAG_EMPTY) == 0)
- return $this->startTag() . "</$this->_tag>";
-
- return substr($this->startTag(), 0, -1) . " />";
- }
-
- function hasInlineContent()
- {
- return ($this->_properties & HTMLTAG_ACCEPTS_INLINE) != 0;
- }
-
- function isInlineElement()
- {
- return ($this->_properties & HTMLTAG_INLINE) != 0;
- }
-}
-
-
-
-function HTML( /* $content, ... */)
-{
- return new XmlContent(func_get_args());
-}
-
-class HTML extends HtmlElement
-{
- public static function raw($html_text)
- {
- return new RawXml($html_text);
- }
-
- public static function getTagProperties($tag)
- {
- $props = &$GLOBALS['HTML_TagProperties'];
- return isset($props[$tag]) ? $props[$tag] : 0;
- }
-
- public static function _setTagProperty($prop_flag, $tags)
- {
- $props = &$GLOBALS['HTML_TagProperties'];
- if (is_string($tags))
- $tags = preg_split('/\s+/', $tags);
- foreach ($tags as $tag) {
- $tag = trim($tag);
- if ($tag)
- if (isset($props[$tag]))
- $props[$tag] |= $prop_flag;
- else
- $props[$tag] = $prop_flag;
- }
- }
-
- // See admin/mkfuncs shell script to generate the following static methods
-
- public static function link( /*...*/)
- {
- $el = new HtmlElement('link');
- return $el->_init2(func_get_args());
- }
-
- public static function meta( /*...*/)
- {
- $el = new HtmlElement('meta');
- return $el->_init2(func_get_args());
- }
-
- public static function style( /*...*/)
- {
- $el = new HtmlElement('style');
- return $el->_init2(func_get_args());
- }
-
- public static function script( /*...*/)
- {
- $el = new HtmlElement('script');
- return $el->_init2(func_get_args());
- }
-
- public static function noscript( /*...*/)
- {
- $el = new HtmlElement('noscript');
- return $el->_init2(func_get_args());
- }
-
- /****************************************/
- public static function a( /*...*/)
- {
- $el = new HtmlElement('a');
- return $el->_init2(func_get_args());
- }
-
- public static function img( /*...*/)
- {
- $el = new HtmlElement('img');
- return $el->_init2(func_get_args());
- }
-
- public static function br( /*...*/)
- {
- $el = new HtmlElement('br');
- return $el->_init2(func_get_args());
- }
-
- public static function span( /*...*/)
- {
- $el = new HtmlElement('span');
- return $el->_init2(func_get_args());
- }
-
- /****************************************/
- public static function h1( /*...*/)
- {
- $el = new HtmlElement('h1');
- return $el->_init2(func_get_args());
- }
-
- public static function h2( /*...*/)
- {
- $el = new HtmlElement('h2');
- return $el->_init2(func_get_args());
- }
-
- public static function h3( /*...*/)
- {
- $el = new HtmlElement('h3');
- return $el->_init2(func_get_args());
- }
-
- public static function h4( /*...*/)
- {
- $el = new HtmlElement('h4');
- return $el->_init2(func_get_args());
- }
-
- public static function h5( /*...*/)
- {
- $el = new HtmlElement('h5');
- return $el->_init2(func_get_args());
- }
-
- public static function h6( /*...*/)
- {
- $el = new HtmlElement('h6');
- return $el->_init2(func_get_args());
- }
-
- /****************************************/
- public static function hr( /*...*/)
- {
- $el = new HtmlElement('hr');
- return $el->_init2(func_get_args());
- }
-
- public static function div( /*...*/)
- {
- $el = new HtmlElement('div');
- return $el->_init2(func_get_args());
- }
-
- public static function p( /*...*/)
- {
- $el = new HtmlElement('p');
- return $el->_init2(func_get_args());
- }
-
- public static function pre( /*...*/)
- {
- $el = new HtmlElement('pre');
- return $el->_init2(func_get_args());
- }
-
- public static function blockquote( /*...*/)
- {
- $el = new HtmlElement('blockquote');
- return $el->_init2(func_get_args());
- }
-
- /****************************************/
- public static function em( /*...*/)
- {
- $el = new HtmlElement('em');
- return $el->_init2(func_get_args());
- }
-
- public static function strong( /*...*/)
- {
- $el = new HtmlElement('strong');
- return $el->_init2(func_get_args());
- }
-
- public static function small( /*...*/)
- {
- $el = new HtmlElement('small');
- return $el->_init2(func_get_args());
- }
-
- /****************************************/
- public static function tt( /*...*/)
- {
- $el = new HtmlElement('tt');
- return $el->_init2(func_get_args());
- }
-
- public static function u( /*...*/)
- {
- $el = new HtmlElement('u');
- return $el->_init2(func_get_args());
- }
-
- public static function sup( /*...*/)
- {
- $el = new HtmlElement('sup');
- return $el->_init2(func_get_args());
- }
-
- public static function sub( /*...*/)
- {
- $el = new HtmlElement('sub');
- return $el->_init2(func_get_args());
- }
-
- /****************************************/
- public static function ul( /*...*/)
- {
- $el = new HtmlElement('ul');
- return $el->_init2(func_get_args());
- }
-
- public static function ol( /*...*/)
- {
- $el = new HtmlElement('ol');
- return $el->_init2(func_get_args());
- }
-
- public static function dl( /*...*/)
- {
- $el = new HtmlElement('dl');
- return $el->_init2(func_get_args());
- }
-
- public static function li( /*...*/)
- {
- $el = new HtmlElement('li');
- return $el->_init2(func_get_args());
- }
-
- public static function dt( /*...*/)
- {
- $el = new HtmlElement('dt');
- return $el->_init2(func_get_args());
- }
-
- public static function dd( /*...*/)
- {
- $el = new HtmlElement('dd');
- return $el->_init2(func_get_args());
- }
-
- /****************************************/
- public static function table( /*...*/)
- {
- $el = new HtmlElement('table');
- return $el->_init2(func_get_args());
- }
-
- public static function caption( /*...*/)
- {
- $el = new HtmlElement('caption');
- return $el->_init2(func_get_args());
- }
-
- public static function thead( /*...*/)
- {
- $el = new HtmlElement('thead');
- return $el->_init2(func_get_args());
- }
-
- public static function tbody( /*...*/)
- {
- $el = new HtmlElement('tbody');
- return $el->_init2(func_get_args());
- }
-
- public static function tfoot( /*...*/)
- {
- $el = new HtmlElement('tfoot');
- return $el->_init2(func_get_args());
- }
-
- public static function tr( /*...*/)
- {
- $el = new HtmlElement('tr');
- return $el->_init2(func_get_args());
- }
-
- public static function td( /*...*/)
- {
- $el = new HtmlElement('td');
- return $el->_init2(func_get_args());
- }
-
- public static function th( /*...*/)
- {
- $el = new HtmlElement('th');
- return $el->_init2(func_get_args());
- }
-
- public static function colgroup( /*...*/)
- {
- $el = new HtmlElement('colgroup');
- return $el->_init2(func_get_args());
- }
-
- public static function col( /*...*/)
- {
- $el = new HtmlElement('col');
- return $el->_init2(func_get_args());
- }
-
- /****************************************/
- public static function form( /*...*/)
- {
- $el = new HtmlElement('form');
- return $el->_init2(func_get_args());
- }
-
- public static function input( /*...*/)
- {
- $el = new HtmlElement('input');
- return $el->_init2(func_get_args());
- }
-
- public static function button( /*...*/)
- {
- $el = new HtmlElement('button');
- return $el->_init2(func_get_args());
- }
-
- public static function option( /*...*/)
- {
- $el = new HtmlElement('option');
- return $el->_init2(func_get_args());
- }
-
- public static function select( /*...*/)
- {
- $el = new HtmlElement('select');
- return $el->_init2(func_get_args());
- }
-
- public static function textarea( /*...*/)
- {
- $el = new HtmlElement('textarea');
- return $el->_init2(func_get_args());
- }
-
- public static function label( /*...*/)
- {
- $el = new HtmlElement('label');
- return $el->_init2(func_get_args());
- }
-
- /****************************************/
- public static function area( /*...*/)
- {
- $el = new HtmlElement('area');
- return $el->_init2(func_get_args());
- }
-
- public static function map( /*...*/)
- {
- $el = new HtmlElement('map');
- return $el->_init2(func_get_args());
- }
-
- public static function frame( /*...*/)
- {
- $el = new HtmlElement('frame');
- return $el->_init2(func_get_args());
- }
-
- public static function frameset( /*...*/)
- {
- $el = new HtmlElement('frameset');
- return $el->_init2(func_get_args());
- }
-
- public static function iframe( /*...*/)
- {
- $el = new HtmlElement('iframe');
- return $el->_init2(func_get_args());
- }
-
- public static function nobody( /*...*/)
- {
- $el = new HtmlElement('nobody');
- return $el->_init2(func_get_args());
- }
-
- public static function object( /*...*/)
- {
- $el = new HtmlElement('object');
- return $el->_init2(func_get_args());
- }
-
- public static function embed( /*...*/)
- {
- $el = new HtmlElement('embed');
- return $el->_init2(func_get_args());
- }
-
- public static function param( /*...*/)
- {
- $el = new HtmlElement('param');
- return $el->_init2(func_get_args());
- }
-
- public static function fieldset( /*...*/)
- {
- $el = new HtmlElement('fieldset');
- return $el->_init2(func_get_args());
- }
-
- public static function legend( /*...*/)
- {
- $el = new HtmlElement('legend');
- return $el->_init2(func_get_args());
- }
-
- /****************************************/
- public static function video( /*...*/)
- {
- $el = new HtmlElement('video');
- return $el->_init2(func_get_args());
- }
-}
-
-define('HTMLTAG_EMPTY', 1);
-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,
- // %inline elements:
- 'b big i small tt ' // %fontstyle
- . 's strike u ' // (deprecated)
- . 'abbr acronym cite code dfn em kbd samp strong var ' //%phrase
- . 'a img object embed br script map q sub sup span bdo ' //%special
- . 'button input label option select textarea label ' //%formctl
-
- // %block elements which contain inline content
- . 'address h1 h2 h3 h4 h5 h6 p pre '
- // %block elements which contain either block or inline content
- . 'div fieldset frameset'
-
- // other with inline content
- . 'caption dt label legend video '
- // other with either inline or block
- . 'dd del ins li td th colgroup');
-
-HTML::_setTagProperty(HTMLTAG_INLINE,
- // %inline elements:
- 'b big i small tt ' // %fontstyle
- . 's strike u ' // (deprecated)
- . 'abbr acronym cite code dfn em kbd samp strong var ' //%phrase
- . 'a img object br script map q sub sup span bdo ' //%special
- . 'button input label option select textarea ' //%formctl
- . 'nobody iframe'
-);
-
-/**
- * Generate hidden form input fields.
- *
- * @param $query_args hash A hash mapping names to values for the hidden inputs.
- * Values in the hash can themselves be hashes. The will result in hidden inputs
- * which will reconstruct the nested structure in the resulting query args as
- * processed by PHP.
- *
- * Example:
- *
- * $args = array('x' => '2',
- * 'y' => array('a' => 'aval', 'b' => 'bval'));
- * $inputs = HiddenInputs($args);
- *
- * Will result in:
- *
- * <input type="hidden" name="x" value = "2" />
- * <input type="hidden" name="y[a]" value = "aval" />
- * <input type="hidden" name="y[b]" value = "bval" />
- *
- * @return object An XmlContent object containing the inputs.
- */
-function HiddenInputs($query_args, $pfx = false, $exclude = array())
-{
- $inputs = HTML();
-
- foreach ($query_args as $key => $val) {
- if (in_array($key, $exclude)) continue;
- $name = $pfx ? $pfx . "[$key]" : $key;
- if (is_array($val))
- $inputs->pushContent(HiddenInputs($val, $name));
- else
- $inputs->pushContent(HTML::input(array('type' => 'hidden',
- 'name' => $name,
- 'value' => $val)));
- }
- return $inputs;
-}
-
-/** Generate a <script> tag containing javascript.
- *
- * @param string $js The javascript.
- * @param string $script_args (optional) hash of script tags options
- * e.g. to provide another version or the defer attr
- * @return HtmlElement A <script> element.
- */
-function JavaScript($js, $script_args = false)
-{
- $default_script_args = array( //'version' => 'JavaScript', // not xhtml conformant
- 'type' => 'text/javascript');
- $script_args = $script_args ? array_merge($default_script_args, $script_args)
- : $default_script_args;
- if (empty($js))
- return HTML(HTML::script($script_args), "\n");
- else
- // see http://devedge.netscape.com/viewsource/2003/xhtml-style-script/
- return HTML(HTML::script($script_args,
- new RawXml((ENABLE_XHTML_XML ? "\n//<![CDATA[" : "\n<!--//")
- . "\n" . trim($js) . "\n"
- . (ENABLE_XHTML_XML ? "//]]>\n" : "// -->"))), "\n");
-}
-
-/** Conditionally display content based of whether javascript is supported.
- *
- * This conditionally (on the client side) displays one of two alternate
- * contents depending on whether the client supports javascript.
- *
- * NOTE:
- * The content you pass as arguments to this function must be block-level.
- * (This is because the <noscript> tag is block-level.)
- *
- * @param mixed $if_content Content to display if the browser supports
- * javascript.
- *
- * @param mixed $else_content Content to display if the browser does
- * not support javascript.
- *
- * @return XmlContent
- */
-function IfJavaScript($if_content = false, $else_content = false)
-{
- $html = array();
- if ($if_content) {
- $xml = AsXML($if_content);
- $js = sprintf('document.write("%s");',
- addcslashes($xml, "\0..\37!@\\\177..\377"));
- $html[] = JavaScript($js);
- }
- if ($else_content) {
- $html[] = HTML::noscript(false, $else_content);
- }
- return HTML($html);
-}
-
-// Local Variables:
-// mode: php
-// tab-width: 8
-// c-basic-offset: 4
-// c-hanging-comment-ender-p: nil
-// indent-tabs-mode: nil
-// End:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-11-17 19:11:21
|
Revision: 8484
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8484&view=rev
Author: vargenau
Date: 2012-11-17 19:11:14 +0000 (Sat, 17 Nov 2012)
Log Message:
-----------
PSR-2: Code MUST use 4 spaces for indenting, not tabs
Modified Paths:
--------------
trunk/lib/nusoap/nusoap.php
trunk/lib/pear/File_Passwd.php
Modified: trunk/lib/nusoap/nusoap.php
===================================================================
--- trunk/lib/nusoap/nusoap.php 2012-11-17 19:03:07 UTC (rev 8483)
+++ trunk/lib/nusoap/nusoap.php 2012-11-17 19:11:14 UTC (rev 8484)
@@ -2069,7 +2069,7 @@
if ($this->wsdl) {
//if($this->debug_flag){
$this->debug("WSDL debug data:\n" . $this->wsdl->debug_str);
- // }
+ // }
// Added: In case we use a WSDL, return a serialized env. WITH the usedNamespaces.
return $this->serializeEnvelope($payload, $this->responseHeaders, $this->wsdl->usedNamespaces, $this->opData['style']);
} else {
Modified: trunk/lib/pear/File_Passwd.php
===================================================================
--- trunk/lib/pear/File_Passwd.php 2012-11-17 19:03:07 UTC (rev 8483)
+++ trunk/lib/pear/File_Passwd.php 2012-11-17 19:11:14 UTC (rev 8484)
@@ -72,9 +72,9 @@
* breaks bc to v1.3 and smaller).
* Don't forget to call close() to save changes!
*
- * @param $file name of the passwd file
- * @param $lock if 'true' $lockfile will be locked
- * @param $lockfile name of the temp file, where changes are saved
+ * @param $file name of the passwd file
+ * @param $lock if 'true' $lockfile will be locked
+ * @param $lockfile name of the temp file, where changes are saved
*
* @access public
* @see close()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-11-19 17:02:19
|
Revision: 8491
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8491&view=rev
Author: vargenau
Date: 2012-11-19 17:02:07 +0000 (Mon, 19 Nov 2012)
Log Message:
-----------
Remove extra empty lines
Modified Paths:
--------------
trunk/lib/AccessLog.php
trunk/lib/BlockParser.php
trunk/lib/DbaDatabase.php
trunk/lib/DbaListSet.php
trunk/lib/FileFinder.php
trunk/lib/HtmlParser.php
trunk/lib/InlineParser.php
trunk/lib/PageType.php
trunk/lib/Request.php
trunk/lib/SpamBlocklist.php
trunk/lib/Template.php
trunk/lib/TextSearchQuery.php
trunk/lib/WikiDB.php
trunk/lib/WikiPluginCached.php
trunk/lib/WikiUserNew.php
trunk/lib/XmlElement.php
trunk/lib/editpage.php
trunk/lib/stdlib.php
trunk/lib/ziplib.php
Modified: trunk/lib/AccessLog.php
===================================================================
--- trunk/lib/AccessLog.php 2012-11-19 16:58:59 UTC (rev 8490)
+++ trunk/lib/AccessLog.php 2012-11-19 17:02:07 UTC (rev 8491)
@@ -671,7 +671,6 @@
);
}
-
function table_output()
{
$query = $this->_getQueryString($args);
Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php 2012-11-19 16:58:59 UTC (rev 8490)
+++ trunk/lib/BlockParser.php 2012-11-19 17:02:07 UTC (rev 8491)
@@ -1395,7 +1395,6 @@
}
}
-
////////////////////////////////////////////////////////////////
//
Modified: trunk/lib/DbaDatabase.php
===================================================================
--- trunk/lib/DbaDatabase.php 2012-11-19 16:58:59 UTC (rev 8490)
+++ trunk/lib/DbaDatabase.php 2012-11-19 17:02:07 UTC (rev 8491)
@@ -139,7 +139,6 @@
return $this->_error("replace($key)");
}
-
function firstkey()
{
return dba_firstkey($this->_dbh);
Modified: trunk/lib/DbaListSet.php
===================================================================
--- trunk/lib/DbaListSet.php 2012-11-19 16:58:59 UTC (rev 8490)
+++ trunk/lib/DbaListSet.php 2012-11-19 17:02:07 UTC (rev 8491)
@@ -47,7 +47,6 @@
return intval($prev);
}
-
function next($i)
{
list(, $next,) = explode(':', $this->_dbh->fetch(intval($i)), 3);
Modified: trunk/lib/FileFinder.php
===================================================================
--- trunk/lib/FileFinder.php 2012-11-19 16:58:59 UTC (rev 8490)
+++ trunk/lib/FileFinder.php 2012-11-19 17:02:07 UTC (rev 8491)
@@ -202,7 +202,6 @@
return false;
}
-
/**
* Search our path for a file.
*
Modified: trunk/lib/HtmlParser.php
===================================================================
--- trunk/lib/HtmlParser.php 2012-11-19 16:58:59 UTC (rev 8490)
+++ trunk/lib/HtmlParser.php 2012-11-19 17:02:07 UTC (rev 8491)
@@ -222,7 +222,6 @@
}
}
-
class HtmlParser_PhpWiki2
extends HtmlParser
{
Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php 2012-11-19 16:58:59 UTC (rev 8490)
+++ trunk/lib/InlineParser.php 2012-11-19 17:02:07 UTC (rev 8491)
@@ -895,7 +895,6 @@
}
}
-
class Markup_html_abbr extends BalancedMarkup
{
//rurban: abbr|acronym need an optional title tag.
Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php 2012-11-19 16:58:59 UTC (rev 8490)
+++ trunk/lib/PageType.php 2012-11-19 17:02:07 UTC (rev 8491)
@@ -255,7 +255,6 @@
return $link;
}
-
function _parseMap($text)
{
if (!preg_match_all("/^\s*(\S+)\s+(.+)$/m",
@@ -353,7 +352,6 @@
}
}
-
/** How to transform text.
*/
class PageFormatter
Modified: trunk/lib/Request.php
===================================================================
--- trunk/lib/Request.php 2012-11-19 16:58:59 UTC (rev 8490)
+++ trunk/lib/Request.php 2012-11-19 17:02:07 UTC (rev 8491)
@@ -543,7 +543,6 @@
return Request_UploadedFile::getUploadedFile($key);
}
-
function _fix_magic_quotes_gpc()
{
$needs_fix = array('HTTP_POST_VARS',
@@ -1260,7 +1259,6 @@
unset($request->_accesslog->entries);
}
-
class HTTP_ETag
{
function HTTP_ETag($val, $is_weak = false)
@@ -1283,7 +1281,6 @@
return true;
}
-
function asString()
{
$quoted = '"' . addslashes($this->_val) . '"';
Modified: trunk/lib/SpamBlocklist.php
===================================================================
--- trunk/lib/SpamBlocklist.php 2012-11-19 16:58:59 UTC (rev 8490)
+++ trunk/lib/SpamBlocklist.php 2012-11-19 17:02:07 UTC (rev 8491)
@@ -98,7 +98,6 @@
return 0;
}
-
/*
if (defined('SPAMBLOCKLIST_TEST') and SPAMBLOCKLIST_TEST) {
BlackListDebug("10.20.30.40");
Modified: trunk/lib/Template.php
===================================================================
--- trunk/lib/Template.php 2012-11-19 16:58:59 UTC (rev 8490)
+++ trunk/lib/Template.php 2012-11-19 17:02:07 UTC (rev 8491)
@@ -129,7 +129,6 @@
$this->_locals[$varname] = $value;
}
-
function printExpansion($defaults = false)
{
if (!is_array($defaults)) // HTML object or template object
@@ -181,7 +180,6 @@
return $this->getExpansion();
}
-
// Debugging:
function _dump_template()
{
@@ -272,7 +270,6 @@
printXML(new Template('html', $request, $args));
}
-
/**
* For dumping pages as html to a file.
* Used for action=dumphtml,action=ziphtml,format=pdf,format=xml
Modified: trunk/lib/TextSearchQuery.php
===================================================================
--- trunk/lib/TextSearchQuery.php 2012-11-19 16:58:59 UTC (rev 8490)
+++ trunk/lib/TextSearchQuery.php 2012-11-19 17:02:07 UTC (rev 8491)
@@ -95,7 +95,6 @@
define ('TSQ_NODE_OR', 11);
*/
-
class TextSearchQuery
{
/**
@@ -190,7 +189,6 @@
return min(1.0, $score / 10.0);
}
-
/**
* Get a regular expression suitable for highlighting matched words.
*
@@ -404,8 +402,6 @@
}
}
-
-
/**
* A simple algebraic matcher for numeric attributes.
* NumericSearchQuery can do ("population < 20000 and area > 1000000", array("population", "area"))
@@ -1182,7 +1178,6 @@
return $expr;
}
-
function get_atom()
{
if ($atom = $this->get_word(TSQ_ALLWORDS)) // Bug#1791564 not involved: '*'
Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php 2012-11-19 16:58:59 UTC (rev 8490)
+++ trunk/lib/WikiDB.php 2012-11-19 17:02:07 UTC (rev 8491)
@@ -921,7 +921,6 @@
$backend->unlock(array('version'));
}
-
/**
* Create a new revision of a {@link WikiDB_Page}.
*
@@ -1455,7 +1454,6 @@
return $strval;
}
-
/**
* @access private
* @param integer_or_object $version_or_pagerevision
@@ -1861,7 +1859,6 @@
return $meta;
}
-
/**
* Return a string representation of the revision.
*
Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php 2012-11-19 16:58:59 UTC (rev 8490)
+++ trunk/lib/WikiPluginCached.php 2012-11-19 17:02:07 UTC (rev 8491)
@@ -620,7 +620,6 @@
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 @@
return true;
} // checkCall1
-
/**
* Extracts the parameters necessary to reconstruct the plugin
* call needed to produce the requested image.
@@ -712,7 +710,6 @@
return true;
} // checkCall2
-
/**
* Creates an image or image map depending on the plugin type.
* @access static private
@@ -968,7 +965,6 @@
}
} // printError
-
/**
* Basic text to image converter for error handling which allows
* multiple line output.
Modified: trunk/lib/WikiUserNew.php
===================================================================
--- trunk/lib/WikiUserNew.php 2012-11-19 16:58:59 UTC (rev 8490)
+++ trunk/lib/WikiUserNew.php 2012-11-19 17:02:07 UTC (rev 8491)
@@ -1335,7 +1335,6 @@
}
}
-
function _checkPassLength($submitted_password)
{
if (strlen($submitted_password) < PASSWORD_LENGTH_MINIMUM) {
@@ -1488,7 +1487,6 @@
*
*/
-
/**
* For security, this class should not be extended. Instead, extend
* from _PassUser (think of this as unix "root").
Modified: trunk/lib/XmlElement.php
===================================================================
--- trunk/lib/XmlElement.php 2012-11-19 16:58:59 UTC (rev 8490)
+++ trunk/lib/XmlElement.php 2012-11-19 17:02:07 UTC (rev 8491)
@@ -388,13 +388,11 @@
return substr($this->startTag(), 0, -1) . "/>";
}
-
function endTag()
{
return "</$this->_tag>";
}
-
function printXML()
{
if ($this->isEmpty())
Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php 2012-11-19 16:58:59 UTC (rev 8490)
+++ trunk/lib/editpage.php 2012-11-19 17:02:07 UTC (rev 8491)
@@ -595,7 +595,6 @@
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 @@
$message);
}
-
function getTextArea()
{
$request = &$this->request;
Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php 2012-11-19 16:58:59 UTC (rev 8490)
+++ trunk/lib/stdlib.php 2012-11-19 17:02:07 UTC (rev 8491)
@@ -1209,7 +1209,6 @@
}
}
-
/**
* Expand tabs in string.
*
@@ -1333,7 +1332,6 @@
$sign, $mins / 60, $colon, $mins % 60);
}
-
/**
* Format time in ISO-8601 format.
*
@@ -1431,7 +1429,6 @@
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 @@
);
}
-
/** Hash a value.
*
* This is used for generating ETags.
@@ -1841,7 +1837,6 @@
trigger_error("Can't hash $x", E_USER_ERROR);
}
-
/**
* Seed the random number generator.
*
@@ -1993,7 +1988,6 @@
$request->finish();
}
-
function _getButtons()
{
global $request;
Modified: trunk/lib/ziplib.php
===================================================================
--- trunk/lib/ziplib.php 2012-11-19 16:58:59 UTC (rev 8490)
+++ trunk/lib/ziplib.php 2012-11-19 17:02:07 UTC (rev 8491)
@@ -248,7 +248,6 @@
return mktime($hour, $min, $sec, $month, $mday, $year);
}
-
/**
* Class for zipfile creation.
*/
@@ -687,7 +686,6 @@
return $headers;
}
-
function ParseMimeContentType($string)
{
// FIXME: Remove (RFC822 style comments).
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-11-21 11:08:50
|
Revision: 8508
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8508&view=rev
Author: vargenau
Date: 2012-11-21 11:08:38 +0000 (Wed, 21 Nov 2012)
Log Message:
-----------
Remove check_php_version(5)
Modified Paths:
--------------
trunk/lib/CachedMarkup.php
trunk/lib/IniConfig.php
trunk/lib/WikiDB/backend/PearDB.php
trunk/lib/WikiTheme.php
trunk/lib/WikiUser/BogoLogin.php
trunk/lib/WikiUser/Db.php
trunk/lib/WikiUserNew.php
trunk/lib/plugin/RssFeed.php
trunk/lib/stdlib.php
Modified: trunk/lib/CachedMarkup.php
===================================================================
--- trunk/lib/CachedMarkup.php 2012-11-21 10:34:31 UTC (rev 8507)
+++ trunk/lib/CachedMarkup.php 2012-11-21 11:08:38 UTC (rev 8508)
@@ -214,10 +214,7 @@
foreach ($this->_content as $item) {
if (is_string($item)) {
$xml .= $item;
- } elseif (is_subclass_of($item,
- check_php_version(5)
- ? 'Cached_DynamicContent'
- : 'cached_dynamiccontent')
+ } elseif (is_subclass_of($item, 'Cached_DynamicContent')
) {
$val = $item->expand($basepage, $this);
$xml .= $val->asXML();
@@ -236,10 +233,7 @@
$item = $this->_content[$i];
if (is_string($item)) {
print $item;
- } elseif (is_subclass_of($item,
- check_php_version(5)
- ? 'Cached_DynamicContent'
- : 'cached_dynamiccontent')
+ } elseif (is_subclass_of($item, 'Cached_DynamicContent')
) { // give the content the chance to know about itself or even
// to change itself
$val = $item->expand($basepage, $this);
Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php 2012-11-21 10:34:31 UTC (rev 8507)
+++ trunk/lib/IniConfig.php 2012-11-21 11:08:38 UTC (rev 8508)
@@ -324,9 +324,6 @@
E_USER_ERROR);
unset($valid_database_types);
if (DATABASE_TYPE == 'PDO') {
- if (!check_php_version(5))
- trigger_error("Invalid DATABASE_TYPE=PDO. PDO requires at least php-5.0!",
- E_USER_ERROR);
// try to load it dynamically (unix only)
if (!loadPhpExtension("pdo")) {
echo $GLOBALS['php_errormsg'], "<br>\n";
Modified: trunk/lib/WikiDB/backend/PearDB.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB.php 2012-11-21 10:34:31 UTC (rev 8507)
+++ trunk/lib/WikiDB/backend/PearDB.php 2012-11-21 11:08:38 UTC (rev 8508)
@@ -15,7 +15,7 @@
// if DB would have exported its version number, it would be easier.
@require_once('DB/common.php'); // Either our local pear copy or the system one
// check the version!
- $name = check_php_version(5) ? "escapeSimple" : strtolower("escapeSimple");
+ $name = "escapeSimple";
// TODO: apparently some Pear::Db version adds LIMIT 1,0 to getOne(),
// which is invalid for "select version()"
if (!in_array($name, get_class_methods("DB_common"))) {
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php 2012-11-21 10:34:31 UTC (rev 8507)
+++ trunk/lib/WikiTheme.php 2012-11-21 11:08:38 UTC (rev 8508)
@@ -1689,12 +1689,7 @@
function Button($text, $url, $class = false, $options = false)
{
global $request;
- //php5 workaround
- if (check_php_version(5)) {
- $this->_init('a', array('href' => $url));
- } else {
- $this->__construct('a', array('href' => $url));
- }
+ $this->_init('a', array('href' => $url));
if ($class)
$this->setAttr('class', $class);
if ($request->getArg('frame'))
Modified: trunk/lib/WikiUser/BogoLogin.php
===================================================================
--- trunk/lib/WikiUser/BogoLogin.php 2012-11-21 10:34:31 UTC (rev 8507)
+++ trunk/lib/WikiUser/BogoLogin.php 2012-11-21 11:08:38 UTC (rev 8508)
@@ -48,9 +48,6 @@
if (isset($this->_prefs->_method) and $this->_prefs->_method == 'HomePage') {
$user = new _PersonalPagePassUser($this->_userid, $this->_prefs);
if ($user->checkPass($submitted_password)) {
- if (!check_php_version(5))
- eval("\$this = \$user;");
- // /*PHP5 patch*/$this = $user;
$user = UpgradeUser($this, $user);
$this->_level = WIKIAUTH_USER;
return $this->_level;
Modified: trunk/lib/WikiUser/Db.php
===================================================================
--- trunk/lib/WikiUser/Db.php 2012-11-21 10:34:31 UTC (rev 8507)
+++ trunk/lib/WikiUser/Db.php 2012-11-21 11:08:38 UTC (rev 8508)
@@ -67,31 +67,13 @@
$dbtype = $dbi->getParam('dbtype');
if ($dbtype == 'ADODB') {
include_once 'lib/WikiUser/AdoDb.php';
- if (check_php_version(5))
- return new _AdoDbPassUser($UserName, $this->_prefs);
- else {
- $user = new _AdoDbPassUser($UserName, $this->_prefs);
- eval("\$this = \$user;");
- return $user;
- }
+ return new _AdoDbPassUser($UserName, $this->_prefs);
} elseif ($dbtype == 'SQL') {
include_once 'lib/WikiUser/PearDb.php';
- if (check_php_version(5))
- return new _PearDbPassUser($UserName, $this->_prefs);
- else {
- $user = new _PearDbPassUser($UserName, $this->_prefs);
- eval("\$this = \$user;");
- return $user;
- }
+ return new _PearDbPassUser($UserName, $this->_prefs);
} elseif ($dbtype == 'PDO') {
include_once 'lib/WikiUser/PdoDb.php';
- if (check_php_version(5))
- return new _PdoDbPassUser($UserName, $this->_prefs);
- else {
- $user = new _PdoDbPassUser($UserName, $this->_prefs);
- eval("\$this = \$user;");
- return $user;
- }
+ return new _PdoDbPassUser($UserName, $this->_prefs);
}
return false;
}
Modified: trunk/lib/WikiUserNew.php
===================================================================
--- trunk/lib/WikiUserNew.php 2012-11-21 10:34:31 UTC (rev 8507)
+++ trunk/lib/WikiUserNew.php 2012-11-21 11:08:38 UTC (rev 8508)
@@ -690,9 +690,6 @@
$class = "_" . $this->_current_method . "PassUser";
include_once 'lib/WikiUser/' . $this->_current_method . '.php';
$user = new $class($userid, $this->_prefs);
- if (!check_php_version(5))
- eval("\$this = \$user;");
- // /*PHP5 patch*/$this = $user;
$this->_level = $authlevel;
return $user;
}
@@ -710,9 +707,6 @@
$class = "_" . $this->_current_method . "PassUser";
include_once 'lib/WikiUser/' . $this->_current_method . '.php';
$user = new $class($userid, $this->_prefs);
- if (!check_php_version(5))
- eval("\$this = \$user;");
- // /*PHP5 patch*/$this = $user;
$user->_level = $authlevel;
return $user;
}
@@ -1021,73 +1015,31 @@
// before we have to upgrade it manually.
if (!empty($GLOBALS['PHP_AUTH_USER']) or !empty($_SERVER['REMOTE_USER'])) {
include_once 'lib/WikiUser/HttpAuth.php';
- if (check_php_version(5))
- return new _HttpAuthPassUser($UserName, $this->_prefs);
- else {
- $user = new _HttpAuthPassUser($UserName, $this->_prefs);
- eval("\$this = \$user;");
- // /*PHP5 patch*/$this = $user;
- return $user;
- }
+ return new _HttpAuthPassUser($UserName, $this->_prefs);
} elseif (in_array('Db', $dbh->getAuthParam('USER_AUTH_ORDER')) and
$dbh->getAuthParam('auth_check') and
($dbh->getAuthParam('auth_dsn') or $dbh->getParam('dsn'))
) {
- if (check_php_version(5))
- return new _DbPassUser($UserName, $this->_prefs);
- else {
- $user = new _DbPassUser($UserName, $this->_prefs);
- eval("\$this = \$user;");
- // /*PHP5 patch*/$this = $user;
- return $user;
- }
+ return new _DbPassUser($UserName, $this->_prefs);
} elseif (in_array('LDAP', $dbh->getAuthParam('USER_AUTH_ORDER')) and
defined('LDAP_AUTH_HOST') and defined('LDAP_BASE_DN') and
function_exists('ldap_connect')
) {
include_once 'lib/WikiUser/LDAP.php';
- if (check_php_version(5))
- return new _LDAPPassUser($UserName, $this->_prefs);
- else {
- $user = new _LDAPPassUser($UserName, $this->_prefs);
- eval("\$this = \$user;");
- // /*PHP5 patch*/$this = $user;
- return $user;
- }
+ return new _LDAPPassUser($UserName, $this->_prefs);
} elseif (in_array('IMAP', $dbh->getAuthParam('USER_AUTH_ORDER')) and
defined('IMAP_AUTH_HOST') and function_exists('imap_open')
) {
include_once 'lib/WikiUser/IMAP.php';
- if (check_php_version(5))
return new _IMAPPassUser($UserName, $this->_prefs);
- else {
- $user = new _IMAPPassUser($UserName, $this->_prefs);
- eval("\$this = \$user;");
- // /*PHP5 patch*/$this = $user;
- return $user;
- }
} elseif (in_array('File', $dbh->getAuthParam('USER_AUTH_ORDER')) and
defined('AUTH_USER_FILE') and file_exists(AUTH_USER_FILE)
) {
include_once 'lib/WikiUser/File.php';
- if (check_php_version(5))
- return new _FilePassUser($UserName, $this->_prefs);
- else {
- $user = new _FilePassUser($UserName, $this->_prefs);
- eval("\$this = \$user;");
- // /*PHP5 patch*/$this = $user;
- return $user;
- }
+ return new _FilePassUser($UserName, $this->_prefs);
} else {
include_once 'lib/WikiUser/PersonalPage.php';
- if (check_php_version(5))
- return new _PersonalPagePassUser($UserName, $this->_prefs);
- else {
- $user = new _PersonalPagePassUser($UserName, $this->_prefs);
- eval("\$this = \$user;");
- // /*PHP5 patch*/$this = $user;
- return $user;
- }
+ return new _PersonalPagePassUser($UserName, $this->_prefs);
}
} else
// else use the page methods defined in _PassUser.
@@ -1302,8 +1254,6 @@
}
/* new user => false does not return false, but the _userid is empty then */
while ($user and $user->_userid) {
- if (!check_php_version(5))
- eval("\$this = \$user;");
$user = UpgradeUser($this, $user);
if ($user->userExists()) {
$user = UpgradeUser($this, $user);
@@ -1464,8 +1414,6 @@
) {
$class = $this->nextClass();
while ($user = new $class($this->_userid, $this->_prefs)) {
- if (!check_php_version(5))
- eval("\$this = \$user;");
$user = UpgradeUser($this, $user);
if ($user->userExists()) {
$user = UpgradeUser($this, $user);
Modified: trunk/lib/plugin/RssFeed.php
===================================================================
--- trunk/lib/plugin/RssFeed.php 2012-11-21 10:34:31 UTC (rev 8507)
+++ trunk/lib/plugin/RssFeed.php 2012-11-21 11:08:38 UTC (rev 8508)
@@ -110,8 +110,6 @@
} else {
$html = HTML::div(array('class' => 'rss'), HTML::em(_("no RSS items")));
}
- if (!check_php_version(5))
- $rss_parser->__destruct();
return $html;
}
Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php 2012-11-21 10:34:31 UTC (rev 8507)
+++ trunk/lib/stdlib.php 2012-11-21 11:08:38 UTC (rev 8508)
@@ -1779,12 +1779,7 @@
*/
function isa($object, $class)
{
- //if (check_php_version(5))
- // return $object instanceof $class;
- if (!check_php_version(5))
- return is_a($object, $class);
-
- $lclass = check_php_version(5) ? $class : strtolower($class);
+ $lclass = $class;
return is_object($object)
&& (strtolower(get_class($object)) == strtolower($class)
|| is_subclass_of($object, $lclass));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X