From: <var...@us...> - 2012-09-28 12:11:47
|
Revision: 8290 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8290&view=rev Author: vargenau Date: 2012-09-28 12:11:35 +0000 (Fri, 28 Sep 2012) Log Message: ----------- include [all] Include and file path should be devided with single space. File path should not be placed under brackets. Modified Paths: -------------- trunk/ImageTile.php trunk/RPC2.php trunk/SOAP.php trunk/configurator.php trunk/getimg.php trunk/lib/AtomParser.php trunk/lib/BlockParser.php trunk/lib/CachedMarkup.php trunk/lib/DbaDatabase.php trunk/lib/EditToolbar.php trunk/lib/ExternalReferrer.php trunk/lib/Google.php trunk/lib/HtmlParser.php trunk/lib/InlineParser.php trunk/lib/MailNotify.php trunk/lib/PageList.php trunk/lib/PageType.php trunk/lib/RSSWriter091.php trunk/lib/Request.php trunk/lib/RssParser.php trunk/lib/RssWriter2.php trunk/lib/SemanticWeb.php trunk/lib/Template.php trunk/lib/WikiDB/ADODB.php trunk/lib/WikiDB/PDO.php trunk/lib/WikiDB/SQL.php trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php trunk/lib/WikiDB/adodb/adodb-pear.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/BackLinkIter.php trunk/lib/WikiDB/backend/dumb/MostPopularIter.php trunk/lib/WikiDB/backend/dumb/MostRecentIter.php trunk/lib/WikiDB/backend/file.php trunk/lib/WikiDB/backend/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/WikiPluginCached.php trunk/lib/WikiTheme.php trunk/lib/WikiUser/AdoDb.php trunk/lib/WikiUser/Db.php trunk/lib/WikiUser/Facebook.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.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/XmlRpcClient.php trunk/lib/XmlRpcServer.php trunk/lib/diff.php trunk/lib/diff3.php trunk/lib/display.php trunk/lib/editpage.php trunk/lib/fpdf/chinese.php trunk/lib/fpdf/japanese.php trunk/lib/imagecache.php trunk/lib/imdb.php trunk/lib/loadsave.php trunk/lib/main.php trunk/lib/nusoap/nusoap.php trunk/lib/pdf.php trunk/lib/plugin/AddComment.php trunk/lib/plugin/AllPages.php trunk/lib/plugin/AllUsers.php trunk/lib/plugin/AppendText.php trunk/lib/plugin/AsciiMath.php trunk/lib/plugin/AtomFeed.php trunk/lib/plugin/AuthorHistory.php trunk/lib/plugin/BackLinks.php trunk/lib/plugin/BlogArchives.php trunk/lib/plugin/BlogJournal.php trunk/lib/plugin/BoxRight.php trunk/lib/plugin/CacheTest.php trunk/lib/plugin/CalendarList.php trunk/lib/plugin/CategoryPage.php trunk/lib/plugin/CreateBib.php trunk/lib/plugin/CreatePage.php trunk/lib/plugin/CreateToc.php trunk/lib/plugin/DeadEndPages.php trunk/lib/plugin/Diff.php trunk/lib/plugin/DynamicIncludePage.php trunk/lib/plugin/EditMetaData.php trunk/lib/plugin/FileInfo.php trunk/lib/plugin/FullTextSearch.php trunk/lib/plugin/GoogleMaps.php trunk/lib/plugin/GooglePlugin.php trunk/lib/plugin/GraphViz.php trunk/lib/plugin/Imdb.php trunk/lib/plugin/IncludePage.php trunk/lib/plugin/IncludePages.php trunk/lib/plugin/IncludeSiteMap.php trunk/lib/plugin/IncludeTree.php trunk/lib/plugin/InterWikiSearch.php trunk/lib/plugin/LikePages.php trunk/lib/plugin/LinkDatabase.php trunk/lib/plugin/LinkSearch.php trunk/lib/plugin/ListPages.php trunk/lib/plugin/ListRelations.php trunk/lib/plugin/ListSubpages.php trunk/lib/plugin/MediawikiTable.php trunk/lib/plugin/ModeratedPage.php trunk/lib/plugin/MostPopular.php trunk/lib/plugin/OldStyleTable.php trunk/lib/plugin/OrphanedPages.php trunk/lib/plugin/PageDump.php trunk/lib/plugin/PageHistory.php trunk/lib/plugin/Ploticus.php trunk/lib/plugin/PopularNearby.php trunk/lib/plugin/PopularTags.php trunk/lib/plugin/PreferenceApp.php trunk/lib/plugin/RandomPage.php trunk/lib/plugin/RateIt.php trunk/lib/plugin/RecentChanges.php trunk/lib/plugin/RecentChangesCached.php trunk/lib/plugin/RecentComments.php trunk/lib/plugin/RecentEdits.php trunk/lib/plugin/RecentReferrers.php trunk/lib/plugin/RelatedChanges.php trunk/lib/plugin/RichTable.php trunk/lib/plugin/RssFeed.php trunk/lib/plugin/SearchHighlight.php trunk/lib/plugin/SemanticSearch.php trunk/lib/plugin/SemanticSearchAdvanced.php trunk/lib/plugin/SiteMap.php trunk/lib/plugin/SpellCheck.php trunk/lib/plugin/SqlResult.php trunk/lib/plugin/SyncWiki.php trunk/lib/plugin/SystemInfo.php trunk/lib/plugin/Template.php trunk/lib/plugin/TexToPng.php trunk/lib/plugin/TitleSearch.php trunk/lib/plugin/TranslateText.php trunk/lib/plugin/UnfoldSubpages.php trunk/lib/plugin/UpLoad.php trunk/lib/plugin/UriResolver.php trunk/lib/plugin/UserRatings.php trunk/lib/plugin/VisualWiki.php trunk/lib/plugin/WantedPages.php trunk/lib/plugin/WikiAdminChmod.php trunk/lib/plugin/WikiAdminChown.php trunk/lib/plugin/WikiAdminMarkup.php trunk/lib/plugin/WikiAdminPurge.php trunk/lib/plugin/WikiAdminRemove.php trunk/lib/plugin/WikiAdminRename.php trunk/lib/plugin/WikiAdminSearchReplace.php trunk/lib/plugin/WikiAdminSelect.php trunk/lib/plugin/WikiAdminSetAcl.php trunk/lib/plugin/WikiAdminSetAclSimple.php trunk/lib/plugin/WikiAdminSetExternal.php trunk/lib/plugin/WikiAdminUtils.php trunk/lib/plugin/WikiBlog.php trunk/lib/plugin/WikiFormRich.php trunk/lib/plugin/WikiForum.php trunk/lib/plugin/WikicreoleTable.php trunk/lib/plugin/_AuthInfo.php trunk/lib/plugin/_BackendInfo.php trunk/lib/plugin/_Retransform.php trunk/lib/plugin/_WikiTranslation.php trunk/lib/purgepage.php trunk/lib/removepage.php trunk/lib/stdlib.php trunk/lib/upgrade.php trunk/lib/wikilens/PageListColumns.php trunk/lib/wikilens/RatingsDb.php trunk/lib/wikilens/RatingsUser.php trunk/tests/unit/lib/AtomParserTest.php trunk/tests/unit/lib/plugin/AtomFeedTest.php trunk/tests/unit/test.php trunk/tests/unit_test_backend_cvs.php trunk/tests/xmlrpc/interop-client.php trunk/tests/xmlrpc/interop-server.php trunk/tests/xmlrpc/validate-form.php trunk/tests/xmlrpc/validate.php trunk/tests/xmlrpc/xmlrpc-client.php trunk/tests/xmlrpc/xmlrpc_utils.php trunk/themes/Crao/themeinfo.php trunk/themes/Hawaiian/themeinfo.php trunk/themes/MacOSX/lib/RecentChanges.php trunk/themes/MacOSX/themeinfo.php trunk/themes/MonoBook/themeinfo.php trunk/themes/Portland/lib/RecentChanges.php trunk/themes/Portland/themeinfo.php trunk/themes/Sidebar/themeinfo.php trunk/themes/SpaceWiki/lib/RecentChanges.php trunk/themes/SpaceWiki/themeinfo.php trunk/themes/Wordpress/lib/RecentChanges.php trunk/themes/Wordpress/themeinfo.php trunk/themes/blog/lib/RecentChanges.php trunk/themes/blog/themeinfo.php trunk/themes/default/themeinfo.php trunk/themes/fusionforge/themeinfo.php trunk/themes/shamino_com/themeinfo.php trunk/themes/smaller/themeinfo.php trunk/themes/wikilens/themeinfo.php trunk/view.php Modified: trunk/ImageTile.php =================================================================== --- trunk/ImageTile.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/ImageTile.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -1,6 +1,6 @@ <?php // FIXME! This is a mess. Everything. -require_once('lib/stdlib.php'); +require_once 'lib/stdlib.php'; $remove = 0; if (preg_match('/^(http|ftp|https):\/\//i',$_REQUEST['url'])) { Modified: trunk/RPC2.php =================================================================== --- trunk/RPC2.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/RPC2.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -21,10 +21,10 @@ define ("WIKI_XMLRPC", true); // Start up the main code -include_once("index.php"); -include_once("lib/main.php"); +include_once 'index.php'; +include_once 'lib/main.php'; -include_once("lib/XmlRpcServer.php"); +include_once 'lib/XmlRpcServer.php'; $server = new XmlRpcServer; $server->service(); Modified: trunk/SOAP.php =================================================================== --- trunk/SOAP.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/SOAP.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -17,24 +17,24 @@ */ define ("WIKI_SOAP", true); -include_once("./index.php"); -include_once("lib/main.php"); +include_once './index.php'; +include_once 'lib/main.php'; if (!loadExtension('soap')) - require_once('lib/nusoap/nusoap.php'); + require_once 'lib/nusoap/nusoap.php'; /* // bypass auth and request loop for now. // require_once('lib/prepend.php'); -include_once("index.php"); +include_once 'index.php'; //require_once('lib/stdlib.php'); -require_once('lib/WikiDB.php'); -require_once('lib/config.php'); +require_once 'lib/WikiDB.php'; +require_once 'lib/config.php'; class WikiRequest extends Request {} $request = new WikiRequest(); -require_once('lib/PagePerm.php'); -require_once('lib/WikiUserNew.php'); -require_once('lib/WikiGroup.php'); +require_once 'lib/PagePerm.php'; +require_once 'lib/WikiUserNew.php'; +require_once 'lib/WikiGroup.php'; */ function checkCredentials(&$server, &$credentials, $access, $pagename) { @@ -253,7 +253,7 @@ sort($plugins); $RetArray = array(); if (!empty($plugins)) { - require_once("lib/WikiPlugin.php"); + require_once 'lib/WikiPlugin.php'; $w = new WikiPluginLoader; foreach ($plugins as $plugin) { $pluginName = str_replace(".php", "", $plugin); @@ -269,7 +269,7 @@ function getPluginSynopsis($pluginname, $credentials=false) { global $server; checkCredentials($server,$credentials,'change',"Help/".$pluginname."Plugin"); - require_once("lib/WikiPlugin.php"); + require_once 'lib/WikiPlugin.php'; $w = new WikiPluginLoader; $synopsis = ''; $p = $w->getPlugin($pluginName, false); // second arg? @@ -292,7 +292,7 @@ checkCredentials($server,$credentials,'change',"Help/".$pluginname."Plugin"); $basepage = '';; - require_once("lib/WikiPlugin.php"); + require_once 'lib/WikiPlugin.php'; $w = new WikiPluginLoader; $p = $w->getPlugin($pluginName, false); // second arg? $pagelist = $p->run($dbi, $pluginargs, $request, $basepage); @@ -330,7 +330,7 @@ global $server; checkCredentials($server,$credentials,'view',_("HomePage")); $dbi = WikiDB::open($GLOBALS['DBParams']); - require_once("lib/TextSearchQuery.php"); + require_once 'lib/TextSearchQuery.php'; $pagequery = new TextSearchQuery($pages); $linkquery = new TextSearchQuery($search); if ($linktype == 'relation') { @@ -338,7 +338,7 @@ $links = $dbi->_backend->link_search($pagequery, $linkquery, $linktype, $relquery); } elseif ($linktype == 'attribute') { // only numeric search withh attributes! $relquery = new TextSearchQuery($relation); - require_once("lib/SemanticWeb.php"); + require_once 'lib/SemanticWeb.php'; // search: "population > 1 million and area < 200 km^2" relation="*" pages="*" $linkquery = new SemanticAttributeSearchQuery($search, $relation); $links = $dbi->_backend->link_search($pagequery, $linkquery, $linktype, $relquery); Modified: trunk/configurator.php =================================================================== --- trunk/configurator.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/configurator.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -123,8 +123,8 @@ // Require admin user if (!defined('ADMIN_USER') or !defined('ADMIN_PASSWD')) { if (!function_exists("IniConfig")) { - include_once("lib/prepend.php"); - include_once("lib/IniConfig.php"); + include_once 'lib/prepend.php'; + include_once 'lib/IniConfig.php'; } IniConfig($fs_config_file); } @@ -149,8 +149,8 @@ } } else { if (!function_exists("IniConfig")) { - include_once("lib/prepend.php"); - include_once("lib/IniConfig.php"); + include_once 'lib/prepend.php'; + include_once 'lib/IniConfig.php'; } $def_file = (substr(PHP_OS,0,3) == 'WIN') ? 'config\\config-default.ini' : 'config/config-default.ini'; $fs_def_file = dirname(__FILE__) . (substr(PHP_OS,0,3) == 'WIN' ? '\\' : '/') . $def_file; Modified: trunk/getimg.php =================================================================== --- trunk/getimg.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/getimg.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -1,3 +1,3 @@ <?php -include ("index.php"); -include "lib/imagecache.php"; +include 'index.php'; +include 'lib/imagecache.php'; Modified: trunk/lib/AtomParser.php =================================================================== --- trunk/lib/AtomParser.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/AtomParser.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -26,7 +26,7 @@ * * @author: Sébastien Le Callonnec */ -require_once('lib/XmlParser.php'); +require_once 'lib/XmlParser.php'; class AtomParser extends XmlParser Modified: trunk/lib/BlockParser.php =================================================================== --- trunk/lib/BlockParser.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/BlockParser.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -20,8 +20,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ //require_once('lib/HtmlElement.php'); -require_once('lib/CachedMarkup.php'); -require_once('lib/InlineParser.php'); +require_once 'lib/CachedMarkup.php'; +require_once 'lib/InlineParser.php'; /** * Deal with paragraphs and proper, recursive block indents Modified: trunk/lib/CachedMarkup.php =================================================================== --- trunk/lib/CachedMarkup.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/CachedMarkup.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -require_once("lib/Units.php"); +require_once 'lib/Units.php'; class CacheableMarkup extends XmlContent { @@ -70,7 +70,7 @@ return unserialize($data); } else { // user our php lib. TESTME - include_once("ziplib.php"); + include_once 'ziplib.php'; $zip = new ZipReader($packed); list(,$data,$attrib) = $zip->readFile(); return unserialize($data); @@ -793,7 +793,7 @@ static $loader = false; if (!$loader) { - include_once('lib/WikiPlugin.php'); + include_once 'lib/WikiPlugin.php'; $loader = new WikiPluginLoader; } return $loader; Modified: trunk/lib/DbaDatabase.php =================================================================== --- trunk/lib/DbaDatabase.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/DbaDatabase.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -1,6 +1,6 @@ <?php -require_once('lib/ErrorManager.php'); +require_once 'lib/ErrorManager.php'; if (isWindows()) define('DBA_DATABASE_DEFAULT_TIMEOUT', 60); Modified: trunk/lib/EditToolbar.php =================================================================== --- trunk/lib/EditToolbar.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/EditToolbar.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -77,7 +77,7 @@ } } - require_once("lib/WikiPluginCached.php"); + require_once 'lib/WikiPluginCached.php'; $cache = WikiPluginCached::newCache(); $dbi = $GLOBALS['request']->getDbh(); // regenerate if number of pages changes (categories, pages, templates) @@ -292,7 +292,7 @@ function categoriesPulldown() { global $WikiTheme; - require_once('lib/TextSearchQuery.php'); + require_once 'lib/TextSearchQuery.php'; $dbi =& $GLOBALS['request']->_dbi; // KEYWORDS formerly known as $KeywordLinkRegexp $pages = $dbi->titleSearch(new TextSearchQuery(KEYWORDS, true)); @@ -339,7 +339,7 @@ sort($plugins); if (!empty($plugins)) { $plugin_js = ''; - require_once("lib/WikiPlugin.php"); + require_once 'lib/WikiPlugin.php'; $w = new WikiPluginLoader; foreach ($plugins as $plugin) { $pluginName = str_replace(".php", "", $plugin); @@ -377,7 +377,7 @@ // result is cached. Esp. the args are expensive function pagesPulldown($query, $case_exact=false, $regex='auto') { - require_once('lib/TextSearchQuery.php'); + require_once 'lib/TextSearchQuery.php'; $dbi =& $GLOBALS['request']->_dbi; $page_iter = $dbi->titleSearch(new TextSearchQuery($query, $case_exact, $regex)); if ($page_iter->count() > 0) { @@ -447,7 +447,7 @@ // FIXME! function templatePulldown($query, $case_exact=false, $regex='auto') { global $request; - require_once('lib/TextSearchQuery.php'); + require_once 'lib/TextSearchQuery.php'; $dbi =& $request->_dbi; $page_iter = $dbi->titleSearch(new TextSearchQuery($query, $case_exact, $regex)); $count = 0; Modified: trunk/lib/ExternalReferrer.php =================================================================== --- trunk/lib/ExternalReferrer.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/ExternalReferrer.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -13,7 +13,7 @@ if ($referrer = $request->get('HTTP_REFERER')) { $home = SCRIPT_NAME; // was SERVER_URL, check sister wiki's: same host but other other script url if (substr(strtolower($referrer),0,strlen($home)) == strtolower($home)) return false; - require_once("lib/ExternalReferrer.php"); + require_once 'lib/ExternalReferrer.php'; $se = new SearchEngines(); return $se->parseSearchQuery($referrer); } Modified: trunk/lib/Google.php =================================================================== --- trunk/lib/Google.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/Google.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -164,7 +164,7 @@ } else $this->license_key = GOOGLE_LICENSE_KEY; - require_once("lib/nusoap/nusoap.php"); + require_once 'lib/nusoap/nusoap.php'; $this->soapclient = new soapclient(SERVER_URL . NormalizeWebFileName("GoogleSearch.wsdl"), "wsdl"); $this->proxy = $this->soapclient->getProxy(); Modified: trunk/lib/HtmlParser.php =================================================================== --- trunk/lib/HtmlParser.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/HtmlParser.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -38,7 +38,7 @@ */ // RssParser contains the XML (expat) and url-grabber methods -require_once('lib/XmlParser.php'); +require_once 'lib/XmlParser.php'; class HtmlParser extends XmlParser Modified: trunk/lib/InlineParser.php =================================================================== --- trunk/lib/InlineParser.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/InlineParser.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -34,7 +34,7 @@ */ define('ESCAPE_CHAR', '~'); -require_once('lib/CachedMarkup.php'); +require_once 'lib/CachedMarkup.php'; require_once(dirname(__FILE__).'/stdlib.php'); function WikiEscape($text) { @@ -555,7 +555,7 @@ { function Markup_searchhighlight () { $result = $GLOBALS['request']->_searchhighlight; - require_once("lib/TextSearchQuery.php"); + require_once 'lib/TextSearchQuery.php'; $query = new TextSearchQuery($result['query']); $this->hilight_re = $query->getHighlightRegexp(); $this->engine = $result['engine']; Modified: trunk/lib/MailNotify.php =================================================================== --- trunk/lib/MailNotify.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/MailNotify.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -284,7 +284,7 @@ } $other_content = explode("\n", $prevdata['%content']); - include_once("lib/difflib.php"); + include_once 'lib/difflib.php'; $diff2 = new Diff($other_content, $this_content); //$context_lines = max(4, count($other_content) + 1, // count($this_content) + 1); Modified: trunk/lib/PageList.php =================================================================== --- trunk/lib/PageList.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/PageList.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -415,7 +415,7 @@ } elseif (($len = strlen($c)) > $this->bytes) { $c = substr($c, 0, $this->bytes); } - include_once('lib/BlockParser.php'); + include_once 'lib/BlockParser.php'; // false --> don't bother processing hrefs for embedded WikiLinks $ct = TransformText($c, $revision_handle->get('markup'), false); if (empty($pagelist->_sortby[$this->_field])) @@ -1037,7 +1037,7 @@ if (is_array($input)) return $input; // expand wildcards from list of all pages if (preg_match('/[\?\*]/', $input) or substr($input,0,1) == "^") { - include_once("lib/TextSearchQuery.php"); + include_once 'lib/TextSearchQuery.php'; $search = new TextSearchQuery(str_replace(",", " or ", $input), true, (substr($input,0,1) == "^") ? 'posix' : 'glob'); $dbi = $GLOBALS['request']->getDbh(); Modified: trunk/lib/PageType.php =================================================================== --- trunk/lib/PageType.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/PageType.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -20,7 +20,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -require_once('lib/CachedMarkup.php'); +require_once 'lib/CachedMarkup.php'; /** A cacheable formatted wiki page. */ @@ -181,7 +181,7 @@ // localize Upload:links for WIKIDUMP if (!empty($WikiTheme->DUMP_MODE) and $moniker == 'Upload') { global $request; - include_once("lib/config.php"); + include_once 'lib/config.php'; $url = getUploadFilePath(); // calculate to a relative local path to /uploads for pdf images. $doc_root = $request->get("DOCUMENT_ROOT"); @@ -341,7 +341,7 @@ } function _transform($text) { - include_once('lib/BlockParser.php'); + include_once 'lib/BlockParser.php'; return TransformText($text, $this->_markup); } @@ -427,7 +427,7 @@ function format($text) { if (empty($this->type)) trigger_error('PageFormatter_attach->format: $type missing'); - include_once('lib/Template.php'); + include_once 'lib/Template.php'; global $request; $tokens['CONTENT'] = $this->_transform($text); $tokens['page'] = $this->_page; @@ -480,14 +480,14 @@ { function _transform($text) { - include_once('lib/BlockParser.php'); + include_once 'lib/BlockParser.php'; return TransformText($text, $this->_markup); } // one page or set of pages? // here we try to format only a single page function format($text) { - include_once('lib/Template.php'); + include_once 'lib/Template.php'; global $request; $tokens['page'] = $this->_page; $tokens['CONTENT'] = $this->_transform($text); @@ -502,8 +502,8 @@ // binary. // We use a custom HTML->PDF class converter from PHPWebthings // to be able to use templates for PDF. - require_once('lib/fpdf.php'); - require_once('lib/pdf.php'); + require_once 'lib/fpdf.php'; + require_once 'lib/pdf.php'; $pdf = new PDF(); $pdf->SetTitle($pagename); @@ -530,7 +530,7 @@ class PageFormatter_MediaWiki extends PageFormatter { function _transform($text) { - include_once('lib/BlockParser.php'); + include_once 'lib/BlockParser.php'; // Expand leading tabs. $text = expand_tabs($text); Modified: trunk/lib/RSSWriter091.php =================================================================== --- trunk/lib/RSSWriter091.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/RSSWriter091.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -23,7 +23,7 @@ -include_once("lib/RssWriter.php"); +include_once 'lib/RssWriter.php'; class RSSWriter091 extends RSSWriter { function RSSWriter091() Modified: trunk/lib/Request.php =================================================================== --- trunk/lib/Request.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/Request.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -176,7 +176,7 @@ $this->discardOutput(); // This might print the gzip headers. Not good. $this->buffer_output(false); - include_once('lib/Template.php'); + include_once 'lib/Template.php'; $tmpl = new Template('redirect', $this, array('REDIRECT_URL' => $url)); $tmpl->printXML(); $this->finish(); Modified: trunk/lib/RssParser.php =================================================================== --- trunk/lib/RssParser.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/RssParser.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -39,7 +39,7 @@ * http://ws.audioscrobbler.com/rdf/ for example */ -require_once('lib/XmlParser.php'); +require_once 'lib/XmlParser.php'; class RSSParser extends XmlParser { Modified: trunk/lib/RssWriter2.php =================================================================== --- trunk/lib/RssWriter2.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/RssWriter2.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -5,7 +5,7 @@ */ // Encoding for RSS output. -include_once("lib/RssWriter.php"); +include_once 'lib/RssWriter.php'; /** * A class for writing RSS 2.0 with xml-rpc notifier Modified: trunk/lib/SemanticWeb.php =================================================================== --- trunk/lib/SemanticWeb.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/SemanticWeb.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -103,9 +103,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -require_once('lib/RssWriter.php'); -require_once('lib/TextSearchQuery.php'); -require_once('lib/Units.php'); +require_once 'lib/RssWriter.php'; +require_once 'lib/TextSearchQuery.php'; +require_once 'lib/Units.php'; /** Modified: trunk/lib/Template.php =================================================================== --- trunk/lib/Template.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/Template.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -1,7 +1,7 @@ <?php //-*-php-*- -require_once("lib/ErrorManager.php"); +require_once 'lib/ErrorManager.php'; /** An HTML template. */ @@ -78,7 +78,7 @@ } function _printPlugin ($pi) { - include_once("lib/WikiPlugin.php"); + include_once 'lib/WikiPlugin.php'; static $loader; if (empty($loader)) Modified: trunk/lib/WikiDB/ADODB.php =================================================================== --- trunk/lib/WikiDB/ADODB.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/WikiDB/ADODB.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -1,7 +1,7 @@ <?php // -*-php-*- -require_once('lib/WikiDB.php'); +require_once 'lib/WikiDB.php'; /** * WikiDB layer for ADODB, which does nothing more than calling the @@ -31,7 +31,7 @@ } else { $backend = 'ADODB'; } - include_once("lib/WikiDB/backend/".$backend.".php"); + include_once 'lib/WikiDB/backend/'.$backend.'.php'; $backend_class = "WikiDB_backend_".$backend; $backend = new $backend_class($dbparams); if (!$backend->_dbh->_connectionID) return false; Modified: trunk/lib/WikiDB/PDO.php =================================================================== --- trunk/lib/WikiDB/PDO.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/WikiDB/PDO.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -1,7 +1,7 @@ <?php // -*-php-*- -require_once('lib/WikiDB.php'); +require_once 'lib/WikiDB.php'; /** * WikiDB layer for PDO, the new php5 abstraction layer, with support for Modified: trunk/lib/WikiDB/SQL.php =================================================================== --- trunk/lib/WikiDB/SQL.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/WikiDB/SQL.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -1,6 +1,6 @@ <?php -require_once('lib/WikiDB.php'); +require_once 'lib/WikiDB.php'; //require_once('lib/WikiDB/backend/PearDB.php'); //require_once('DB.php'); // Always favor use our local pear copy @@ -20,7 +20,7 @@ if (is_string($dbparams['dsn'])) $dbparams['dsn'] = $backend . ':' . substr($dbparams['dsn'], 10); } - include_once ("lib/WikiDB/backend/PearDB_".$backend.".php"); + include_once 'lib/WikiDB/backend/PearDB_'.$backend.'.php'; $backend_class = "WikiDB_backend_PearDB_".$backend; $backend = new $backend_class($dbparams); if (DB::isError($backend->_dbh)) return; Modified: trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -10,7 +10,7 @@ * Latest version is available at http://php.weblogs.com * */ -include_once('PEAR.php'); +include_once 'PEAR.php'; define('ADODB_ERROR_HANDLER','ADODB_Error_PEAR'); Modified: trunk/lib/WikiDB/adodb/adodb-pear.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/adodb-pear.inc.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/WikiDB/adodb/adodb-pear.inc.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -38,7 +38,7 @@ */ define('ADODB_PEAR',dirname(__FILE__)); -include_once "PEAR.php"; +include_once 'PEAR.php'; include_once ADODB_PEAR."/adodb-errorpear.inc.php"; include_once ADODB_PEAR."/adodb.inc.php"; Modified: trunk/lib/WikiDB/backend/ADODB.php =================================================================== --- trunk/lib/WikiDB/backend/ADODB.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/WikiDB/backend/ADODB.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -63,11 +63,11 @@ * performance is comparable. */ -require_once('lib/WikiDB/backend.php'); +require_once 'lib/WikiDB/backend.php'; // Error handling - calls trigger_error. NB - does not close the connection. Does it need to? -include_once('lib/WikiDB/adodb/adodb-errorhandler.inc.php'); +include_once 'lib/WikiDB/adodb/adodb-errorhandler.inc.php'; // include the main adodb file -require_once('lib/WikiDB/adodb/adodb.inc.php'); +require_once 'lib/WikiDB/adodb/adodb.inc.php'; class WikiDB_backend_ADODB extends WikiDB_backend Modified: trunk/lib/WikiDB/backend/ADODB_mssql.php =================================================================== --- trunk/lib/WikiDB/backend/ADODB_mssql.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/WikiDB/backend/ADODB_mssql.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -5,7 +5,7 @@ * MS SQL extensions for the ADODB DB backend. */ -require_once('lib/WikiDB/backend/ADODB.php'); +require_once 'lib/WikiDB/backend/ADODB.php'; class WikiDB_backend_ADODB_mssql extends WikiDB_backend_ADODB Modified: trunk/lib/WikiDB/backend/ADODB_mssqlnative.php =================================================================== --- trunk/lib/WikiDB/backend/ADODB_mssqlnative.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/WikiDB/backend/ADODB_mssqlnative.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -4,7 +4,7 @@ /** * MS SQL extensions for the ADODB DB backend. */ -require_once('lib/WikiDB/backend/ADODB.php'); +require_once 'lib/WikiDB/backend/ADODB.php'; class WikiDB_backend_ADODB_mssqlnative extends WikiDB_backend_ADODB Modified: trunk/lib/WikiDB/backend/ADODB_mysql.php =================================================================== --- trunk/lib/WikiDB/backend/ADODB_mysql.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/WikiDB/backend/ADODB_mysql.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -1,7 +1,7 @@ <?php // -*-php-*- -require_once('lib/WikiDB/backend/ADODB.php'); +require_once 'lib/WikiDB/backend/ADODB.php'; /* * PROBLEM: mysql seems to be the simpliest (or most stupid) db on earth. Modified: trunk/lib/WikiDB/backend/ADODB_oci8po.php =================================================================== --- trunk/lib/WikiDB/backend/ADODB_oci8po.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/WikiDB/backend/ADODB_oci8po.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -6,7 +6,7 @@ * @author: Phi...@to... */ -require_once('lib/WikiDB/backend/ADODB.php'); +require_once 'lib/WikiDB/backend/ADODB.php'; class WikiDB_backend_ADODB_oci8po extends WikiDB_backend_ADODB Modified: trunk/lib/WikiDB/backend/ADODB_postgres7.php =================================================================== --- trunk/lib/WikiDB/backend/ADODB_postgres7.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/WikiDB/backend/ADODB_postgres7.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -1,7 +1,7 @@ <?php // -*-php-*- -require_once('lib/WikiDB/backend/ADODB.php'); +require_once 'lib/WikiDB/backend/ADODB.php'; if (!defined("USE_BYTEA")) // see schemas/psql-initialize.sql define("USE_BYTEA", true); // only BYTEA is binary safe Modified: trunk/lib/WikiDB/backend/ADODB_sqlite.php =================================================================== --- trunk/lib/WikiDB/backend/ADODB_sqlite.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/WikiDB/backend/ADODB_sqlite.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -1,7 +1,7 @@ <?php // -*-php-*- -require_once('lib/WikiDB/backend/ADODB.php'); +require_once 'lib/WikiDB/backend/ADODB.php'; /** * WikiDB layer for ADODB-sqlite, called by lib/WikiDB/ADODB.php. Modified: trunk/lib/WikiDB/backend/PDO.php =================================================================== --- trunk/lib/WikiDB/backend/PDO.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/WikiDB/backend/PDO.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -25,7 +25,7 @@ * @author: Reini Urban */ -require_once('lib/WikiDB/backend.php'); +require_once 'lib/WikiDB/backend.php'; class WikiDB_backend_PDO extends WikiDB_backend Modified: trunk/lib/WikiDB/backend/PDO_mysql.php =================================================================== --- trunk/lib/WikiDB/backend/PDO_mysql.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/WikiDB/backend/PDO_mysql.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -24,7 +24,7 @@ /** * @author: Reini Urban */ -require_once('lib/WikiDB/backend/PDO.php'); +require_once 'lib/WikiDB/backend/PDO.php'; class WikiDB_backend_PDO_mysql extends WikiDB_backend_PDO Modified: trunk/lib/WikiDB/backend/PDO_oci8.php =================================================================== --- trunk/lib/WikiDB/backend/PDO_oci8.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/WikiDB/backend/PDO_oci8.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -24,7 +24,7 @@ /** * @author: Reini Urban */ -require_once('lib/WikiDB/backend/PDO.php'); +require_once 'lib/WikiDB/backend/PDO.php'; class WikiDB_backend_PDO_oci8 extends WikiDB_backend_PDO Modified: trunk/lib/WikiDB/backend/PDO_pgsql.php =================================================================== --- trunk/lib/WikiDB/backend/PDO_pgsql.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/WikiDB/backend/PDO_pgsql.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -24,7 +24,7 @@ /** * @author: Reini Urban */ -require_once('lib/WikiDB/backend/PDO.php'); +require_once 'lib/WikiDB/backend/PDO.php'; class WikiDB_backend_PDO_pgsql extends WikiDB_backend_PDO Modified: trunk/lib/WikiDB/backend/PearDB.php =================================================================== --- trunk/lib/WikiDB/backend/PearDB.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/WikiDB/backend/PearDB.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -1,7 +1,7 @@ <?php // -*-php-*- -require_once('lib/WikiDB/backend.php'); +require_once 'lib/WikiDB/backend.php'; //require_once('lib/FileFinder.php'); //require_once('lib/ErrorManager.php'); @@ -30,7 +30,7 @@ include_once("$dir/DB.php"); } } else { - include_once("DB.php"); + include_once 'DB.php'; } // Install filter to handle bogus error notices from buggy DB.php's. Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php =================================================================== --- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -44,8 +44,8 @@ * ALONE BASIS." */ -require_once('lib/ErrorManager.php'); -require_once('lib/WikiDB/backend/PearDB_pgsql.php'); +require_once 'lib/ErrorManager.php'; +require_once 'lib/WikiDB/backend/PearDB_pgsql.php'; class WikiDB_backend_PearDB_ffpgsql extends WikiDB_backend_PearDB_pgsql Modified: trunk/lib/WikiDB/backend/PearDB_mysql.php =================================================================== --- trunk/lib/WikiDB/backend/PearDB_mysql.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/WikiDB/backend/PearDB_mysql.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -1,7 +1,7 @@ <?php // -*-php-*- -require_once('lib/WikiDB/backend/PearDB.php'); +require_once 'lib/WikiDB/backend/PearDB.php'; // See http://sql-info.de/mysql/gotchas.html for mysql specific quirks. Modified: trunk/lib/WikiDB/backend/PearDB_oci8.php =================================================================== --- trunk/lib/WikiDB/backend/PearDB_oci8.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/WikiDB/backend/PearDB_oci8.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -6,7 +6,7 @@ * @author: Phi...@to... */ -require_once('lib/WikiDB/backend/PearDB_pgsql.php'); +require_once 'lib/WikiDB/backend/PearDB_pgsql.php'; class WikiDB_backend_PearDB_oci8 extends WikiDB_backend_PearDB_pgsql Modified: trunk/lib/WikiDB/backend/PearDB_pgsql.php =================================================================== --- trunk/lib/WikiDB/backend/PearDB_pgsql.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/WikiDB/backend/PearDB_pgsql.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -1,8 +1,8 @@ <?php // -*-php-*- -require_once('lib/ErrorManager.php'); -require_once('lib/WikiDB/backend/PearDB.php'); +require_once 'lib/ErrorManager.php'; +require_once 'lib/WikiDB/backend/PearDB.php'; if (!defined("USE_BYTEA")) // see schemas/psql-initialize.sql define("USE_BYTEA", true); Modified: trunk/lib/WikiDB/backend/PearDB_sqlite.php =================================================================== --- trunk/lib/WikiDB/backend/PearDB_sqlite.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/WikiDB/backend/PearDB_sqlite.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -10,7 +10,7 @@ */ -require_once('lib/WikiDB/backend/PearDB.php'); +require_once 'lib/WikiDB/backend/PearDB.php'; //TODO: create tables on virgin wiki /* Modified: trunk/lib/WikiDB/backend/cvs.php =================================================================== --- trunk/lib/WikiDB/backend/cvs.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/WikiDB/backend/cvs.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -9,8 +9,8 @@ * Author: Gerrit Riessen, ger...@op... */ -require_once('lib/WikiDB/backend.php'); -require_once('lib/ErrorManager.php'); +require_once 'lib/WikiDB/backend.php'; +require_once 'lib/ErrorManager.php'; /** * Constants used by the CVS backend @@ -402,7 +402,7 @@ /* function get_all_revisions($pagename) { // TODO: should replace this with something more efficient - include_once('lib/WikiDB/backend/dumb/AllRevisionsIter.php'); + include_once 'lib/WikiDB/backend/dumb/AllRevisionsIter.php'; return new WikiDB_backend_dumb_AllRevisionsIter($this, $pagename); } */ Modified: trunk/lib/WikiDB/backend/dba.php =================================================================== --- trunk/lib/WikiDB/backend/dba.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/WikiDB/backend/dba.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -1,7 +1,7 @@ <?php -require_once('lib/WikiDB/backend/dbaBase.php'); -require_once('lib/DbaDatabase.php'); +require_once 'lib/WikiDB/backend/dbaBase.php'; +require_once 'lib/DbaDatabase.php'; class WikiDB_backend_dba extends WikiDB_backend_dbaBase Modified: trunk/lib/WikiDB/backend/dbaBase.php =================================================================== --- trunk/lib/WikiDB/backend/dbaBase.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/WikiDB/backend/dbaBase.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -1,7 +1,7 @@ <?php // -*-php-*- -require_once('lib/WikiDB/backend.php'); +require_once 'lib/WikiDB/backend.php'; // FIXME:padding of data? Is it needed? dba_optimize() seems to do a good // job at packing 'gdbm' (and 'db2') databases. @@ -40,7 +40,7 @@ * each time we get a hit. Maybe not so important though. */ -require_once('lib/DbaPartition.php'); +require_once 'lib/DbaPartition.php'; class WikiDB_backend_dbaBase extends WikiDB_backend Modified: trunk/lib/WikiDB/backend/dumb/BackLinkIter.php =================================================================== --- trunk/lib/WikiDB/backend/dumb/BackLinkIter.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/WikiDB/backend/dumb/BackLinkIter.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -1,7 +1,7 @@ <?php // -*-php-*- // $Id$ -require_once('lib/WikiDB/backend.php'); +require_once 'lib/WikiDB/backend.php'; /** * This backlink iterator will work with any WikiDB_backend Modified: trunk/lib/WikiDB/backend/dumb/MostPopularIter.php =================================================================== --- trunk/lib/WikiDB/backend/dumb/MostPopularIter.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/WikiDB/backend/dumb/MostPopularIter.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -1,7 +1,7 @@ <?php // -*-php-*- // $Id$ -require_once('lib/WikiDB/backend.php'); +require_once 'lib/WikiDB/backend.php'; /** * An inefficient but general most_popular iterator. Modified: trunk/lib/WikiDB/backend/dumb/MostRecentIter.php =================================================================== --- trunk/lib/WikiDB/backend/dumb/MostRecentIter.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/WikiDB/backend/dumb/MostRecentIter.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -1,7 +1,7 @@ <?php // -*-php-*- // $Id$ -require_once('lib/WikiDB/backend.php'); +require_once 'lib/WikiDB/backend.php'; /** * An inefficient but general most_recent iterator. Modified: trunk/lib/WikiDB/backend/file.php =================================================================== --- trunk/lib/WikiDB/backend/file.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/WikiDB/backend/file.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -41,8 +41,8 @@ * */ -require_once('lib/WikiDB/backend.php'); -require_once('lib/ErrorManager.php'); +require_once 'lib/WikiDB/backend.php'; +require_once 'lib/ErrorManager.php'; class WikiDB_backend_file extends WikiDB_backend @@ -542,7 +542,7 @@ */ /* function get_all_revisions($pagename) { - include_once('lib/WikiDB/backend/dumb/AllRevisionsIter.php'); + include_once 'lib/WikiDB/backend/dumb/AllRevisionsIter.php'; return new WikiDB_backend_dumb_AllRevisionsIter($this, $pagename); } */ @@ -567,7 +567,7 @@ * @return object A WikiDB_backend_iterator. */ function get_all_pages($include_empty=false, $sortby='', $limit='', $exclude='') { - require_once("lib/PageList.php"); + require_once 'lib/PageList.php'; $this->_loadLatestVersions(); $a = array_keys($this->_latest_versions); if (empty($a)) Modified: trunk/lib/WikiDB/backend/flatfile.php =================================================================== --- trunk/lib/WikiDB/backend/flatfile.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/WikiDB/backend/flatfile.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -32,8 +32,8 @@ * Author: Reini Urban, based on the file backend by Jochen Kalmbach */ -require_once('lib/WikiDB/backend/file.php'); -require_once('lib/loadsave.php'); +require_once 'lib/WikiDB/backend/file.php'; +require_once 'lib/loadsave.php'; class WikiDB_backend_flatfile extends WikiDB_backend_file Modified: trunk/lib/WikiDB/backend.php =================================================================== --- trunk/lib/WikiDB/backend.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/WikiDB/backend.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -300,7 +300,7 @@ * @return object A WikiDB_backend_iterator. */ function get_all_revisions($pagename) { - include_once('lib/WikiDB/backend/dumb/AllRevisionsIter.php'); + include_once 'lib/WikiDB/backend/dumb/AllRevisionsIter.php'; return new WikiDB_backend_dumb_AllRevisionsIter($this, $pagename); } @@ -353,7 +353,7 @@ // // It is expected that most backends will overload // this method with something more efficient. - include_once('lib/WikiDB/backend/dumb/TextSearchIter.php'); + include_once 'lib/WikiDB/backend/dumb/TextSearchIter.php'; // ignore $limit $pages = $this->get_all_pages(false, $sortby, false, $exclude); return new WikiDB_backend_dumb_TextSearchIter($this, $pages, $search, $fulltext, @@ -374,7 +374,7 @@ * @see WikiDB::linkSearch */ function link_search( $pages, $linkvalue, $linktype, $relation=false, $options=array() ) { - include_once('lib/WikiDB/backend/dumb/LinkSearchIter.php'); + include_once 'lib/WikiDB/backend/dumb/LinkSearchIter.php'; $pageiter = $this->text_search($pages); return new WikiDB_backend_dumb_LinkSearchIter($this, $pageiter, $linkvalue, $linktype, $relation, $options); } @@ -396,7 +396,7 @@ // // It is expected that most backends will overload // method with something more efficient. - include_once('lib/WikiDB/backend/dumb/MostPopularIter.php'); + include_once 'lib/WikiDB/backend/dumb/MostPopularIter.php'; $pages = $this->get_all_pages(false, $sortby, false); return new WikiDB_backend_dumb_MostPopularIter($this, $pages, $limit); } @@ -416,13 +416,13 @@ // // It is expected that most backends will overload // method with something more efficient. - include_once('lib/WikiDB/backend/dumb/MostRecentIter.php'); + include_once 'lib/WikiDB/backend/dumb/MostRecentIter.php'; $pages = $this->get_all_pages(true, '-mtime'); return new WikiDB_backend_dumb_MostRecentIter($this, $pages, $params); } function wanted_pages($exclude_from='', $exclude='', $sortby='', $limit='') { - include_once('lib/WikiDB/backend/dumb/WantedPagesIter.php'); + include_once 'lib/WikiDB/backend/dumb/WantedPagesIter.php'; $allpages = $this->get_all_pages(true,false,false,$exclude_from); return new WikiDB_backend_dumb_WantedPagesIter($this, $allpages, $exclude, $sortby, $limit); } Modified: trunk/lib/WikiDB/cvs.php =================================================================== --- trunk/lib/WikiDB/cvs.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/WikiDB/cvs.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -2,8 +2,8 @@ -require_once( 'lib/WikiDB.php' ); -require_once( 'lib/WikiDB/backend/cvs.php' ); +require_once 'lib/WikiDB.php'; +require_once 'lib/WikiDB/backend/cvs.php'; /** * Wrapper class for the cvs backend. Modified: trunk/lib/WikiDB/dba.php =================================================================== --- trunk/lib/WikiDB/dba.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/WikiDB/dba.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -1,7 +1,7 @@ <?php -require_once('lib/WikiDB.php'); -require_once('lib/WikiDB/backend/dba.php'); +require_once 'lib/WikiDB.php'; +require_once 'lib/WikiDB/backend/dba.php'; /** * */ Modified: trunk/lib/WikiDB/file.php =================================================================== --- trunk/lib/WikiDB/file.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/WikiDB/file.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -22,8 +22,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -require_once( 'lib/WikiDB.php' ); -require_once( 'lib/WikiDB/backend/file.php' ); +require_once 'lib/WikiDB.php'; +require_once 'lib/WikiDB/backend/file.php'; /** * Wrapper class for the file backend. Modified: trunk/lib/WikiDB/flatfile.php =================================================================== --- trunk/lib/WikiDB/flatfile.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/WikiDB/flatfile.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -21,8 +21,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -require_once( 'lib/WikiDB.php' ); -require_once( 'lib/WikiDB/backend/flatfile.php' ); +require_once 'lib/WikiDB.php'; +require_once 'lib/WikiDB/backend/flatfile.php'; /** * Wrapper class for the flatfile backend. Modified: trunk/lib/WikiDB.php =================================================================== --- trunk/lib/WikiDB.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/WikiDB.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -1,5 +1,5 @@ <?php -require_once('lib/PageType.php'); +require_once 'lib/PageType.php'; /** * The classes in the file define the interface to the @@ -222,7 +222,7 @@ /* Generate notification emails */ if (ENABLE_MAILNOTIFY) { - include_once("lib/MailNotify.php"); + include_once 'lib/MailNotify.php'; $MailNotify = new MailNotify($pagename); $MailNotify->onDeletePage ($this, $pagename); } @@ -518,7 +518,7 @@ if ($updateWikiLinks) { $lookbehind = "/(?<=[\W:])\Q"; $lookahead = "\E(?=[\W:])/"; - require_once('lib/plugin/WikiAdminSearchReplace.php'); + require_once 'lib/plugin/WikiAdminSearchReplace.php'; $links = $oldpage->getBackLinks(); while ($linked_page = $links->next()) { WikiPlugin_WikiAdminSearchReplace::replaceHelper @@ -563,7 +563,7 @@ if ($result and ENABLE_MAILNOTIFY and !isa($GLOBALS['request'], 'MockRequest')) { $notify = $this->get('notify'); if (!empty($notify) and is_array($notify)) { - include_once("lib/MailNotify.php"); + include_once 'lib/MailNotify.php'; $MailNotify = new MailNotify($from); $MailNotify->onRenamePage ($this, $from, $to); } @@ -1014,7 +1014,7 @@ and is_array($notify) and !isa($GLOBALS['request'],'MockRequest')) { - include_once("lib/MailNotify.php"); + include_once 'lib/MailNotify.php'; $MailNotify = new MailNotify($newrevision->getName()); $MailNotify->onChangePage ($this->_wikidb, $wikitext, $version, $meta); } @@ -1026,7 +1026,7 @@ and !in_array($GLOBALS['request']->getArg('action'), array('loadfile','upgrade'))) { - require_once("lib/WikiPlugin.php"); + require_once 'lib/WikiPlugin.php'; $w = new WikiPluginLoader; $p = $w->getPlugin("RecentChangesCached", false); $p->box_update(false, $GLOBALS['request'], $this->_pagename); @@ -1638,7 +1638,7 @@ if (empty($data['%content']) || (!$this->_wikidb->isWikiPage($this->_pagename) && $this->isCurrent())) { - include_once('lib/InlineParser.php'); + include_once 'lib/InlineParser.php'; // A feature similar to taglines at http://www.wlug.org.nz/ // Lib from http://www.aasted.org/quote/ @@ -1647,7 +1647,7 @@ and in_array($GLOBALS['request']->getArg('action'), array('create','edit'))) { - include_once("lib/fortune.php"); + include_once 'lib/fortune.php'; $fortune = new Fortune(); $quote = $fortune->quoteFromDir(FORTUNE_DIR); if ($quote != -1) Modified: trunk/lib/WikiGroup.php =================================================================== --- trunk/lib/WikiGroup.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/WikiGroup.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -844,7 +844,7 @@ E_USER_WARNING); return false; } - require_once('lib/pear/File_Passwd.php'); + require_once 'lib/pear/File_Passwd.php'; $this->_file = new File_Passwd(AUTH_GROUP_FILE,false,AUTH_GROUP_FILE.".lock"); } Modified: trunk/lib/WikiPluginCached.php =================================================================== --- trunk/lib/WikiPluginCached.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/WikiPluginCached.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -26,7 +26,7 @@ * This file belongs to WikiPluginCached. */ -require_once "lib/WikiPlugin.php"; +require_once 'lib/WikiPlugin.php'; // require_once "lib/plugincache-config.php"; // replaced by config.ini settings! // types: @@ -490,7 +490,7 @@ if ($lib = $pearFinder->findFile('Cache.php', 'missing_ok')) require_once($lib); else // fall back to our own copy - require_once('lib/pear/Cache.php'); + require_once 'lib/pear/Cache.php'; } $cacheparams = array(); foreach (explode(':','database:cache_dir:filename_prefix:highwater:lowwater' Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/WikiTheme.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -1548,7 +1548,7 @@ $this->_findData('jscalendar/calendar-setup'.(DEBUG?'':'_stripped').'.js')))); // Get existing date entries for the current user - require_once("lib/TextSearchQuery.php"); + require_once 'lib/TextSearchQuery.php'; $iter = $dbi->titleSearch(new TextSearchQuery("^".$this->calendarBase().SUBPAGE_SEPARATOR, true, "auto")); $existing = array(); while ($page = $iter->next()) { @@ -1772,7 +1772,7 @@ class SidebarBox { function SidebarBox($title, $body) { - require_once('lib/WikiPlugin.php'); + require_once 'lib/WikiPlugin.php'; $this->title = $title; $this->body = $body; } @@ -1791,7 +1791,7 @@ var $_plugin, $_args = false, $_basepage = false; function PluginSidebarBox($name, $args = false, $basepage = false) { - require_once("lib/WikiPlugin.php"); + require_once 'lib/WikiPlugin.php'; $loader = new WikiPluginLoader(); $plugin = $loader->getPlugin($name); Modified: trunk/lib/WikiUser/AdoDb.php =================================================================== --- trunk/lib/WikiUser/AdoDb.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/WikiUser/AdoDb.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -20,7 +20,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -include_once("lib/WikiUser/Db.php"); +include_once 'lib/WikiUser/Db.php'; class _AdoDbPassUser extends _DbPassUser Modified: trunk/lib/WikiUser/Db.php =================================================================== --- trunk/lib/WikiUser/Db.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/WikiUser/Db.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -65,7 +65,7 @@ $dbi =& $GLOBALS['request']->_dbi; $dbtype = $dbi->getParam('dbtype'); if ($dbtype == 'ADODB') { - include_once("lib/WikiUser/AdoDb.php"); + include_once 'lib/WikiUser/AdoDb.php'; if (check_php_version(5)) return new _AdoDbPassUser($UserName,$this->_prefs); else { @@ -75,7 +75,7 @@ } } elseif ($dbtype == 'SQL') { - include_once("lib/WikiUser/PearDb.php"); + include_once 'lib/WikiUser/PearDb.php'; if (check_php_version(5)) return new _PearDbPassUser($UserName,$this->_prefs); else { @@ -85,7 +85,7 @@ } } elseif ($dbtype == 'PDO') { - include_once("lib/WikiUser/PdoDb.php"); + include_once 'lib/WikiUser/PdoDb.php'; if (check_php_version(5)) return new _PdoDbPassUser($UserName,$this->_prefs); else { Modified: trunk/lib/WikiUser/Facebook.php =================================================================== --- trunk/lib/WikiUser/Facebook.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/WikiUser/Facebook.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -25,7 +25,7 @@ */ // requires the openssl extension -require_once("lib/HttpClient.php"); +require_once 'lib/HttpClient.php'; class _FacebookPassUser extends _PassUser { Modified: trunk/lib/WikiUser/LdapUpper.php =================================================================== --- trunk/lib/WikiUser/LdapUpper.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/WikiUser/LdapUpper.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -19,7 +19,7 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -include_once("lib/WikiUser/LDAP.php"); +include_once 'lib/WikiUser/LDAP.php'; /** * Overrides for LDAP (Windows domain) usernames: Modified: trunk/lib/WikiUser/OpenID.php =================================================================== --- trunk/lib/WikiUser/OpenID.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/WikiUser/OpenID.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -27,7 +27,7 @@ */ // requires the openssl extension -require_once("lib/HttpClient.php"); +require_once 'lib/HttpClient.php'; class _OpenIDPassUser extends _PassUser Modified: trunk/lib/WikiUser/POP3.php =================================================================== --- trunk/lib/WikiUser/POP3.php 2012-09-28 11:33:02 UTC (rev 8289) +++ trunk/lib/WikiUser/POP3.php 2012-09-28 12:11:35 UTC (rev 8290) @@ -20,7 +20,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -require_once("lib/WikiUser/IMAP.php"); +require_once 'lib/WikiUser/IMAP.php'; class _POP3PassUser extends _IMAPPassUser { Modified: trunk/lib/WikiUser/PdoDb.php ==================... [truncated message content] |