From: <var...@us...> - 2014-11-10 19:46:54
|
Revision: 9302 http://sourceforge.net/p/phpwiki/code/9302 Author: vargenau Date: 2014-11-10 19:46:50 +0000 (Mon, 10 Nov 2014) Log Message: ----------- Type compatibility Modified Paths: -------------- trunk/lib/config.php trunk/lib/display.php Modified: trunk/lib/config.php =================================================================== --- trunk/lib/config.php 2014-11-10 19:35:50 UTC (rev 9301) +++ trunk/lib/config.php 2014-11-10 19:46:50 UTC (rev 9302) @@ -107,8 +107,10 @@ * => "de" * We should really check additionally if the i18n HomePage version is defined. * So must defer this to the request loop. + * + * @param array $languages */ -function guessing_lang($languages = false) +function guessing_lang($languages = array()) { if (!$languages) { // make this faster Modified: trunk/lib/display.php =================================================================== --- trunk/lib/display.php 2014-11-10 19:35:50 UTC (rev 9301) +++ trunk/lib/display.php 2014-11-10 19:46:50 UTC (rev 9302) @@ -219,10 +219,10 @@ /** * @param WikiRequest $request - * @param bool $template + * @param Template $template * @return string */ -function displayPage(&$request, $template = false) +function displayPage(&$request, $template = null) { global $WikiTheme; global $robots; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-11-18 16:26:59
|
Revision: 9330 http://sourceforge.net/p/phpwiki/code/9330 Author: vargenau Date: 2014-11-18 16:26:56 +0000 (Tue, 18 Nov 2014) Log Message: ----------- Get closer lib/AccessLog.php and lib/Request.php Modified Paths: -------------- trunk/lib/AccessLog.php trunk/lib/Request.php Modified: trunk/lib/AccessLog.php =================================================================== --- trunk/lib/AccessLog.php 2014-11-18 09:58:08 UTC (rev 9329) +++ trunk/lib/AccessLog.php 2014-11-18 16:26:56 UTC (rev 9330) @@ -12,7 +12,7 @@ * * PhpWiki 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 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along @@ -38,7 +38,7 @@ * @param string $logfile Log file name. * @param bool $do_sql */ - function Request_AccessLog($logfile, $do_sql = false) + function __construct($logfile, $do_sql = false) { //global $request; // request not yet initialized! @@ -171,13 +171,6 @@ } } - function read_sql($where = '') - { - if (empty($this->sqliter)) - $this->sqliter = $this->_read_sql_query($where); - return $this->sqliter->next(); - } - function _read_sql_query($where = '') { global $request; @@ -189,6 +182,13 @@ . ($where ? " WHERE $where" : "")); } + function read_sql($where = '') + { + if (empty($this->sqliter)) + $this->sqliter = $this->_read_sql_query($where); + return $this->sqliter->next(); + } + /* done in request->finish() before the db is closed */ function write_sql() { Modified: trunk/lib/Request.php =================================================================== --- trunk/lib/Request.php 2014-11-18 09:58:08 UTC (rev 9329) +++ trunk/lib/Request.php 2014-11-18 16:26:56 UTC (rev 9330) @@ -905,7 +905,11 @@ } /** - * Return iterator of referer items reverse sorted (latest first). + * Return iterator of referrer items reverse sorted (latest first). + * + * @param int $limit + * @param bool $external_only + * @return WikiDB_Array_generic_iter */ function get_referer($limit = 15, $external_only = false) { @@ -965,7 +969,8 @@ function _read_sql_query($where = '') { - $dbh =& $GLOBALS['request']->_dbi; + global $request; + $dbh =& $request->_dbi; $log_tbl =& $this->logtable; return $dbh->genericSqlIter("SELECT *,request_uri as request,request_time as time,remote_user as user," . "remote_host as host,agent as user_agent" @@ -983,7 +988,8 @@ /* done in request->finish() before the db is closed */ function write_sql() { - $dbh =& $GLOBALS['request']->_dbi; + global $request; + $dbh =& $request->_dbi; if (isset($this->entries) and $dbh and $dbh->isOpen()) foreach ($this->entries as $entry) { $entry->write_sql(); @@ -1183,7 +1189,7 @@ } /** - * Shutdown callback. + * Shutdown callback. Ensures that the file is written. * * @access private * @see Request_AccessLogEntry This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-11-20 15:18:16
|
Revision: 9349 http://sourceforge.net/p/phpwiki/code/9349 Author: vargenau Date: 2014-11-20 15:18:14 +0000 (Thu, 20 Nov 2014) Log Message: ----------- More abstraction Modified Paths: -------------- trunk/lib/BlockParser.php trunk/lib/InlineParser.php trunk/lib/WysiwygEdit.php Modified: trunk/lib/BlockParser.php =================================================================== --- trunk/lib/BlockParser.php 2014-11-20 13:27:16 UTC (rev 9348) +++ trunk/lib/BlockParser.php 2014-11-20 15:18:14 UTC (rev 9349) @@ -19,7 +19,6 @@ * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 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'; @@ -143,7 +142,7 @@ $match->postmatch = substr($text, strlen($m[0])); $match->match = $m[1]; $match->regexp_ind = count($m) - 3 + $prevMatch->regexp_ind + 1; - ; + return $match; } } @@ -151,9 +150,8 @@ class BlockParser_Input { - function BlockParser_Input($text) + function __construct($text) { - // Expand leading tabs. // FIXME: do this better. // @@ -345,7 +343,7 @@ class Block_HtmlElement extends HtmlElement { - function Block_HtmlElement($tag /*, ... */) + function __construct($tag /*, ... */) { $this->_init(func_get_args()); } @@ -358,14 +356,14 @@ class ParsedBlock extends Block_HtmlElement { - function ParsedBlock(&$input, $tag = 'div', $attr = array()) + function __construct(&$input, $tag = 'div', $attr = array()) { - $this->Block_HtmlElement($tag, $attr); + parent::__construct($tag, $attr); $this->_initBlockTypes(); $this->_parse($input); } - function _parse(&$input) + private function _parse(&$input) { // php5 failed to advance the block. php5 copies objects by ref. // nextBlock == block, both are the same objects. So we have to clone it. @@ -384,7 +382,7 @@ } // FIXME: hackish. This should only be called once. - function _initBlockTypes() + private function _initBlockTypes() { // better static or global? static $_regexpset, $_block_types; @@ -419,7 +417,7 @@ } } - function _getBlock(&$input) + private function _getBlock(&$input) { $this->_atSpace = $input->skipSpace(); @@ -456,20 +454,20 @@ class WikiText extends ParsedBlock { - function WikiText($text) + function __construct($text) { $input = new BlockParser_Input($text); - $this->ParsedBlock($input); + parent::__construct($input); } } class SubBlock extends ParsedBlock { - function SubBlock(&$input, $indent_re, $initial_indent = false, - $tag = 'div', $attr = array()) + function __construct(&$input, $indent_re, $initial_indent = false, + $tag = 'div', $attr = array()) { $subinput = new BlockParser_InputSubBlock($input, $indent_re, $initial_indent); - $this->ParsedBlock($subinput, $tag, $attr); + parent::__construct($subinput, $tag, $attr); } } @@ -488,7 +486,7 @@ function __construct(&$input, $indent_re, $initial_indent = false, $tag = 'div', $attr = array()) { - $this->SubBlock($input, $indent_re, $initial_indent, $tag, $attr); + parent::__construct($input, $indent_re, $initial_indent, $tag, $attr); // If content is a single paragraph, eliminate the paragraph... if (count($this->_content) == 1) { @@ -691,7 +689,7 @@ $this->_tight_bot = $tight_bot; } - function _addToRow($item) + private function _addToRow($item) { if (empty($this->_accum)) { $this->_accum = HTML::td(); @@ -701,7 +699,7 @@ $this->_accum->pushContent($item); } - function _flushRow($tight_bottom = false) + private function _flushRow($tight_bottom = false) { if (!empty($this->_accum)) { $row = new Block_HtmlElement('tr', false, $this->_accum); @@ -715,7 +713,7 @@ } } - function _addSubtable($table) + private function _addSubtable($table) { if (!($table_rows = $table->getContent())) return; @@ -729,7 +727,7 @@ } } - function _setTerm($th) + private function _setTerm($th) { $first_row = &$this->_content[0]; if (is_a($first_row, 'Block_table_dl_defn')) @@ -738,7 +736,7 @@ $first_row->unshiftContent($th); } - function _ComputeNcols($defn) + private function _ComputeNcols($defn) { $ncols = 2; foreach ($defn as $item) { @@ -750,14 +748,14 @@ return $ncols; } - function _IsASubtable($item) + private function _IsASubtable($item) { return is_a($item, 'HtmlElement') && $item->getTag() == 'table' && $item->getAttr('class') == 'wiki-dl-table'; } - function _FirstDefn($subtable) + private function _FirstDefn($subtable) { $defs = $subtable->getContent(); return $defs[0]; Modified: trunk/lib/InlineParser.php =================================================================== --- trunk/lib/InlineParser.php 2014-11-20 13:27:16 UTC (rev 9348) +++ trunk/lib/InlineParser.php 2014-11-20 15:18:14 UTC (rev 9349) @@ -173,7 +173,8 @@ } // To overcome ANCHORED: // We could sort by longest match and iterate over these. - if (empty($matched)) return false; + if (empty($matched)) + return false; } $match = new RegexpSet_match; @@ -264,16 +265,11 @@ */ abstract class BalancedMarkup { - public $_start_regexp; - /** Get the starting regexp for this rule. * * @return string The starting regexp. */ - function getStartRegexp() - { - return $this->_start_regexp; - } + abstract function getStartRegexp(); /** Get the ending regexp for this rule. * @@ -281,10 +277,7 @@ * * @return string The ending regexp. */ - function getEndRegexp($match) - { - return $this->_end_regexp; - } + abstract function getEndRegexp($match); /** Get expansion for matching input. * @@ -347,8 +340,8 @@ preg_match('/(\#?) \[\s* (?: (.*?) \s* (?<!' . ESCAPE_CHAR . ')(\|) )? \s* (.+?) \s*\]/x', str_replace("\n", " ", $bracketlink), $matches); if (count($matches) < 4) { - trigger_error(_("Invalid [] syntax ignored") . _(": ") . $bracketlink, E_USER_WARNING); - return new Cached_Link; + return HTML::span(array('class' => 'error'), + _("Invalid [] syntax ignored") . _(": ") . $bracketlink); } list (, $hash, $label, $bar, $rawlink) = $matches; @@ -675,7 +668,10 @@ class Markup_wikicreole_italics extends BalancedMarkup { - public $_start_regexp = "\\/\\/"; + function getStartRegexp() + { + return "\\/\\/"; + } function getEndRegexp($match) { @@ -691,7 +687,10 @@ class Markup_wikicreole_bold extends BalancedMarkup { - public $_start_regexp = "\\*\\*"; + function getStartRegexp() + { + return "\\*\\*"; + } function getEndRegexp($match) { @@ -707,7 +706,10 @@ class Markup_wikicreole_monospace extends BalancedMarkup { - public $_start_regexp = "\\#\\#"; + function getStartRegexp() + { + return "\\#\\#"; + } function getEndRegexp($match) { @@ -722,7 +724,10 @@ class Markup_wikicreole_underline extends BalancedMarkup { - public $_start_regexp = "\\_\\_"; + function getStartRegexp() + { + return "\\_\\_"; + } function getEndRegexp($match) { @@ -738,7 +743,10 @@ class Markup_wikicreole_superscript extends BalancedMarkup { - public $_start_regexp = "\\^\\^"; + function getStartRegexp() + { + return "\\^\\^"; + } function getEndRegexp($match) { @@ -754,11 +762,14 @@ class Markup_wikicreole_subscript extends BalancedMarkup { - public $_start_regexp = ",,"; + function getStartRegexp() + { + return ",,"; + } function getEndRegexp($match) { - return $match; + return ",,"; } function markup($match, $body) @@ -770,11 +781,14 @@ class Markup_old_emphasis extends BalancedMarkup { - public $_start_regexp = "''"; + function getStartRegexp() + { + return "''"; + } function getEndRegexp($match) { - return $match; + return "''"; } function markup($match, $body) @@ -846,8 +860,10 @@ class Markup_html_emphasis extends BalancedMarkup { - public $_start_regexp = - "<(?: b|big|i|small|tt|em|strong|cite|code|dfn|kbd|samp|s|strike|del|var|sup|sub )>"; + function getStartRegexp() + { + return "<(?: b|big|i|small|tt|em|strong|cite|code|dfn|kbd|samp|s|strike|del|var|sup|sub )>"; + } function getEndRegexp($match) { @@ -866,9 +882,10 @@ class Markup_html_divspan extends BalancedMarkup { - public $_start_regexp = - "<(?: div|span )(?: \s[^>]*)?>"; - + function getStartRegexp() + { + return "<(?: div|span )(?: \s[^>]*)?>"; + } function getEndRegexp($match) { if (substr($match, 1, 4) == 'span') @@ -898,8 +915,12 @@ { //rurban: abbr|acronym need an optional title tag. //sf.net bug #728595 - public $_start_regexp = "<(?: abbr|acronym )(?: [^>]*)?>"; + function getStartRegexp() + { + return "<(?: abbr|acronym )(?: [^>]*)?>"; + } + function getEndRegexp($match) { if (substr($match, 1, 4) == 'abbr') @@ -933,9 +954,17 @@ class Markup_color extends BalancedMarkup { // %color=blue% blue text %% and back to normal - public $_start_regexp = "%color=(?: [^%]*)%"; - public $_end_regexp = "%%"; + function getStartRegexp() + { + return "%color=(?: [^%]*)%"; + } + + function getEndRegexp($match) + { + return "%%"; + } + function markup($match, $body) { $color = strtolower(substr($match, 7, -1)); @@ -1261,12 +1290,12 @@ public $_regexps = array(); public $_markup = array(); - function __construct($markup_types = false) + function __construct($markup_types = array()) { global $request; // We need to extend the inline parsers by certain actions, like SearchHighlight, // SpellCheck and maybe CreateToc. - if (!$markup_types) { + if (empty($markup_types)) { $non_default = false; $markup_types = array ('escape', 'wikicreolebracketlink', 'bracketlink', 'url', Modified: trunk/lib/WysiwygEdit.php =================================================================== --- trunk/lib/WysiwygEdit.php 2014-11-20 13:27:16 UTC (rev 9348) +++ trunk/lib/WysiwygEdit.php 2014-11-20 15:18:14 UTC (rev 9349) @@ -103,7 +103,10 @@ class Markup_html_p extends BalancedMarkup { - public $_start_regexp = "<(?:p|P)( class=\".*\")?>"; + function getStartRegexp() + { + return "<(?:p|P)( class=\".*\")?>"; + } function getEndRegexp($match) { @@ -119,7 +122,10 @@ //'<span style="font-weight: bold">text</span>' => '*text*' class Markup_html_spanbold extends BalancedMarkup { - public $_start_regexp = "<(?:span|SPAN) style=\"font-weight: bold\">"; + function getStartRegexp() + { + return "<(?:span|SPAN) style=\"font-weight: bold\">"; + } function getEndRegexp($match) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-11-21 16:27:20
|
Revision: 9361 http://sourceforge.net/p/phpwiki/code/9361 Author: vargenau Date: 2014-11-21 16:27:17 +0000 (Fri, 21 Nov 2014) Log Message: ----------- Check constants are defined Modified Paths: -------------- trunk/lib/Captcha.php trunk/lib/EditToolbar.php trunk/lib/InlineParser.php trunk/lib/PagePerm.php trunk/lib/Units.php trunk/lib/WikiDB.php trunk/lib/display.php trunk/lib/editpage.php trunk/lib/loadsave.php trunk/lib/main.php Modified: trunk/lib/Captcha.php =================================================================== --- trunk/lib/Captcha.php 2014-11-21 15:59:41 UTC (rev 9360) +++ trunk/lib/Captcha.php 2014-11-21 16:27:17 UTC (rev 9361) @@ -88,7 +88,7 @@ function get_word() { - if (USE_CAPTCHA_RANDOM_WORD) + if (defined('USE_CAPTCHA_RANDOM_WORD') and USE_CAPTCHA_RANDOM_WORD) return $this->get_dictionary_word(); else return rand_ascii_readable($this->length); // lib/stdlib.php Modified: trunk/lib/EditToolbar.php =================================================================== --- trunk/lib/EditToolbar.php 2014-11-21 15:59:41 UTC (rev 9360) +++ trunk/lib/EditToolbar.php 2014-11-21 16:27:17 UTC (rev 9361) @@ -39,7 +39,7 @@ $this->tokens = array(); //FIXME: enable Undo button for all other buttons also, not only the search/replace button - if (JS_SEARCHREPLACE) { + if (defined('JS_SEARCHREPLACE') and JS_SEARCHREPLACE) { $this->tokens['JS_SEARCHREPLACE'] = 1; $undo_btn = $WikiTheme->getImageURL("ed_undo.png"); $undo_d_btn = $WikiTheme->getImageURL("ed_undo_d.png"); @@ -68,7 +68,7 @@ $WikiTheme->addMoreAttr('body', "editfocus", "document.getElementById('edit-content]').editarea.focus()"); } - if (ENABLE_EDIT_TOOLBAR) { + if (defined('ENABLE_EDIT_TOOLBAR') and ENABLE_EDIT_TOOLBAR) { $init = JavaScript("var data_path = '" . javascript_quote_string(DATA_PATH) . "';\n"); $js = JavaScript('', array('src' => $WikiTheme->_findData("toolbar.js"))); if (empty($WikiTheme->_headers_printed)) { @@ -87,13 +87,13 @@ // regenerate if number of pages changes (categories, pages, templates, images uploaded) $key = $dbi->numPages(); $key .= '+categories+plugin' . (isBrowserSafari() ? '+safari' : ''); - if (TOOLBAR_PAGELINK_PULLDOWN) { + if (defined('TOOLBAR_PAGELINK_PULLDOWN') and TOOLBAR_PAGELINK_PULLDOWN) { $key .= "+pages"; } - if (TOOLBAR_TEMPLATE_PULLDOWN) { + if (defined('TOOLBAR_TEMPLATE_PULLDOWN') and TOOLBAR_TEMPLATE_PULLDOWN) { $key .= "+templates_" . $dbi->getTimestamp(); } - if (TOOLBAR_IMAGE_PULLDOWN) { + if (defined('TOOLBAR_IMAGE_PULLDOWN') and TOOLBAR_IMAGE_PULLDOWN) { if (file_exists(getUploadFilePath())) { $key .= "+images_" . filemtime(getUploadFilePath()); } @@ -122,7 +122,7 @@ $toolbar = "document.writeln(\"<div class=\\\"edit-toolbar\\\" id=\\\"toolbar\\\">\");\n"; - if (ENABLE_EDIT_TOOLBAR) { + if (defined('ENABLE_EDIT_TOOLBAR') and ENABLE_EDIT_TOOLBAR) { $username = $request->_user->UserName(); if ((defined('FUSIONFORGE') and FUSIONFORGE) or DISABLE_MARKUP_WIKIWORD or (!isWikiWord($username))) { $username = '[[' . $username . ']]'; @@ -246,7 +246,7 @@ } } - if (JS_SEARCHREPLACE) { + if (defined('JS_SEARCHREPLACE') and JS_SEARCHREPLACE) { $undo_d_btn = $WikiTheme->getImageURL("ed_undo_d.png"); //$redo_btn = $WikiTheme->getImageURL("ed_redo.png"); $sr_btn = $WikiTheme->getImageURL("ed_replace.png"); @@ -279,14 +279,14 @@ $sr_html = HTML($sr_html, $this->pluginPulldown()); // Button to generate pagenames, display in extra window as popup and insert - if (TOOLBAR_PAGELINK_PULLDOWN) + if (defined('TOOLBAR_PAGELINK_PULLDOWN') and TOOLBAR_PAGELINK_PULLDOWN) $sr_html = HTML($sr_html, $this->pagesPulldown(TOOLBAR_PAGELINK_PULLDOWN)); // Button to insert from an template, display pagename in extra window as popup and insert - if (TOOLBAR_TEMPLATE_PULLDOWN) + if (defined('TOOLBAR_TEMPLATE_PULLDOWN') and TOOLBAR_TEMPLATE_PULLDOWN) $sr_html = HTML($sr_html, $this->templatePulldown(TOOLBAR_TEMPLATE_PULLDOWN)); // Button to add images, display in extra window as popup and insert - if (TOOLBAR_IMAGE_PULLDOWN) + if (defined('TOOLBAR_IMAGE_PULLDOWN') and TOOLBAR_IMAGE_PULLDOWN) $sr_html = HTML($sr_html, $this->imagePulldown()); // don't use document.write for replace, otherwise self.opener is not defined. @@ -399,7 +399,7 @@ $pages = array(); while ($p = $page_iter->next()) { $page = $p->getName(); - if (DISABLE_MARKUP_WIKIWORD or (!isWikiWord($page))) + if (defined('DISABLE_MARKUP_WIKIWORD') and DISABLE_MARKUP_WIKIWORD or (!isWikiWord($page))) $pages[] = "['$page', '%5B" . $page . "%5D']"; else $pages[] = "['$page', '$page']"; @@ -427,7 +427,7 @@ $pd = new imageOrVideoSet($image_dir, '*'); $images = $pd->getFiles(); unset($pd); - if (UPLOAD_USERDIR) { + if (defined('UPLOAD_USERDIR') and UPLOAD_USERDIR) { $image_dir .= "/" . $request->_user->_userid; $pd = new imageOrVideoSet($image_dir, '*'); $images = array_merge($images, $pd->getFiles()); Modified: trunk/lib/InlineParser.php =================================================================== --- trunk/lib/InlineParser.php 2014-11-21 15:59:41 UTC (rev 9360) +++ trunk/lib/InlineParser.php 2014-11-21 16:27:17 UTC (rev 9361) @@ -1215,7 +1215,7 @@ 'html_emphasis', 'html_abbr', 'plugin', 'plugin_wikicreole', 'isonumchars', 'isohexchars', /*'html_entities'*/ ); - if (DISABLE_MARKUP_WIKIWORD) + if (defined('DISABLE_MARKUP_WIKIWORD') and DISABLE_MARKUP_WIKIWORD) $markup_types = array_remove($markup_types, 'wikiword'); $action = $request->getArg('action'); @@ -1234,13 +1234,13 @@ $this->_addMarkup(new $class); } $this->_addMarkup(new Markup_nowiki); - if (ENABLE_MARKUP_DIVSPAN and !$non_default) + if (defined('ENABLE_MARKUP_DIVSPAN') and ENABLE_MARKUP_DIVSPAN and !$non_default) $this->_addMarkup(new Markup_html_divspan); - if (ENABLE_MARKUP_COLOR and !$non_default) + if (defined('ENABLE_MARKUP_COLOR') and ENABLE_MARKUP_COLOR and !$non_default) $this->_addMarkup(new Markup_color); // Markup_wikicreole_preformatted must be before Markup_template_plugin $this->_addMarkup(new Markup_wikicreole_preformatted); - if (ENABLE_MARKUP_TEMPLATE and !$non_default) + if (defined('ENABLE_MARKUP_TEMPLATE') and ENABLE_MARKUP_TEMPLATE and !$non_default) $this->_addMarkup(new Markup_template_plugin); } Modified: trunk/lib/PagePerm.php =================================================================== --- trunk/lib/PagePerm.php 2014-11-21 15:59:41 UTC (rev 9360) +++ trunk/lib/PagePerm.php 2014-11-21 16:27:17 UTC (rev 9361) @@ -468,10 +468,10 @@ ACL_OWNER => true), 'change' => array(ACL_ADMIN => true, ACL_OWNER => true)); - if (ZIPDUMP_AUTH) + if (defined('ZIPDUMP_AUTH') and ZIPDUMP_AUTH) $perm['dump'] = array(ACL_ADMIN => true, ACL_OWNER => true); - elseif (INSECURE_ACTIONS_LOCALHOST_ONLY) { + elseif (defined('INSECURE_ACTIONS_LOCALHOST_ONLY') and INSECURE_ACTIONS_LOCALHOST_ONLY) { if (is_localhost()) $perm['dump'] = array(ACL_EVERY => true); else Modified: trunk/lib/Units.php =================================================================== --- trunk/lib/Units.php 2014-11-21 15:59:41 UTC (rev 9360) +++ trunk/lib/Units.php 2014-11-21 16:27:17 UTC (rev 9361) @@ -25,7 +25,7 @@ { function __construct() { - if (DISABLE_UNITS) + if (defined('DISABLE_UNITS') and DISABLE_UNITS) $this->errcode = 1; elseif (defined("UNITS_EXE")) // ignore dynamic check $this->errcode = 0; Modified: trunk/lib/WikiDB.php =================================================================== --- trunk/lib/WikiDB.php 2014-11-21 15:59:41 UTC (rev 9360) +++ trunk/lib/WikiDB.php 2014-11-21 16:27:17 UTC (rev 9361) @@ -222,7 +222,7 @@ $result = -1; /* Generate notification emails */ - if (ENABLE_MAILNOTIFY) { + if (defined('ENABLE_MAILNOTIFY') and ENABLE_MAILNOTIFY) { include_once 'lib/MailNotify.php'; $MailNotify = new MailNotify($pagename); $MailNotify->onDeletePage($this, $pagename); Modified: trunk/lib/display.php =================================================================== --- trunk/lib/display.php 2014-11-21 15:59:41 UTC (rev 9360) +++ trunk/lib/display.php 2014-11-21 16:27:17 UTC (rev 9361) @@ -91,7 +91,7 @@ RecentChanges or AllPages might be an exception. */ $args = array(); - if (GOOGLE_LINKS_NOFOLLOW) { + if (defined('GOOGLE_LINKS_NOFOLLOW') and GOOGLE_LINKS_NOFOLLOW) { $robots = "noindex,nofollow"; $args = array('ROBOTS_META' => $robots); } Modified: trunk/lib/editpage.php =================================================================== --- trunk/lib/editpage.php 2014-11-21 15:59:41 UTC (rev 9360) +++ trunk/lib/editpage.php 2014-11-21 16:27:17 UTC (rev 9361) @@ -48,14 +48,14 @@ $this->tokens = array(); - if (ENABLE_WYSIWYG) { + if (defined('ENABLE_WYSIWYG') and ENABLE_WYSIWYG) { $backend = WYSIWYG_BACKEND; // TODO: error message require_once("lib/WysiwygEdit/$backend.php"); $class = "WysiwygEdit_$backend"; $this->WysiwygEdit = new $class(); } - if (ENABLE_CAPTCHA) { + if (defined('ENABLE_CAPTCHA' and ENABLE_CAPTCHA)) { require_once 'lib/Captcha.php'; $this->Captcha = new Captcha($this->meta); } @@ -119,7 +119,7 @@ return $this->viewSource(); $tokens['PAGE_LOCKED_MESSAGE'] = $this->getLockedMessage(); } elseif ($r->getArg('save_and_redirect_to') != "") { - if (ENABLE_CAPTCHA && $this->Captcha->Failed()) { + if (defined('ENABLE_CAPTCHA') and ENABLE_CAPTCHA && $this->Captcha->Failed()) { $this->tokens['PAGE_LOCKED_MESSAGE'] = HTML::p(HTML::h1($this->Captcha->failed_msg)); } elseif ($this->savePage()) { @@ -131,7 +131,7 @@ } $saveFailed = true; } elseif ($this->editaction == 'save') { - if (ENABLE_CAPTCHA && $this->Captcha->Failed()) { + if (defined('ENABLE_CAPTCHA') and ENABLE_CAPTCHA && $this->Captcha->Failed()) { $this->tokens['PAGE_LOCKED_MESSAGE'] = HTML::p(HTML::h1($this->Captcha->failed_msg)); } elseif ($this->savePage()) { @@ -226,13 +226,13 @@ $title = new FormattedText ($title_fs, $pagelink); // not for dumphtml or viewsource - if (ENABLE_WYSIWYG and $template == 'editpage') { + if (defined('ENABLE_WYSIWYG') and ENABLE_WYSIWYG and $template == 'editpage') { $WikiTheme->addMoreHeaders($this->WysiwygEdit->Head()); //$tokens['PAGE_SOURCE'] = $this->WysiwygEdit->ConvertBefore($this->_content); } $template = Template($template, $this->tokens); /* Tell google (and others) not to take notice of edit links */ - if (GOOGLE_LINKS_NOFOLLOW) + if (defined('GOOGLE_LINKS_NOFOLLOW') and GOOGLE_LINKS_NOFOLLOW) $args = array('ROBOTS_META' => "noindex,nofollow"); GeneratePage($template, $title, $rev); return true; @@ -268,7 +268,7 @@ : _("Page now unlocked.") . " "); $changed = true; } - if (ENABLE_PAGE_PUBLIC and (bool)$this->page->get('public') != (bool)$this->public) { + if (defined('ENABLE_PAGE_PUBLIC') and ENABLE_PAGE_PUBLIC and (bool)$this->page->get('public') != (bool)$this->public) { $this->page->set('public', (bool)$this->public); $this->tokens['LOCK_CHANGED_MSG'] .= ($this->public @@ -277,7 +277,7 @@ $changed = true; } - if (ENABLE_EXTERNAL_PAGES) { + if (defined('ENABLE_EXTERNAL_PAGES') and ENABLE_EXTERNAL_PAGES) { if ((bool)$this->page->get('external') != (bool)$this->external) { $this->page->set('external', (bool)$this->external); $this->tokens['LOCK_CHANGED_MSG'] @@ -449,7 +449,7 @@ } } // 3. extract (new) links and check surbl for blocked domains - if (ENABLE_SPAMBLOCKLIST and ($newlinks > 5)) { + if (defined('ENABLE_SPAMBLOCKLIST') and ENABLE_SPAMBLOCKLIST and ($newlinks > 5)) { require_once 'lib/SpamBlocklist.php'; require_once 'lib/InlineParser.php'; $parsed = TransformLinks($newtext); @@ -629,7 +629,7 @@ 'cols' => $request->getPref('editWidth'), 'readonly' => (bool)$readonly), $this->_content); - if (ENABLE_WYSIWYG) { + if (defined('ENABLE_WYSIWYG') and ENABLE_WYSIWYG) { return $this->WysiwygEdit->Textarea($textarea, $this->_wikicontent, $textarea->getAttr('name')); } else Modified: trunk/lib/loadsave.php =================================================================== --- trunk/lib/loadsave.php 2014-11-21 15:59:41 UTC (rev 9360) +++ trunk/lib/loadsave.php 2014-11-21 16:27:17 UTC (rev 9361) @@ -169,7 +169,7 @@ $current = $page->getCurrentRevision(false); $head = ''; - if (STRICT_MAILABLE_PAGEDUMPS) { + if (defined('STRICT_MAILABLE_PAGEDUMPS') and STRICT_MAILABLE_PAGEDUMPS) { $from = defined('SERVER_ADMIN') ? SERVER_ADMIN : 'foo@bar'; //This is for unix mailbox format: (not RFC (2)822) // $head .= "From $from " . CTime(time()) . "\r\n"; Modified: trunk/lib/main.php =================================================================== --- trunk/lib/main.php 2014-11-21 15:59:41 UTC (rev 9360) +++ trunk/lib/main.php 2014-11-21 16:27:17 UTC (rev 9361) @@ -30,7 +30,7 @@ require_once 'lib/WikiDB.php'; require_once 'lib/WikiUser.php'; require_once 'lib/WikiGroup.php'; -if (ENABLE_PAGEPERM) +if (defined('ENABLE_PAGEPERM') and ENABLE_PAGEPERM) require_once 'lib/PagePerm.php'; /** @@ -39,7 +39,7 @@ */ function mayAccessPage($access, $pagename) { - if (ENABLE_PAGEPERM) + if (defined('ENABLE_PAGEPERM') and ENABLE_PAGEPERM) return _requiredAuthorityForPagename($access, $pagename); // typically [10-20ms per page] else return true; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-11-25 16:01:03
|
Revision: 9371 http://sourceforge.net/p/phpwiki/code/9371 Author: vargenau Date: 2014-11-25 16:01:00 +0000 (Tue, 25 Nov 2014) Log Message: ----------- Add static Modified Paths: -------------- trunk/lib/SemanticWeb.php trunk/lib/WikiDB/SQL.php trunk/lib/plugin/PhotoAlbum.php trunk/lib/wikilens/RatingsDb.php trunk/lib/wikilens/RatingsUser.php Modified: trunk/lib/SemanticWeb.php =================================================================== --- trunk/lib/SemanticWeb.php 2014-11-25 15:45:06 UTC (rev 9370) +++ trunk/lib/SemanticWeb.php 2014-11-25 16:01:00 UTC (rev 9371) @@ -210,7 +210,7 @@ /** This function transforms a valid url-encoded URI into a string * that can be used as an XML-ID. The mapping should be injective. */ - function makeXMLExportId($uri) + static function makeXMLExportId($uri) { $uri = str_replace('-', '-2D', $uri); //$uri = str_replace( ':', '-3A', $uri); //already done by PHP Modified: trunk/lib/WikiDB/SQL.php =================================================================== --- trunk/lib/WikiDB/SQL.php 2014-11-25 15:45:06 UTC (rev 9370) +++ trunk/lib/WikiDB/SQL.php 2014-11-25 16:01:00 UTC (rev 9371) @@ -23,7 +23,7 @@ parent::__construct($backend, $dbparams); } - function view_dsn($dsn = false) + static function view_dsn($dsn = false) { if (!$dsn) $dsninfo = DB::parseDSN($GLOBALS['DBParams']['dsn']); Modified: trunk/lib/plugin/PhotoAlbum.php =================================================================== --- trunk/lib/plugin/PhotoAlbum.php 2014-11-25 15:45:06 UTC (rev 9370) +++ trunk/lib/plugin/PhotoAlbum.php 2014-11-25 16:01:00 UTC (rev 9371) @@ -72,7 +72,7 @@ class ImageTile extends HtmlElement { // go away, hack! - function image_tile( /*...*/) + static function image_tile( /*...*/) { $el = new HTML ('img'); $tag = func_get_args(); Modified: trunk/lib/wikilens/RatingsDb.php =================================================================== --- trunk/lib/wikilens/RatingsDb.php 2014-11-25 15:45:06 UTC (rev 9370) +++ trunk/lib/wikilens/RatingsDb.php 2014-11-25 16:01:00 UTC (rev 9371) @@ -83,7 +83,7 @@ } // this is a singleton. It ensures there is only 1 ratingsDB. - function & getTheRatingsDb() + static function & getTheRatingsDb() { static $_theRatingsDb; Modified: trunk/lib/wikilens/RatingsUser.php =================================================================== --- trunk/lib/wikilens/RatingsUser.php 2014-11-25 15:45:06 UTC (rev 9370) +++ trunk/lib/wikilens/RatingsUser.php 2014-11-25 16:01:00 UTC (rev 9371) @@ -27,7 +27,7 @@ */ class RatingsUserFactory { - function & getUser($userid) + static function & getUser($userid) { //print "getUser($userid) "; global $_ratingsUserCache; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-11-25 16:19:19
|
Revision: 9375 http://sourceforge.net/p/phpwiki/code/9375 Author: vargenau Date: 2014-11-25 16:19:16 +0000 (Tue, 25 Nov 2014) Log Message: ----------- Move function obj2hash to plugin using it Modified Paths: -------------- trunk/lib/plugin/DebugAuthInfo.php trunk/lib/stdlib.php Modified: trunk/lib/plugin/DebugAuthInfo.php =================================================================== --- trunk/lib/plugin/DebugAuthInfo.php 2014-11-25 16:12:04 UTC (rev 9374) +++ trunk/lib/plugin/DebugAuthInfo.php 2014-11-25 16:19:16 UTC (rev 9375) @@ -102,7 +102,7 @@ } else { $table = HTML::table(array('class' => 'bordered')); //$table->pushContent(HTML::tr(HTML::td(array('colspan' => 2)))); - $userdata = obj2hash($user, array('_dbi', '_request', 'password', 'passwd')); + $userdata = $this->obj2hash($user, array('_dbi', '_request', 'password', 'passwd')); if (is_a($user, "_FilePassUser")) { foreach ($userdata['_file']->users as $u => $p) { $userdata['_file']->users[$u] = "<hidden>"; @@ -111,7 +111,7 @@ $table->pushContent($this->show_hash("User: Object of " . get_class($user), $userdata)); $group = &$request->getGroup(); $groups = $group->getAllGroupsIn(); - $groupdata = obj2hash($group, array('_dbi', '_request', 'password', 'passwd')); + $groupdata = $this->obj2hash($group, array('_dbi', '_request', 'password', 'passwd')); unset($groupdata['request']); $table->pushContent($this->show_hash("Group: Object of " . get_class($group), $groupdata)); $groups = $group->getAllGroupsIn(); @@ -126,6 +126,20 @@ return $html; } + // needed to store serialized objects-values only (perm, pref) + private function obj2hash($obj, $exclude = array()) + { + $a = array(); + $fields = get_object_vars($obj); + foreach ($fields as $key => $val) { + if (in_array($key, $exclude)) { + continue; + } + $a[$key] = $val; + } + return $a; + } + private function show_hash($heading, $hash, $depth = 0) { static $seen = array(); @@ -141,7 +155,7 @@ 'style' => 'color:black'), $heading)); if (is_object($hash)) - $hash = obj2hash($hash); + $hash = $this->obj2hash($hash); if (!empty($hash)) { ksort($hash); foreach ($hash as $key => $val) { @@ -151,7 +165,7 @@ elseif ($heading == "Object of wikidb_sql") $val = $heading; elseif (substr($heading, 0, 13) == "Object of db_") $val = $heading; elseif (!isset($seen[$heading])) { //if (empty($seen[$heading])) $seen[$heading] = 1; $val = HTML::table(array('class' => 'bordered'), - $this->show_hash($heading, obj2hash($val), $depth + 1)); + $this->show_hash($heading, $this->obj2hash($val), $depth + 1)); } else { $val = $heading; } Modified: trunk/lib/stdlib.php =================================================================== --- trunk/lib/stdlib.php 2014-11-25 16:12:04 UTC (rev 9374) +++ trunk/lib/stdlib.php 2014-11-25 16:19:16 UTC (rev 9375) @@ -71,7 +71,6 @@ phpwiki_version () isWikiWord ($word) - obj2hash($obj, $exclude = array()) url_get_contents ($uri) GenerateId ($name) firstNWordsOfContent ($n, $content) @@ -1698,20 +1697,6 @@ return preg_match("/^$WikiNameRegexp\$/", $word); } -// needed to store serialized objects-values only (perm, pref) -function obj2hash($obj, $exclude = array()) -{ - $a = array(); - $fields = get_object_vars($obj); - foreach ($fields as $key => $val) { - if (in_array($key, $exclude)) { - continue; - } - $a[$key] = $val; - } - return $a; -} - /** * isAsciiString($string) */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-11-25 16:34:56
|
Revision: 9376 http://sourceforge.net/p/phpwiki/code/9376 Author: vargenau Date: 2014-11-25 16:34:47 +0000 (Tue, 25 Nov 2014) Log Message: ----------- Type compatibility Modified Paths: -------------- trunk/lib/PageList.php trunk/lib/plugin/EditMetaData.php trunk/lib/plugin/RecentChanges.php trunk/lib/plugin/text2png.php Modified: trunk/lib/PageList.php =================================================================== --- trunk/lib/PageList.php 2014-11-25 16:19:16 UTC (rev 9375) +++ trunk/lib/PageList.php 2014-11-25 16:34:47 UTC (rev 9376) @@ -1385,7 +1385,7 @@ /** * Add a column to this PageList, given a column object. * - * @param $col object An object derived from _PageList_Column. + * @param array|object $col An object derived from _PageList_Column. **/ function addColumnObject($col) { Modified: trunk/lib/plugin/EditMetaData.php =================================================================== --- trunk/lib/plugin/EditMetaData.php 2014-11-25 16:19:16 UTC (rev 9375) +++ trunk/lib/plugin/EditMetaData.php 2014-11-25 16:34:47 UTC (rev 9376) @@ -114,7 +114,7 @@ } if ($changed) { $dbi->touch(); - $url = $request->getURLtoSelf(false, + $url = $request->getURLtoSelf(array(), array('meta', 'metaedit', 'metafield', 'metavalue')); $request->redirect($url); // The rest of the output will not be seen due to the Modified: trunk/lib/plugin/RecentChanges.php =================================================================== --- trunk/lib/plugin/RecentChanges.php 2014-11-25 16:19:16 UTC (rev 9375) +++ trunk/lib/plugin/RecentChanges.php 2014-11-25 16:34:47 UTC (rev 9376) @@ -189,7 +189,7 @@ return HTML("(", $button, ")"); } - function pageLink($rev, $link_text = false) + function pageLink($rev, $link_text = '') { return WikiLink($this->include_versions_in_URLs() ? $rev : $rev->getPage(), Modified: trunk/lib/plugin/text2png.php =================================================================== --- trunk/lib/plugin/text2png.php 2014-11-25 16:19:16 UTC (rev 9375) +++ trunk/lib/plugin/text2png.php 2014-11-25 16:34:47 UTC (rev 9376) @@ -94,7 +94,7 @@ * '#000' => array(0,0,0) * '#000000' => array(0,0,0) */ - function hexcolor($h, $default = false) + function hexcolor($h, $default = array()) { if ($h[0] != '#') return $default; $rgb = substr($h, 1); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-11-26 11:31:22
|
Revision: 9381 http://sourceforge.net/p/phpwiki/code/9381 Author: vargenau Date: 2014-11-26 11:31:15 +0000 (Wed, 26 Nov 2014) Log Message: ----------- Rename plugin _Retransform to DebugRetransform Modified Paths: -------------- trunk/lib/IniConfig.php trunk/lib/plugin/DebugRetransform.php Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2014-11-26 11:19:50 UTC (rev 9380) +++ trunk/lib/IniConfig.php 2014-11-26 11:31:15 UTC (rev 9381) @@ -688,6 +688,7 @@ $AllAllowedPlugins[] = 'DebugGroupInfo'; $AllAllowedPlugins[] = 'DebugAuthInfo'; $AllAllowedPlugins[] = 'DebugBackendInfo'; + $AllAllowedPlugins[] = 'DebugRetransform'; // The FUSIONFORGE theme omits them if (!(defined('FUSIONFORGE') and FUSIONFORGE)) { @@ -704,7 +705,6 @@ $AllAllowedPlugins[] = 'PopularNearby'; $AllAllowedPlugins[] = 'PreferenceApp'; $AllAllowedPlugins[] = 'PreferencesInfo'; - $AllAllowedPlugins[] = '_Retransform'; $AllAllowedPlugins[] = 'SqlResult'; $AllAllowedPlugins[] = 'TeX2png'; $AllAllowedPlugins[] = 'text2png'; Modified: trunk/lib/plugin/DebugRetransform.php =================================================================== --- trunk/lib/plugin/DebugRetransform.php 2014-11-26 11:19:50 UTC (rev 9380) +++ trunk/lib/plugin/DebugRetransform.php 2014-11-26 11:31:15 UTC (rev 9381) @@ -23,7 +23,7 @@ /** * Only useful for link and parser debugging purposes. */ -class WikiPlugin__Retransform +class WikiPlugin_DebugRetransform extends WikiPlugin { function getDescription() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-11-28 14:27:46
|
Revision: 9387 http://sourceforge.net/p/phpwiki/code/9387 Author: vargenau Date: 2014-11-28 14:27:41 +0000 (Fri, 28 Nov 2014) Log Message: ----------- global $request Modified Paths: -------------- 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/DbaDatabase.php trunk/lib/EditToolbar.php trunk/lib/InlineParser.php trunk/lib/MailNotify.php trunk/lib/PageList.php trunk/lib/PagePerm.php trunk/lib/PageType.php trunk/lib/Request.php trunk/lib/WikiDB/backend/ADODB.php trunk/lib/WikiDB/backend/PDO.php trunk/lib/WikiDB/backend/dbaBase.php trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php trunk/lib/WikiDB/backend.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/Db.php trunk/lib/WikiUser/PdoDb.php trunk/lib/WikiUser/PearDb.php trunk/lib/WikiUser.php trunk/lib/WysiwygEdit/Wikiwyg.php trunk/lib/WysiwygEdit.php trunk/lib/diff.php trunk/lib/editpage.php trunk/lib/plugin/GraphViz.php trunk/lib/plugin/InterWikiSearch.php trunk/lib/plugin/JabberPresence.php trunk/lib/plugin/RecentChanges.php trunk/lib/plugin/SpellCheck.php trunk/lib/plugin/UpLoad.php trunk/lib/plugin/VisualWiki.php trunk/lib/plugin/WikiAdminSelect.php trunk/lib/plugin/WikiAdminSetAcl.php trunk/lib/plugin/WikiFormRich.php trunk/lib/plugin/WikiPoll.php trunk/lib/plugin/WikiTranslation.php trunk/lib/spam_babycart.php trunk/lib/stdlib.php trunk/lib/wikilens/PageListColumns.php trunk/lib/wikilens/RatingsDb.php Modified: trunk/lib/CachedMarkup.php =================================================================== --- trunk/lib/CachedMarkup.php 2014-11-28 09:51:10 UTC (rev 9386) +++ trunk/lib/CachedMarkup.php 2014-11-28 14:27:41 UTC (rev 9387) @@ -558,11 +558,16 @@ */ function getWikiPageLinks($basepage) { + /** + * @var WikiRequest $request + */ + global $request; + if ($basepage == '') return false; if (!isset($this->_page) and isset($this->_attribute)) { // An attribute: we store it in the basepage now, to fill the cache for page->save // TODO: side-effect free query - $page = $GLOBALS['request']->getPage($basepage); + $page = $request->getPage($basepage); $page->setAttribute($this->_relation, $this->_attribute); $this->_page = $basepage; return array(array('linkto' => '', 'relation' => $this->_relation)); @@ -750,11 +755,16 @@ function getWikiPageLinks($basepage) { + /** + * @var WikiRequest $request + */ + global $request; + if ($basepage == '') return false; /* ":DontStoreLink" */ if (substr($this->_link, 0, 1) == ':') return false; /* store only links to valid pagenames */ - $dbi = $GLOBALS['request']->getDbh(); + $dbi = $request->getDbh(); if ($link = $this->getPagename($basepage) and $dbi->isWikiPage($link)) { return array(array('linkto' => $link)); } else { @@ -845,8 +855,13 @@ function expand($basepage, &$markup) { + /** + * @var WikiRequest $request + */ + global $request; + $loader = $this->_getLoader(); - $xml = $loader->expandPI($this->_pi, $GLOBALS['request'], $markup, $basepage); + $xml = $loader->expandPI($this->_pi, $request, $markup, $basepage); return $xml; } Modified: trunk/lib/Captcha.php =================================================================== --- trunk/lib/Captcha.php 2014-11-28 09:51:10 UTC (rev 9386) +++ trunk/lib/Captcha.php 2014-11-28 14:27:41 UTC (rev 9387) @@ -30,18 +30,23 @@ public $length; public $failed_msg; /** - * @var WikiRequest + * @var WikiRequest $request */ public $request; function Captcha($meta = array(), $width = 250, $height = 80) { + /** + * @var WikiRequest $request + */ + global $request; + $this->meta =& $meta; $this->width = $width; $this->height = $height; $this->length = 8; $this->failed_msg = _("Typed in verification word mismatch ... are you a bot?"); - $this->request =& $GLOBALS['request']; + $this->request =& $request; } function captchaword() Modified: trunk/lib/DbSession/ADODB.php =================================================================== --- trunk/lib/DbSession/ADODB.php 2014-11-28 09:51:10 UTC (rev 9386) +++ trunk/lib/DbSession/ADODB.php 2014-11-28 14:27:41 UTC (rev 9387) @@ -150,12 +150,17 @@ */ public function write($id, $sess_data) { + /** + * @var WikiRequest $request + */ + global $request; + if (defined("WIKI_XMLRPC") or defined("WIKI_SOAP")) return false; $dbh = $this->_connect(); $table = $this->_table; $qid = $dbh->qstr($id); - $qip = $dbh->qstr($GLOBALS['request']->get('REMOTE_ADDR')); + $qip = $dbh->qstr($request->get('REMOTE_ADDR')); $time = $dbh->qstr(time()); // postgres can't handle binary data in a TEXT field. Modified: trunk/lib/DbSession/PDO.php =================================================================== --- trunk/lib/DbSession/PDO.php 2014-11-28 09:51:10 UTC (rev 9386) +++ trunk/lib/DbSession/PDO.php 2014-11-28 14:27:41 UTC (rev 9387) @@ -133,6 +133,11 @@ */ public function write($id, $sess_data) { + /** + * @var WikiRequest $request + */ + global $request; + if (defined("WIKI_XMLRPC") or defined("WIKI_SOAP")) return false; $dbh = $this->_connect(); @@ -156,7 +161,7 @@ $sth->bindParam(1, $id, PDO::PARAM_STR, 32); $sth->bindParam(2, $sess_data, PDO::PARAM_LOB); $sth->bindParam(3, $time, PDO::PARAM_INT); - $sth->bindParam(4, $GLOBALS['request']->get('REMOTE_ADDR'), PDO::PARAM_STR, 15); + $sth->bindParam(4, $request->get('REMOTE_ADDR'), PDO::PARAM_STR, 15); if ($result = $sth->execute()) { $this->_backend->commit(); } else { @@ -168,7 +173,7 @@ . " WHERE sess_id=?"); $sth->bindParam(1, $sess_data, PDO::PARAM_LOB); $sth->bindParam(2, $time, PDO::PARAM_INT); - $sth->bindParam(3, $GLOBALS['request']->get('REMOTE_ADDR'), PDO::PARAM_STR, 15); + $sth->bindParam(3, $request->get('REMOTE_ADDR'), PDO::PARAM_STR, 15); $sth->bindParam(4, $id, PDO::PARAM_STR, 32); $result = $sth->execute(); // implicit affected rows if ($result === false or $result < 1) { // false or int > 0 @@ -178,7 +183,7 @@ $sth->bindParam(1, $id, PDO::PARAM_STR, 32); $sth->bindParam(2, $sess_data, PDO::PARAM_LOB); $sth->bindParam(3, $time, PDO::PARAM_INT); - $sth->bindParam(4, $GLOBALS['request']->get('REMOTE_ADDR'), PDO::PARAM_STR, 15); + $sth->bindParam(4, $request->get('REMOTE_ADDR'), PDO::PARAM_STR, 15); $result = $sth->execute(); } } Modified: trunk/lib/DbSession/SQL.php =================================================================== --- trunk/lib/DbSession/SQL.php 2014-11-28 09:51:10 UTC (rev 9386) +++ trunk/lib/DbSession/SQL.php 2014-11-28 14:27:41 UTC (rev 9387) @@ -137,13 +137,18 @@ */ public function write($id, $sess_data) { + /** + * @var WikiRequest $request + */ + global $request; + if (defined("WIKI_XMLRPC") or defined("WIKI_SOAP")) return false; $dbh = $this->_connect(); //$dbh->unlock(false,1); $table = $this->_table; $qid = $dbh->quote($id); - $qip = $dbh->quote($GLOBALS['request']->get('REMOTE_ADDR')); + $qip = $dbh->quote($request->get('REMOTE_ADDR')); $time = $dbh->quote(time()); if (DEBUG and $sess_data == 'wiki_user|N;') { trigger_error("delete empty session $qid", E_USER_WARNING); Modified: trunk/lib/DbSession/dba.php =================================================================== --- trunk/lib/DbSession/dba.php 2014-11-28 09:51:10 UTC (rev 9386) +++ trunk/lib/DbSession/dba.php 2014-11-28 14:27:41 UTC (rev 9387) @@ -93,11 +93,16 @@ function write($id, $sess_data) { + /** + * @var WikiRequest $request + */ + global $request; + if (defined("WIKI_XMLRPC") or defined("WIKI_SOAP")) return false; $dbh = $this->_connect(); $time = time(); - $ip = $GLOBALS['request']->get('REMOTE_ADDR'); + $ip = $request->get('REMOTE_ADDR'); if (strlen($sess_data) > 4000) { trigger_error("Overlarge session data!", E_USER_WARNING); $sess_data = ''; Modified: trunk/lib/DbaDatabase.php =================================================================== --- trunk/lib/DbaDatabase.php 2014-11-28 09:51:10 UTC (rev 9386) +++ trunk/lib/DbaDatabase.php 2014-11-28 14:27:41 UTC (rev 9387) @@ -13,7 +13,7 @@ public $_handler; public $_timeout; /** - * @var resource + * @var resource $_dbh */ public $_dbh; public $readonly; @@ -48,6 +48,11 @@ function open($mode = 'w') { + /** + * @var WikiRequest $request + */ + global $request; + if ($this->_dbh) return true; // already open. @@ -85,7 +90,7 @@ // try to continue with read-only if (!defined("READONLY")) define("READONLY", true); - $GLOBALS['request']->_dbi->readonly = true; + $request->_dbi->readonly = true; $this->readonly = true; $mode = "r"; } @@ -108,7 +113,7 @@ // try to continue with read-only if (!defined("READONLY")) define("READONLY", true); - $GLOBALS['request']->_dbi->readonly = true; + $request->_dbi->readonly = true; $this->readonly = true; if (!file_exists($this->_file)) { $ErrorManager->handleError($error); Modified: trunk/lib/EditToolbar.php =================================================================== --- trunk/lib/EditToolbar.php 2014-11-28 09:51:10 UTC (rev 9386) +++ trunk/lib/EditToolbar.php 2014-11-28 14:27:41 UTC (rev 9387) @@ -35,6 +35,10 @@ function __construct() { global $WikiTheme; + /** + * @var WikiRequest $request + */ + global $request; $this->tokens = array(); @@ -83,7 +87,7 @@ require_once 'lib/WikiPluginCached.php'; $cache = WikiPluginCached::newCache(); - $dbi = $GLOBALS['request']->getDbh(); + $dbi = $request->getDbh(); // regenerate if number of pages changes (categories, pages, templates, images uploaded) $key = $dbi->numPages(); $key .= '+categories+plugin' . (isBrowserSafari() ? '+safari' : ''); @@ -302,10 +306,14 @@ //result is cached private function categoriesPulldown() { + /** + * @var WikiRequest $request + */ + global $request; global $WikiTheme; require_once 'lib/TextSearchQuery.php'; - $dbi =& $GLOBALS['request']->_dbi; + $dbi =& $request->_dbi; // KEYWORDS formerly known as $KeywordLinkRegexp $pages = $dbi->titleSearch(new TextSearchQuery(KEYWORDS, true)); if ($pages) { @@ -391,8 +399,13 @@ // result is cached. Esp. the args are expensive private function pagesPulldown($query, $case_exact = false, $regex = 'auto') { + /** + * @var WikiRequest $request + */ + global $request; + require_once 'lib/TextSearchQuery.php'; - $dbi =& $GLOBALS['request']->_dbi; + $dbi =& $request->_dbi; $page_iter = $dbi->titleSearch(new TextSearchQuery($query, $case_exact, $regex)); if ($page_iter->count() > 0) { global $WikiTheme; Modified: trunk/lib/InlineParser.php =================================================================== --- trunk/lib/InlineParser.php 2014-11-28 09:51:10 UTC (rev 9386) +++ trunk/lib/InlineParser.php 2014-11-28 14:27:41 UTC (rev 9387) @@ -475,7 +475,12 @@ { function __construct() { - $this->suggestions = $GLOBALS['request']->getArg('suggestions'); + /** + * @var WikiRequest $request + */ + global $request; + + $this->suggestions = $request->getArg('suggestions'); } function getMatchRegexp() @@ -498,7 +503,12 @@ { function __construct() { - $result = $GLOBALS['request']->_searchhighlight; + /** + * @var WikiRequest $request + */ + global $request; + + $result = $request->_searchhighlight; require_once 'lib/TextSearchQuery.php'; $query = new TextSearchQuery($result['query']); $this->hilight_re = $query->getHighlightRegexp(); @@ -1360,8 +1370,13 @@ function TransformInline($text, $basepage = false) { + /** + * @var WikiRequest $request + */ + global $request; + static $trfm; - $action = $GLOBALS['request']->getArg('action'); + $action = $request->getArg('action'); if (empty($trfm) or $action == 'SpellCheck') { $trfm = new InlineTransformer; } Modified: trunk/lib/MailNotify.php =================================================================== --- trunk/lib/MailNotify.php 2014-11-28 09:51:10 UTC (rev 9386) +++ trunk/lib/MailNotify.php 2014-11-28 14:27:41 UTC (rev 9387) @@ -323,7 +323,12 @@ */ function onChangePage(&$wikidb, &$wikitext, $version, &$meta) { - if (!is_a($GLOBALS['request'], 'MockRequest')) { + /** + * @var WikiRequest $request + */ + global $request; + + if (!is_a($request, 'MockRequest')) { $notify = $wikidb->get('notify'); /* Generate notification emails? */ if (!empty($notify) and is_array($notify)) { @@ -340,9 +345,14 @@ function onDeletePage(&$wikidb, $pagename) { + /** + * @var WikiRequest $request + */ + global $request; + $result = true; /* Generate notification emails? */ - if (!$wikidb->isWikiPage($pagename) and !is_a($GLOBALS['request'], 'MockRequest')) { + if (!$wikidb->isWikiPage($pagename) and !is_a($request, 'MockRequest')) { $notify = $wikidb->get('notify'); if (!empty($notify) and is_array($notify)) { //TODO: deferr it (quite a massive load if you remove some pages). @@ -358,7 +368,12 @@ function onRenamePage(&$wikidb, $oldpage, $new_pagename) { - if (!is_a($GLOBALS['request'], 'MockRequest')) { + /** + * @var WikiRequest $request + */ + global $request; + + if (!is_a($request, 'MockRequest')) { $notify = $wikidb->get('notify'); if (!empty($notify) and is_array($notify)) { $this->getPageChangeEmails($notify); Modified: trunk/lib/PageList.php =================================================================== --- trunk/lib/PageList.php 2014-11-28 09:51:10 UTC (rev 9386) +++ trunk/lib/PageList.php 2014-11-28 14:27:41 UTC (rev 9387) @@ -51,6 +51,7 @@ class _PageList_Column_base { public $_tdattr = array(); + public $_field; function __construct($default_heading, $align = false) { @@ -471,8 +472,13 @@ { function __construct($field, $default_heading, $align = false) { + /** + * @var WikiRequest $request + */ + global $request; + parent::__construct($field, $default_heading, $align); - $this->dbi =& $GLOBALS['request']->getDbh(); + $this->dbi =& $request->getDbh(); } function _getValue($page_handle, &$revision_handle) @@ -607,14 +613,19 @@ function __construct($columns = array(), $exclude = array(), $options = array()) { + /** + * @var WikiRequest $request + */ + global $request; + // unique id per pagelist on each page. - if (!isset($GLOBALS['request']->_pagelist)) - $GLOBALS['request']->_pagelist = 0; + if (!isset($request->_pagelist)) + $request->_pagelist = 0; else - $GLOBALS['request']->_pagelist++; - $this->id = $GLOBALS['request']->_pagelist; - if ($GLOBALS['request']->getArg('count')) - $options['count'] = $GLOBALS['request']->getArg('count'); + $request->_pagelist++; + $this->id = $request->_pagelist; + if ($request->getArg('count')) + $options['count'] = $request->getArg('count'); if ($options) $this->_options = $options; @@ -849,9 +860,14 @@ function _getPageFromHandle($page_handle) { + /** + * @var WikiRequest $request + */ + global $request; + if (is_string($page_handle)) { if (empty($page_handle)) return $page_handle; - $page_handle = $GLOBALS['request']->_dbi->getPage($page_handle); + $page_handle = $request->_dbi->getPage($page_handle); } return $page_handle; } @@ -1116,6 +1132,11 @@ static function explodePageList($input, $include_empty = false, $sortby = '', $limit = '', $exclude = '') { + /** + * @var WikiRequest $request + */ + global $request; + if (empty($input)) { return array(); } @@ -1127,7 +1148,7 @@ include_once 'lib/TextSearchQuery.php'; $search = new TextSearchQuery(str_replace(",", " or ", $input), true, (substr($input, 0, 1) == "^") ? 'posix' : 'glob'); - $dbi = $GLOBALS['request']->getDbh(); + $dbi = $request->getDbh(); $iter = $dbi->titleSearch($search, $sortby, $limit, $exclude); $pages = array(); while ($pagehandle = $iter->next()) { @@ -1144,11 +1165,16 @@ static function allPagesByAuthor($wildcard, $include_empty = false, $sortby = '', $limit = '', $exclude = '') { - $dbi = $GLOBALS['request']->getDbh(); + /** + * @var WikiRequest $request + */ + global $request; + + $dbi = $request->getDbh(); $allPagehandles = $dbi->getAllPages($include_empty, $sortby, $limit, $exclude); $allPages = array(); if ($wildcard === '[]') { - $wildcard = $GLOBALS['request']->_user->getAuthenticatedId(); + $wildcard = $request->_user->getAuthenticatedId(); if (!$wildcard) return $allPages; } $do_glob = preg_match('/[\?\*]/', $wildcard); @@ -1171,11 +1197,16 @@ static function allPagesByOwner($wildcard, $include_empty = false, $sortby = '', $limit = '', $exclude = '') { - $dbi = $GLOBALS['request']->getDbh(); + /** + * @var WikiRequest $request + */ + global $request; + + $dbi = $request->getDbh(); $allPagehandles = $dbi->getAllPages($include_empty, $sortby, $limit, $exclude); $allPages = array(); if ($wildcard === '[]') { - $wildcard = $GLOBALS['request']->_user->getAuthenticatedId(); + $wildcard = $request->_user->getAuthenticatedId(); if (!$wildcard) return $allPages; } $do_glob = preg_match('/[\?\*]/', $wildcard); @@ -1197,11 +1228,16 @@ static function allPagesByCreator($wildcard, $include_empty = false, $sortby = '', $limit = '', $exclude = '') { - $dbi = $GLOBALS['request']->getDbh(); + /** + * @var WikiRequest $request + */ + global $request; + + $dbi = $request->getDbh(); $allPagehandles = $dbi->getAllPages($include_empty, $sortby, $limit, $exclude); $allPages = array(); if ($wildcard === '[]') { - $wildcard = $GLOBALS['request']->_user->getAuthenticatedId(); + $wildcard = $request->_user->getAuthenticatedId(); if (!$wildcard) return $allPages; } $do_glob = preg_match('/[\?\*]/', $wildcard); @@ -1224,7 +1260,12 @@ static function allUserPages($include_empty = false, $sortby = '', $limit = '', $exclude = '') { - $dbi = $GLOBALS['request']->getDbh(); + /** + * @var WikiRequest $request + */ + global $request; + + $dbi = $request->getDbh(); $allPagehandles = $dbi->getAllPages($include_empty, $sortby, $limit, $exclude); $allPages = array(); while ($pagehandle = $allPagehandles->next()) { @@ -1372,7 +1413,7 @@ if (!(defined('FUSIONFORGE') and FUSIONFORGE)) { // FIXME: anon users might rate and see ratings also. // Defer this logic to the plugin. - if ($column == 'rating' and !$GLOBALS['request']->_user->isSignedIn()) { + if ($column == 'rating' and !$request->_user->isSignedIn()) { return false; } } @@ -1491,6 +1532,11 @@ function pagingTokens($numrows = false, $ncolumns = false, $limit = false) { + /** + * @var WikiRequest $request + */ + global $request; + if ($numrows === false) $numrows = $this->getTotal(); if ($limit === false) @@ -1505,7 +1551,6 @@ ) return false; - $request = &$GLOBALS['request']; $pagename = $request->getArg('pagename'); $defargs = array_merge(array('id' => $this->id), $request->args); if (USE_PATH_INFO) unset($defargs['pagename']); Modified: trunk/lib/PagePerm.php =================================================================== --- trunk/lib/PagePerm.php 2014-11-28 09:51:10 UTC (rev 9386) +++ trunk/lib/PagePerm.php 2014-11-28 14:27:41 UTC (rev 9387) @@ -359,7 +359,12 @@ function PagePermission($hash = array()) { - $this->_group = &$GLOBALS['request']->getGroup(); + /** + * @var WikiRequest $request + */ + global $request; + + $this->_group = &$request->getGroup(); if (is_array($hash) and !empty($hash)) { $accessTypes = $this->accessTypes(); foreach ($hash as $access => $requires) { @@ -597,8 +602,13 @@ function asEditableTable($type) { global $WikiTheme; + /** + * @var WikiRequest $request + */ + global $request; + if (!isset($this->_group)) { - $this->_group =& $GLOBALS['request']->getGroup(); + $this->_group =& $request->getGroup(); } $table = HTML::table(); $table->pushContent(HTML::tr( Modified: trunk/lib/PageType.php =================================================================== --- trunk/lib/PageType.php 2014-11-28 09:51:10 UTC (rev 9386) +++ trunk/lib/PageType.php 2014-11-28 14:27:41 UTC (rev 9387) @@ -153,8 +153,13 @@ { function __construct($pagetext = false) { + /** + * @var WikiRequest $request + */ + global $request; + if (!$pagetext) { - $dbi = $GLOBALS['request']->getDbh(); + $dbi = $request->getDbh(); $page = $dbi->getPage(__("InterWikiMap")); if ($page->get('locked')) { $current = $page->getCurrentRevision(); @@ -258,6 +263,11 @@ private function _parseMap($text) { + /** + * @var WikiRequest $request + */ + global $request; + if (!preg_match_all("/^\s*(\S+)\s+(.+)$/m", $text, $matches, PREG_SET_ORDER) ) @@ -284,7 +294,7 @@ // Talk:UserName => UserName/Discussion // Talk:PageName => PageName/Discussion as default, which might be overridden if (empty($map["Talk"])) { - $pagename = $GLOBALS['request']->getArg('pagename'); + $pagename = $request->getArg('pagename'); // against PageName/Discussion/Discussion if (string_ends_with($pagename, '/' . _("Discussion"))) $map["Talk"] = "%s"; @@ -301,7 +311,7 @@ if (strstr($map[$special], '%u')) $map[$special] = str_replace($map[$special], '%u', - $GLOBALS['request']->_user->_userid); + $request->_user->_userid); if (strstr($map[$special], '%b')) $map[$special] = str_replace($map[$special], '%b', Modified: trunk/lib/Request.php =================================================================== --- trunk/lib/Request.php 2014-11-28 09:51:10 UTC (rev 9386) +++ trunk/lib/Request.php 2014-11-28 14:27:41 UTC (rev 9387) @@ -32,6 +32,8 @@ function __construct() { + global $request; + $this->_fix_multipart_form_data(); switch ($this->get('REQUEST_METHOD')) { @@ -54,7 +56,7 @@ $this->_accesslog = new Request_AccessLog(ACCESS_LOG, ACCESS_LOG_SQL); } - $GLOBALS['request'] = $this; + $request = $this; } function get($key) Modified: trunk/lib/WikiDB/backend/ADODB.php =================================================================== --- trunk/lib/WikiDB/backend/ADODB.php 2014-11-28 09:51:10 UTC (rev 9386) +++ trunk/lib/WikiDB/backend/ADODB.php 2014-11-28 14:27:41 UTC (rev 9387) @@ -367,9 +367,9 @@ /** * Get version data. * - * @param $version int Which version to get. + * @param int $version Which version to get. * - * @return hash The version data, or false if specified version does not + * @return array hash The version data, or false if specified version does not * exist. */ function get_versiondata($pagename, $version, $want_content = false) @@ -513,6 +513,11 @@ */ function delete_page($pagename) { + /** + * @var WikiRequest $request + */ + global $request; + $dbh = &$this->_dbh; extract($this->_table_names); @@ -523,7 +528,7 @@ return false; } $mtime = time(); - $user =& $GLOBALS['request']->_user; + $user =& $request->_user; $meta = array('author' => $user->getId(), 'author_id' => $user->getAuthenticatedId(), 'mtime' => $mtime); Modified: trunk/lib/WikiDB/backend/PDO.php =================================================================== --- trunk/lib/WikiDB/backend/PDO.php 2014-11-28 09:51:10 UTC (rev 9386) +++ trunk/lib/WikiDB/backend/PDO.php 2014-11-28 14:27:41 UTC (rev 9387) @@ -32,6 +32,11 @@ function __construct($dbparams) { + /** + * @var WikiRequest $request + */ + global $request; + $this->_dbparams = $dbparams; if (strstr($dbparams['dsn'], "://")) { // pear DB syntax $parsed = parseDSN($dbparams['dsn']); @@ -616,6 +621,11 @@ */ function delete_page($pagename) { + /** + * @var WikiRequest $request + */ + global $request; + $dbh = &$this->_dbh; extract($this->_table_names); @@ -626,7 +636,7 @@ return false; } $mtime = time(); - $user =& $GLOBALS['request']->_user; + $user =& $request->_user; $meta = array('author' => $user->getId(), 'author_id' => $user->getAuthenticatedId(), 'mtime' => $mtime); Modified: trunk/lib/WikiDB/backend/dbaBase.php =================================================================== --- trunk/lib/WikiDB/backend/dbaBase.php 2014-11-28 09:51:10 UTC (rev 9386) +++ trunk/lib/WikiDB/backend/dbaBase.php 2014-11-28 14:27:41 UTC (rev 9387) @@ -193,6 +193,11 @@ */ function delete_page($pagename) { + /** + * @var WikiRequest $request + */ + global $request; + $version = $this->get_latest_version($pagename); $data = $this->_versiondb->get((int)$version . ":$pagename"); // returns serialized string @@ -206,9 +211,9 @@ assert(is_array($data) and !empty($data)); // mtime $data['%content'] = ''; $data['mtime'] = time(); - $data['summary'] = "removed by " . $GLOBALS["request"]->_deduceUsername(); + $data['summary'] = "removed by " . $request->_deduceUsername(); $this->set_versiondata($pagename, $version + 1, $data); - $this->set_links($pagename, false); + $this->set_links($pagename, array()); } /** @@ -225,11 +230,16 @@ } $pagedb->set($pagename, false); - $this->set_links($pagename, false); + $this->set_links($pagename, array()); } function rename_page($pagename, $to) { + /** + * @var WikiRequest $request + */ + global $request; + $result = $this->_pagedb->get($pagename); if ($result) { list($version, $flags, $data) = explode(':', $result, 3); @@ -247,7 +257,7 @@ $pvdata = $this->get_versiondata($pagename, $version, true); $data['mtime'] = time(); $data['summary'] = "renamed from " . $pagename - . " by " . $GLOBALS["request"]->_deduceUsername(); + . " by " . $request->_deduceUsername(); $this->set_versiondata($to, $version, $pvdata); // update links and backlinks @@ -455,6 +465,11 @@ function link_search($pages, $query, $linktype, $relation = false, $options = array()) { + /** + * @var WikiRequest $request + */ + global $request; + $linkdb = &$this->_linkdb; $links = array(); $reverse = false; @@ -479,7 +494,7 @@ $pagename = substr($link, 1); if (!$pages->match($pagename)) continue; if ($linktype == 'attribute') { - $page = $GLOBALS['request']->_dbi->getPage($pagename); + $page = $request->_dbi->getPage($pagename); $attribs = $page->get('attributes'); if ($attribs) { /* Optimization on expressive searches: @@ -557,6 +572,11 @@ */ function relation_search($pages, $query, $options = array()) { + /** + * @var WikiRequest $request + */ + global $request; + $linkdb = &$this->_linkdb; $links = array(); // We need to detect which attributes and relation names we should look for. NYI @@ -576,7 +596,7 @@ if (!$pages->match($pagename)) continue; $pagelinks = array(); if ($want_attributes) { - $page = $GLOBALS['request']->_dbi->getPage($pagename); + $page = $request->_dbi->getPage($pagename); $attribs = $page->get('attributes'); $pagelinks = $attribs; } @@ -658,7 +678,7 @@ extends WikiDB_backend_iterator { // fixed for linkrelations - function __construct(&$backend, &$pages, $options = false) + function __construct(&$backend, &$pages, $options = array()) { $this->_backend = $backend; $this->_options = $options; Modified: trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php =================================================================== --- trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php 2014-11-28 09:51:10 UTC (rev 9386) +++ trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php 2014-11-28 14:27:41 UTC (rev 9387) @@ -41,6 +41,11 @@ function __construct(&$backend, &$pageiter, $search, $linktype, $relation = false, $options = array()) { + /** + * @var WikiRequest $request + */ + global $request; + $this->_backend = &$backend; $this->_pages = $pageiter; $this->search = $search; // search the linkvalue. it should be the value or pagename @@ -52,7 +57,7 @@ $this->limit = isset($options['limit']) ? $options['limit'] : ''; $this->exclude = isset($options['exclude']) ? $options['exclude'] : ''; $this->_field = 'pagename'; // the name of the linkvalue field to apply the search - $this->_dbi =& $GLOBALS['request']->_dbi; + $this->_dbi =& $request->_dbi; if ($linktype == 'relation') { $this->_want_relations = true; $this->_field = 'linkrelation'; Modified: trunk/lib/WikiDB/backend.php =================================================================== --- trunk/lib/WikiDB/backend.php 2014-11-28 09:51:10 UTC (rev 9386) +++ trunk/lib/WikiDB/backend.php 2014-11-28 14:27:41 UTC (rev 9387) @@ -580,7 +580,7 @@ * Duplicate the PageList function here to avoid loading the whole * PageList.php, and it forces the backend specific sortable_columns() */ - function sortby($column, $action, $sortable_columns = false) + function sortby($column, $action, $sortable_columns = array()) { /** * @var WikiRequest $request Modified: trunk/lib/WikiDB.php =================================================================== --- trunk/lib/WikiDB.php 2014-11-28 09:51:10 UTC (rev 9386) +++ trunk/lib/WikiDB.php 2014-11-28 14:27:41 UTC (rev 9387) @@ -110,12 +110,17 @@ */ function __construct(&$backend, $dbparams) { + /** + * @var WikiRequest $request + */ + global $request; + $this->_backend =& $backend; // don't do the following with the auth_dsn! if (isset($dbparams['auth_dsn'])) return; $this->_cache = new WikiDB_cache($backend); - if (!empty($GLOBALS['request'])) $GLOBALS['request']->_dbi = $this; + if (!empty($request)) $request->_dbi = $this; // If the database doesn't yet have a timestamp, initialize it now. if ($this->get('_timestamp') === false) @@ -506,6 +511,11 @@ */ public function renamePage($from, $to, $updateWikiLinks = false) { + /** + * @var WikiRequest $request + */ + global $request; + if (!empty($this->readonly)) { trigger_error("readonly database", E_USER_WARNING); return false; @@ -563,7 +573,7 @@ E_USER_WARNING); } /* Generate notification emails? */ - if ($result and ENABLE_MAILNOTIFY and !is_a($GLOBALS['request'], 'MockRequest')) { + if ($result and ENABLE_MAILNOTIFY and !is_a($request, 'MockRequest')) { $notify = $this->get('notify'); if (!empty($notify) and is_array($notify)) { include_once 'lib/MailNotify.php'; @@ -721,15 +731,25 @@ function getParam($param) { global $DBParams; - if (isset($DBParams[$param])) return $DBParams[$param]; - elseif ($param == 'prefix') return ''; else return false; + if (isset($DBParams[$param])) + return $DBParams[$param]; + elseif ($param == 'prefix') + return ''; + else + return false; } function getAuthParam($param) { global $DBAuthParams; - if (isset($DBAuthParams[$param])) return $DBAuthParams[$param]; - elseif ($param == 'USER_AUTH_ORDER') return $GLOBALS['USER_AUTH_ORDER']; elseif ($param == 'USER_AUTH_POLICY') return $GLOBALS['USER_AUTH_POLICY']; else return false; + if (isset($DBAuthParams[$param])) + return $DBAuthParams[$param]; + elseif ($param == 'USER_AUTH_ORDER') + return $GLOBALS['USER_AUTH_ORDER']; + elseif ($param == 'USER_AUTH_POLICY') + return $GLOBALS['USER_AUTH_POLICY']; + else + return false; } } @@ -1003,6 +1023,11 @@ */ function save($wikitext, $version, $meta, $formatted = null) { + /** + * @var WikiRequest $request + */ + global $request; + if ($this->_wikidb->readonly) { trigger_error("readonly database", E_USER_WARNING); return false; @@ -1047,7 +1072,7 @@ $notify = $this->_wikidb->get('notify'); if (!empty($notify) and is_array($notify) - and !is_a($GLOBALS['request'], 'MockRequest') + and !is_a($request, 'MockRequest') ) { include_once 'lib/MailNotify.php'; $MailNotify = new MailNotify($newrevision->getName()); @@ -1058,13 +1083,13 @@ // more pagechange callbacks: (in a hackish manner for now) if (ENABLE_RECENTCHANGESBOX and empty($meta['is_minor_edit']) - and !in_array($GLOBALS['request']->getArg('action'), + and !in_array($request->getArg('action'), array('loadfile', 'upgrade')) ) { require_once 'lib/WikiPlugin.php'; $w = new WikiPluginLoader(); $p = $w->getPlugin("RecentChangesCached", false); - $p->box_update(false, $GLOBALS['request'], $this->_pagename); + $p->box_update(false, $request, $this->_pagename); } return $newrevision; } @@ -1674,6 +1699,11 @@ */ public function getPackedContent() { + /** + * @var WikiRequest $request + */ + global $request; + $data = &$this->_data; if (empty($data['%content']) @@ -1686,7 +1716,7 @@ // Lib from http://www.aasted.org/quote/ if (defined('FORTUNE_DIR') and is_dir(FORTUNE_DIR) - and in_array($GLOBALS['request']->getArg('action'), + and in_array($request->getArg('action'), array('create', 'edit')) ) { include_once 'lib/fortune.php'; @@ -2155,6 +2185,11 @@ function WikiDB_cache(&$backend) { + /** + * @var WikiRequest $request + */ + global $request; + $this->_backend = &$backend; $this->_pagedata_cache = array(); @@ -2163,8 +2198,8 @@ $this->_glv_cache = array(); $this->_id_cache = array(); // formerly ->_dbi->_iwpcache (nonempty pages => id) - if (isset($GLOBALS['request']->_dbi)) - $this->readonly = $GLOBALS['request']->_dbi->readonly; + if (isset($request->_dbi)) + $this->readonly = $request->_dbi->readonly; } function close() Modified: trunk/lib/WikiGroup.php =================================================================== --- trunk/lib/WikiGroup.php 2014-11-28 09:51:10 UTC (rev 9386) +++ trunk/lib/WikiGroup.php 2014-11-28 14:27:41 UTC (rev 9387) @@ -77,7 +77,6 @@ function WikiGroup($not_current = false) { $this->not_current = $not_current; - //$this->request =& $GLOBALS['request']; } /** @@ -481,9 +480,7 @@ */ function __construct() { - //$this->request = &$GLOBALS['request']; $this->username = $this->_getUserName(); - //$this->username = null; $this->membership = array(); } @@ -581,10 +578,15 @@ */ function getMembersOf($group) { + /** + * @var WikiRequest $request + */ + global $request; + if ($this->specialGroup($group)) return $this->getSpecialMembersOf($group); - $group_page = $GLOBALS['request']->getPage($group); + $group_page = $request->getPage($group); $group_revision = $group_page->getCurrentRevision(); if ($group_revision->hasDefaultContents()) { trigger_error(sprintf(_("Group %s does not exist"), $group), E_USER_WARNING); @@ -842,9 +844,7 @@ { function __construct() { - //$this->request = &$GLOBALS['request']; $this->username = $this->_getUserName(); - //$this->username = null; $this->membership = array(); if (!defined('AUTH_GROUP_FILE')) { @@ -952,7 +952,6 @@ { function __construct() { - //$this->request = &$GLOBALS['request']; $this->username = $this->_getUserName(); $this->membership = array(); Modified: trunk/lib/WikiPlugin.php =================================================================== --- trunk/lib/WikiPlugin.php 2014-11-28 09:51:10 UTC (rev 9386) +++ trunk/lib/WikiPlugin.php 2014-11-28 14:27:41 UTC (rev 9387) @@ -171,6 +171,11 @@ function parseArgStr($argstr) { + /** + * @var WikiRequest $request + */ + global $request; + $args = array(); $defaults = array(); if (empty($argstr)) @@ -195,7 +200,7 @@ $markup = null; $basepage = null; $plugin_val = preg_replace(array("/^<!/", "/!>$/"), array("<?", "?>"), $plugin_val); - $val = $loader->expandPI($plugin_val, $GLOBALS['request'], $markup, $basepage); + $val = $loader->expandPI($plugin_val, $request, $markup, $basepage); if ($op == '=') { $args[$arg] = $val; // comma delimited pagenames or array()? } else { Modified: trunk/lib/WikiPluginCached.php =================================================================== --- trunk/lib/WikiPluginCached.php 2014-11-28 09:51:10 UTC (rev 9386) +++ trunk/lib/WikiPluginCached.php 2014-11-28 14:27:41 UTC (rev 9387) @@ -1075,13 +1075,18 @@ */ function execute($cmd, $until = '') { + /** + * @var WikiRequest $request + */ + global $request; + // cmd must redirect stderr to stdout though! $errstr = exec($cmd); //, $outarr, $returnval); // normally 127 //$errstr = join('',$outarr); $ok = empty($errstr); if (!$ok) { trigger_error("\n" . $cmd . " failed: $errstr", E_USER_WARNING); - } elseif ($GLOBALS['request']->getArg('debug')) + } elseif ($request->getArg('debug')) trigger_error("\n" . $cmd . ": success\n", E_USER_NOTICE); if (!isWindows()) { if ($until) { Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2014-11-28 09:51:10 UTC (rev 9386) +++ trunk/lib/WikiTheme.php 2014-11-28 14:27:41 UTC (rev 9387) @@ -230,8 +230,8 @@ $this->addMoreHeaders(JavaScript('', array('src' => $this->_findData("jquery.tablesorter.min.js")))); } // by pixels - if ((is_object($GLOBALS['request']) // guard against unittests - and $GLOBALS['request']->getPref('doubleClickEdit')) + if ((is_object($request) // guard against unittests + and $request->getPref('doubleClickEdit')) or ENABLE_DOUBLECLICKEDIT ) $this->initDoubleClickEdit(); @@ -525,9 +525,14 @@ */ function getOwnerMessage($page) { + /** + * @var WikiRequest $request + */ + global $request; + if (!ENABLE_PAGEPERM or !class_exists("PagePermission")) return ''; - $dbi =& $GLOBALS['request']->_dbi; + $dbi =& $request->_dbi; $owner = $page->getOwner(); if ($owner) { /* @@ -548,9 +553,14 @@ Prefer author (name) over internal author_id (IP) */ function getAuthorMessage($revision) { + /** + * @var WikiRequest $request + */ + global $request; + if (!$revision) return ''; - $dbi =& $GLOBALS['request']->_dbi; + $dbi =& $request->_dbi; $author = $revision->get('author'); if (!$author) $author = $revision->get('author_id'); @@ -1262,10 +1272,14 @@ * TODO: first css, then js. Maybe separate it into addJSHeaders/addCSSHeaders * or use an optional type argument, and separate it within _MoreHeaders[] */ - //$GLOBALS['request']->_MoreHeaders = array(); function addMoreHeaders($element) { - $GLOBALS['request']->_MoreHeaders[] = $element; + /** + * @var WikiRequest $request + */ + global $request; + + $request->_MoreHeaders[] = $element; if (!empty($this->_headers_printed) and $this->_headers_printed) { trigger_error(_("Some action(page) wanted to add more headers, but they were already printed.") . "\n" . $element->asXML(), @@ -1310,7 +1324,6 @@ return $out; } - //$GLOBALS['request']->_MoreAttr = array(); // new arg: named elements to be able to remove them. such as DoubleClickEdit for htmldumps function addMoreAttr($tag, $name, $element) { @@ -1583,7 +1596,12 @@ function calendarInit($force = false) { - $dbi = $GLOBALS['request']->getDbh(); + /** + * @var WikiRequest $request + */ + global $request; + + $dbi = $request->getDbh(); // display flat calender dhtml in the sidebar if ($force or $dbi->isWikiPage($this->calendarBase())) { $jslang = @$GLOBALS['LANG']; @@ -1747,7 +1765,7 @@ $this->setAttr('class', $class); // Google honors this if (in_array(strtolower($text), array('edit', 'create', 'diff', 'pdf')) - and !$GLOBALS['request']->_user->isAuthenticated() + and !$request->_user->isAuthenticated() ) $this->setAttr('rel', 'nofollow'); @@ -1870,8 +1888,13 @@ function format($args = array()) { + /** + * @var WikiRequest $request + */ + global $request; + return $this->_plugin->box($args ? array_merge($this->_args, $args) : $this->_args, - $GLOBALS['request'], + $request, $this->_basepage); } } Modified: trunk/lib/WikiUser/AdoDb.php =================================================================== --- trunk/lib/WikiUser/AdoDb.php 2014-11-28 09:51:10 UTC (rev 9386) +++ trunk/lib/WikiUser/AdoDb.php 2014-11-28 14:27:41 UTC (rev 9387) @@ -40,6 +40,11 @@ function _AdoDbPassUser($UserName = '', $prefs = false) { + /** + * @var WikiRequest $request + */ + global $request; + if (!$this->_prefs and is_a($this, "_AdoDbPassUser")) { if ($prefs) $this->_prefs = $prefs; if (!isset($this->_prefs->_method)) @@ -51,7 +56,7 @@ } $this->_userid = $UserName; $this->getAuthDbh(); - $this->_auth_crypt_method = $GLOBALS['request']->_dbi->getAuthParam('auth_crypt_method'); + $this->_auth_crypt_method = $request->_dbi->getAuthParam('auth_crypt_method'); // Don't prepare the configured auth statements anymore return $this; } @@ -135,6 +140,11 @@ function userExists() { + /** + * @var WikiRequest $request + */ + global $request; + $this->getAuthDbh(); $dbh = &$this->_auth_dbi; if (!$dbh) { // needed? @@ -143,7 +153,7 @@ if (!$this->isValidName()) { return $this->_tryNextUser(); } - $dbi =& $GLOBALS['request']->_dbi; + $dbi =& $request->_dbi; // Prepare the configured auth statements if ($dbi->getAuthParam('auth_check') and empty($this->_authselect)) { $this->_authselect = $this->prepare($dbi->getAuthParam('auth_check'), @@ -199,7 +209,11 @@ function checkPass($submitted_password) { - //global $DBAuthParams; + /** + * @var WikiRequest $request + */ + global $request; + $this->getAuthDbh(); if (!$this->_auth_dbi) { // needed? return $this->_tryNextPass($submitted_password); @@ -212,7 +226,7 @@ return WIKIAUTH_FORBIDDEN; } $dbh =& $this->_auth_dbi; - $dbi =& $GLOBALS['request']->_dbi; + $dbi =& $request->_dbi; if (empty($this->_authselect) and $dbi->getAuthParam('auth_check')) { $this->_authselect = $this->prepare($dbi->getAuthParam('auth_check'), array("password", "userid")); @@ -265,14 +279,24 @@ function mayChangePass() { - return $GLOBALS['request']->_dbi->getAuthParam('auth_update'); + /** + * @var WikiRequest $request + */ + global $request; + + return $request->_dbi->getAuthParam('auth_update'); } function storePass($submitted_password) { + /** + * @var WikiRequest $request + */ + global $request; + $this->getAuthDbh(); $dbh = &$this->_auth_dbi; - $dbi =& $GLOBALS['request']->_dbi; + $dbi =& $request->_dbi; if ($dbi->getAuthParam('auth_update') and empty($this->_authupdate)) { $this->_authupdate = $this->prepare($dbi->getAuthParam('auth_update'), array("password", "userid")); Modified: trunk/lib/WikiUser/Db.php =================================================================== --- trunk/lib/WikiUser/Db.php 2014-11-28 09:51:10 UTC (rev 9386) +++ trunk/lib/WikiUser/Db.php 2014-11-28 14:27:41 UTC (rev 9387) @@ -51,6 +51,11 @@ // sets the auth_dbi and pref methods, before this class is initialized. function _DbPassUser($UserName = '', $prefs = false) { + /** + * @var WikiRequest $request + */ + global $request; + if (!$this->_prefs) { if ($prefs) $this->_prefs = $prefs; } @@ -63,7 +68,7 @@ $this->_authmethod = 'Db'; //$this->getAuthDbh(); //$this->_auth_crypt_method = @$GLOBALS['DBAuthParams']['auth_crypt_method']; - $dbi =& $GLOBALS['request']->_dbi; + $dbi =& $request->_dbi; $dbtype = $dbi->getParam('dbtype'); if ($dbtype == 'ADODB') { include_once 'lib/WikiUser/AdoDb.php'; Modified: trunk/lib/WikiUser/PdoDb.php =================================================================== --- trunk/lib/WikiUser/PdoDb.php 2014-11-28 09:51:10 UTC (rev 9386) +++ trunk/lib/WikiUser/PdoDb.php 2014-11-28 14:27:41 UTC (rev 9387) @@ -37,6 +37,10 @@ function _PdoDbPassUser($UserName = '', $prefs = false) { + /** + * @var WikiRequest $request + */ + global $request; if (!$this->_prefs and is_a($this, "_PdoDbPassUser")) { if ($prefs) $this->_prefs = $prefs; @@ -50,7 +54,7 @@ $this->_userid = $UserName; // make use of session data. generally we only initialize this every time, // but do auth checks only once - $this->_auth_crypt_method = $GLOBALS['request']->_dbi->getAuthParam('auth_crypt_method'); + $this->_auth_crypt_method = $request->_dbi->getAuthParam('auth_crypt_method'); return $this; } @@ -114,6 +118,11 @@ function userExists() { + /** + * @var WikiRequest $request + */ + global $request; + $this->getAuthDbh(); $dbh = &$this->_auth_dbi; if (!$dbh) { // needed? @@ -123,7 +132,7 @@ trigger_error(_("Invalid username."), E_USER_WARNING); return $this->_tryNextUser(); } - $dbi =& $GLOBALS['request']->_dbi; + $dbi =& $request->_dbi; if ($dbi->getAuthParam('auth_check') and empty($this->_authselect)) { try { $this->_authselect = $dbh->prepare($dbi->getAuthParam('auth_check')); @@ -246,17 +255,27 @@ function mayChangePass() { - return $GLOBALS['request']->_dbi->getAuthParam('auth_update'); + /** + * @var WikiRequest $request + */ + global $request; + + return $request->_dbi->getAuthParam('auth_update'); } function storePass($submitted_password) { + /** + * @var WikiRequest $request + */ + global $request; + if (!$this->isValidName()) { return false; } $this->getAuthDbh(); $dbh = &$this->_auth_dbi; - $dbi =& $GLOBALS['request']->_dbi; + $dbi =& $request->_dbi; if ($dbi->getAuthParam('auth_update') and empty($this->_authupdate)) { try { $this->_authupdate = $dbh->prepare($dbi->getAuthParam('auth_update')); Modified: trunk/lib/WikiUser/PearDb.php =================================================================== --- trunk/lib/WikiUser/PearDb.php 2014-11-28 09:51:10 UTC (rev 9386) +++ trunk/lib/WikiUser/PearDb.php 2014-11-28 14:27:41 UTC (rev 9387) @@ -35,7 +35,11 @@ function _PearDbPassUser($UserName = '', $prefs = false) { - //global $DBAuthParams; + /** + * @var WikiRequest $request + */ + global $request; + if (!$this->_prefs and is_a($this, "_PearDbPassUser")) { if ($prefs) { $this->_prefs = $prefs; @@ -50,7 +54,7 @@ $this->_userid = $UserName; // make use of session data. generally we only initialize this every time, // but do auth checks only once - $this->_auth_crypt_method = $GLOBALS['request']->_dbi->getAuthParam('auth_crypt_method'); + $this->_auth_crypt_method = $request->_dbi->getAuthParam('auth_crypt_method'); return $this; } @@ -84,6 +88,11 @@ function setPreferences($prefs, $id_only = false) { + /** + * @var WikiRequest $request + */ + global $request; + // if the prefs are changed if ($count = _AnonUser::setPreferences($prefs, 1)) { //global $request; @@ -108,7 +117,7 @@ } else { // Otherwise, insert a record for them and set it to the defaults. // jo...@de... - $dbi = $GLOBALS['request']->getDbh(); + $dbi = $request->getDbh(); $this->_prefs->_insert = $this->prepare($dbi->getAuthParam('pref_insert'), array("pref_blob", "userid")); $dbh->simpleQuery(sprintf($this->_prefs->_insert, @@ -129,7 +138,11 @@ function userExists() { - //global $DBAuthParams; + /** + * @var WikiRequest $request + */ + global $request; + $this->getAuthDbh(); $dbh = &$this->_auth_dbi; if (!$dbh) { // needed? @@ -139,7 +152,7 @@ trigger_error(_("Invalid username."), E_USER_WARNING); return $this->_tryNextUser(); } - $dbi =& $GLOBALS['request']->_dbi; + $dbi =& $request->_dbi; // Prepare the configured auth statements if ($dbi->getAuthParam('auth_check') and empty($this->_authselect)) { $this->_authselect = $this->prepare($dbi->getAuthParam('auth_check'), @@ -229,17 +242,27 @@ function mayChangePass() { - return $GLOBALS['request']->_dbi->getAuthParam('auth_update'); + /** + * @var WikiRequest $request + */ + global $request; + + return $request->_dbi->getAuthParam('auth_update'); } function storePass($submitted_password) { + /** + * @var WikiRequest $request + */ + global $request; + if (!$this->isValidName()) { return false; } $this->getAuthDbh(); $dbh = &$this->_auth_dbi; - $dbi =& $GLOBALS['request']->_dbi; + $dbi =& $request->_dbi; if ($dbi->getAuthParam('auth_update') and empty($this->_authupdate)) { $this->_authupdate = $this->prepare($dbi->getAuthParam('auth_update'), array("password", "userid")); Modified: trunk/lib/WikiUser.php =================================================================== --- trunk/lib/WikiUser.php 2014-11-28 09:51:10 UTC (rev 9386) +++ trunk/lib/WikiUser.php 2014-11-28 14:27:41 UTC (rev 9387) @@ -185,13 +185,8 @@ return $GLOBALS['ForbiddenUser']; //FIXME: check admin membership later at checkPass. Now we cannot raise the level. - //$group = &WikiGroup::getGroup($GLOBALS['request']); if ($UserName == ADMIN_USER) return new _AdminUser($UserName); - /* elseif ($group->isMember(GROUP_ADMIN)) { // unneeded code - return _determineBogoUserOrPassUser($UserName); - } - */ else return _determineBogoUserOrPassUser($UserName); } @@ -199,6 +194,10 @@ function _determineBogoUserOrPassUser($UserName) { global $ForbiddenUser; + /** + * @var WikiRequest $request + */ + global $request; // Sanity check. User name is a condition of the definition of // _BogoUser and _PassUser. @@ -210,7 +209,7 @@ if (_isBogoUserAllowed() and isWikiWord($UserName)) { include_once 'lib/WikiUser/BogoLogin.php'; $_BogoUser = new _BogoLoginPassUser($UserName); - if ($_BogoUser->userExists() or $GLOBALS['request']->getArg('auth')) + if ($_BogoUser->userExists() or $request->getArg('auth')) return $_BogoUser; } if (_isUserPasswordsAllowed()) { @@ -222,9 +221,9 @@ else { $_PassUser = new _PassUser($UserName, isset($_BogoUser) ? $_BogoUser->_prefs : false); - if ($_PassUser->userExists() or $GLOBALS['request']->getArg('auth')) { - if (isset($GLOBALS['request']->_user_class)) - $class = $GLOBALS['request']->_user_class; + if ($_PassUser->userExists() or $request->getArg('auth')) { + if (isset($request->_user_class)) + $class = $request->_user_class; elseif (strtolower(get_class($_PassUser)) == "_passuser") $class = $_PassUser->nextClass(); else $class = get_class($_PassUser); @@ -320,14 +319,14 @@ } if (!empty($user->_authmethod)) $newuser->_authmethod = $user->_authmethod; - $GLOBALS['request']->_user_class = get_class($newuser); + $request->_user_class = get_class($newuser); /* foreach (get_object_vars($user) as $k => $v) { if (!empty($v)) $olduser->$k = $v; } */ $newuser->hasHomePage(); // revive db handle, because these don't survive sessions - //$GLOBALS['request']->_user = $olduser; + //$request->_user = $olduser; return $newuser; } else { return false; @@ -555,7 +554,7 @@ if (!$this->isSignedIn()) return false; if (!$this->isAuthenticated()) return false; - if (!$group) $group = &$GLOBALS['request']->getGroup(); + if (!$group) $group = &$request->getGroup(); return ($this->_level > WIKIAUTH_BOGO and $group->isMember(GROUP_ADMIN)); } @@ -563,9 +562,14 @@ */ function getId() { + /** + * @var WikiRequest $request + */ + global $request; + return ($this->UserName() ? $this->UserName() - : $GLOBALS['request']->get('REMOTE_ADDR')); + : $request->get('REMOTE_ADDR')); } /** Name for an authenticated user. No IP here. @@ -574,7 +578,7 @@ { return ($this->isAuthenticated() ? $this->_userid - : ''); //$GLOBALS['request']->get('REMOTE_ADDR') ); + : ''); // $request->get('REMOTE_ADDR') ); } function hasAuthority($require_level) @@ -631,8 +635,8 @@ } //error_log("$entry\n", 3, LOGIN_LOG); } - if (method_exists($GLOBALS['request']->_user, "logout")) { //_HttpAuthPassUser - $GLOBALS['request']->_user->logout(); + if (method_exists($request->_user, "logout")) { //_HttpAuthPassUser + $request->... [truncated message content] |
From: <var...@us...> - 2014-11-28 14:55:02
|
Revision: 9389 http://sourceforge.net/p/phpwiki/code/9389 Author: vargenau Date: 2014-11-28 14:54:59 +0000 (Fri, 28 Nov 2014) Log Message: ----------- Simplify backlinks Modified Paths: -------------- trunk/lib/InlineParser.php trunk/lib/plugin/IncludePage.php trunk/lib/plugin/Template.php Modified: trunk/lib/InlineParser.php =================================================================== --- trunk/lib/InlineParser.php 2014-11-28 14:49:43 UTC (rev 9388) +++ trunk/lib/InlineParser.php 2014-11-28 14:54:59 UTC (rev 9389) @@ -441,7 +441,7 @@ } global $backlinks; - $backlinks[] = array('linkto' => $pagename, 'relation' => 0); + $backlinks[] = array('linkto' => $pagename); return new Cached_WikiLink($pagename, $label, $anchor); } Modified: trunk/lib/plugin/IncludePage.php =================================================================== --- trunk/lib/plugin/IncludePage.php 2014-11-28 14:49:43 UTC (rev 9388) +++ trunk/lib/plugin/IncludePage.php 2014-11-28 14:54:59 UTC (rev 9389) @@ -68,7 +68,7 @@ $this->run($request->_dbi, $argstr, $request, $basepage); } - $backlinks[] = array('linkto' => $page->name, 'relation' => 0); + $backlinks[] = array('linkto' => $page->name); return $backlinks; } Modified: trunk/lib/plugin/Template.php =================================================================== --- trunk/lib/plugin/Template.php 2014-11-28 14:49:43 UTC (rev 9388) +++ trunk/lib/plugin/Template.php 2014-11-28 14:54:59 UTC (rev 9389) @@ -100,7 +100,7 @@ $this->run($request->_dbi, $argstr, $request, $basepage); } - $backlinks[] = array('linkto' => $page->name, 'relation' => 0); + $backlinks[] = array('linkto' => $page->name); return $backlinks; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-12-01 14:46:43
|
Revision: 9396 http://sourceforge.net/p/phpwiki/code/9396 Author: vargenau Date: 2014-12-01 14:46:35 +0000 (Mon, 01 Dec 2014) Log Message: ----------- Add @var WikiRequest $request Modified Paths: -------------- trunk/lib/WikiDB/ADODB.php trunk/lib/WikiDB/PDO.php trunk/lib/WikiDB/SQL.php trunk/lib/WikiTheme.php Modified: trunk/lib/WikiDB/ADODB.php =================================================================== --- trunk/lib/WikiDB/ADODB.php 2014-12-01 14:02:03 UTC (rev 9395) +++ trunk/lib/WikiDB/ADODB.php 2014-12-01 14:46:35 UTC (rev 9396) @@ -45,7 +45,9 @@ function isWikiPage($pagename) { $pagename = (string)$pagename; - if ($pagename === '') return false; + if ($pagename === '') { + return false; + } if (!array_key_exists($pagename, $this->_cache->_id_cache)) { $this->_cache->_id_cache[$pagename] = $this->_backend->is_wiki_page($pagename); } @@ -75,8 +77,14 @@ function isOpen() { + /** + * @var WikiRequest $request + */ global $request; - if (!$request->_dbi) return false; + + if (!$request->_dbi) { + return false; + } return is_resource($this->_backend->connection()); } Modified: trunk/lib/WikiDB/PDO.php =================================================================== --- trunk/lib/WikiDB/PDO.php 2014-12-01 14:02:03 UTC (rev 9395) +++ trunk/lib/WikiDB/PDO.php 2014-12-01 14:46:35 UTC (rev 9396) @@ -43,7 +43,9 @@ function isWikiPage($pagename) { $pagename = (string)$pagename; - if ($pagename === '') return false; + if ($pagename === '') { + return false; + } if (!array_key_exists($pagename, $this->_cache->_id_cache)) { $this->_cache->_id_cache[$pagename] = $this->_backend->is_wiki_page($pagename); } @@ -51,7 +53,6 @@ } // With PDO we should really use native quoting using prepared statements with ? - // Supported since PDO-0.3 (?) // Add surrounding quotes '' if string function quote($in) { @@ -76,8 +77,14 @@ function isOpen() { + /** + * @var WikiRequest $request + */ global $request; - if (!$request->_dbi) return false; + + if (!$request->_dbi) { + return false; + } return is_object($this->_backend->_dbh); } Modified: trunk/lib/WikiDB/SQL.php =================================================================== --- trunk/lib/WikiDB/SQL.php 2014-12-01 14:02:03 UTC (rev 9395) +++ trunk/lib/WikiDB/SQL.php 2014-12-01 14:46:35 UTC (rev 9396) @@ -11,7 +11,7 @@ $backend = $dbparams['dsn']['phptype']; elseif (preg_match('/^(\w+):/', $dbparams['dsn'], $m)) $backend = $m[1]; - if ($backend == 'postgres7') { // ADODB cross-compatiblity hack (for unit testing) + if ($backend == 'postgres7') { // ADODB cross-compatibility hack (for unit testing) $backend = 'pgsql'; if (is_string($dbparams['dsn'])) $dbparams['dsn'] = $backend . ':' . substr($dbparams['dsn'], 10); @@ -44,8 +44,9 @@ function isWikiPage($pagename) { $pagename = (string)$pagename; - if ($pagename === '') return false; - //if (empty($this->_iwpcache)) { $this->_iwpcache = array(); } + if ($pagename === '') { + return false; + } if (empty($this->_cache->id_cache[$pagename])) { $this->_cache->_id_cache[$pagename] = $this->_backend->is_wiki_page($pagename); } @@ -66,8 +67,14 @@ function isOpen() { + /** + * @var WikiRequest $request + */ global $request; - if (!$request->_dbi) return false; + + if (!$request->_dbi) { + return false; + } return is_resource($this->_backend->connection()); } Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2014-12-01 14:02:03 UTC (rev 9395) +++ trunk/lib/WikiTheme.php 2014-12-01 14:46:35 UTC (rev 9396) @@ -1365,6 +1365,9 @@ // new arg: named elements to be able to remove them. such as DoubleClickEdit for htmldumps function addMoreAttr($tag, $name, $element) { + /** + * @var WikiRequest $request + */ global $request; // protect from duplicate attr (body jscript: themes, prefs, ...) static $_attr_cache = array(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-12-02 12:51:41
|
Revision: 9399 http://sourceforge.net/p/phpwiki/code/9399 Author: vargenau Date: 2014-12-02 12:51:39 +0000 (Tue, 02 Dec 2014) Log Message: ----------- Use trigger_error, this->error does not exist Modified Paths: -------------- trunk/lib/PageList.php trunk/lib/WikiDB/backend.php Modified: trunk/lib/PageList.php =================================================================== --- trunk/lib/PageList.php 2014-12-01 16:07:25 UTC (rev 9398) +++ trunk/lib/PageList.php 2014-12-02 12:51:39 UTC (rev 9399) @@ -1512,19 +1512,22 @@ if (is_array($limit)) { list($from, $count) = $limit; if ((!empty($from) && !is_numeric($from)) or (!empty($count) && !is_numeric($count))) { - return $this->error(_("Illegal 'limit' argument: must be numeric")); + trigger_error(_("Illegal 'limit' argument: must be numeric")); + return array(0, 0); } return $limit; } if (strstr($limit, ',')) { list($from, $limit) = explode(',', $limit); if ((!empty($from) && !is_numeric($from)) or (!empty($limit) && !is_numeric($limit))) { - return $this->error(_("Illegal 'limit' argument: must be numeric")); + trigger_error(_("Illegal 'limit' argument: must be numeric")); + return array(0, 0); } return array($from, $limit); } else { if (!empty($limit) && !is_numeric($limit)) { - return $this->error(_("Illegal 'limit' argument: must be numeric")); + trigger_error(_("Illegal 'limit' argument: must be numeric")); + return array(0, 0); } return array(0, $limit); } Modified: trunk/lib/WikiDB/backend.php =================================================================== --- trunk/lib/WikiDB/backend.php 2014-12-01 16:07:25 UTC (rev 9398) +++ trunk/lib/WikiDB/backend.php 2014-12-02 12:51:39 UTC (rev 9399) @@ -553,17 +553,19 @@ * Usage: * list($offset,$count) = $this->limit($args['limit']); */ - function limit($limit) + static function limit($limit) { if (strstr($limit, ',')) { list($from, $limit) = explode(',', $limit); if ((!empty($from) && !is_numeric($from)) or (!empty($limit) && !is_numeric($limit))) { - return $this->error(_("Illegal 'limit' argument: must be numeric")); + trigger_error(_("Illegal 'limit' argument: must be numeric")); + return array(0, 0); } return array($from, $limit); } else { if (!empty($limit) && !is_numeric($limit)) { - return $this->error(_("Illegal 'limit' argument: must be numeric")); + trigger_error(_("Illegal 'limit' argument: must be numeric")); + return array(0, 0); } return array(0, $limit); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-12-02 12:55:40
|
Revision: 9400 http://sourceforge.net/p/phpwiki/code/9400 Author: vargenau Date: 2014-12-02 12:55:31 +0000 (Tue, 02 Dec 2014) Log Message: ----------- static Modified Paths: -------------- trunk/lib/PageType.php trunk/lib/Request.php trunk/lib/WikiCallback.php trunk/lib/WikiDB.php Modified: trunk/lib/PageType.php =================================================================== --- trunk/lib/PageType.php 2014-12-02 12:51:39 UTC (rev 9399) +++ trunk/lib/PageType.php 2014-12-02 12:55:31 UTC (rev 9400) @@ -71,8 +71,6 @@ /** * Get a page type descriptor. * - * This is a static member function. - * * @param string $name Name of the page type. * @return PageType An object which is a subclass of PageType. */ Modified: trunk/lib/Request.php =================================================================== --- trunk/lib/Request.php 2014-12-02 12:51:39 UTC (rev 9399) +++ trunk/lib/Request.php 2014-12-02 12:55:31 UTC (rev 9400) @@ -1106,12 +1106,10 @@ /** * Get time zone offset. * - * This is a static member function. - * * @param int $time Unix timestamp (defaults to current time). * @return string Zone offset, e.g. "-0800" for PST. */ - function _zone_offset($time = 0) + static function _zone_offset($time = 0) { if (!$time) $time = time(); @@ -1129,8 +1127,6 @@ /** * Format time in NCSA format. * - * This is a static member function. - * * @param int $time Unix timestamp (defaults to current time). * @return string Formatted date & time. */ @@ -1248,9 +1244,8 @@ /** Parse tag from header. * - * This is a static member function. */ - function parse($strval) + static function parse($strval) { if (!preg_match(':^(W/)?"(.+)"$:i', trim($strval), $m)) return false; // parse failed Modified: trunk/lib/WikiCallback.php =================================================================== --- trunk/lib/WikiCallback.php 2014-12-02 12:51:39 UTC (rev 9399) +++ trunk/lib/WikiCallback.php 2014-12-02 12:55:31 UTC (rev 9400) @@ -15,8 +15,6 @@ /** * Convert from Pear-style callback specification to a WikiCallback. * - * This is a static member function. - * * @param $pearCb mixed * For a global function callback, $pearCb should be a string containing * the name of the function. @@ -25,7 +23,7 @@ * element should be a string containing the name of the method to be invoked. * @return object Returns the appropriate subclass of WikiCallback. */ - public function callback($pearCb) + static public function callback($pearCb) { if (is_string($pearCb)) return new WikiFunctionCb($pearCb); Modified: trunk/lib/WikiDB.php =================================================================== --- trunk/lib/WikiDB.php 2014-12-02 12:51:39 UTC (rev 9399) +++ trunk/lib/WikiDB.php 2014-12-02 12:55:31 UTC (rev 9400) @@ -43,9 +43,8 @@ /** * Open a WikiDB database. * - * This is a static member function. This function inspects its - * arguments to determine the proper subclass of WikiDB to - * instantiate, and then it instantiates it. + * This function inspects its arguments to determine the proper + * subclass of WikiDB to instantiate, and then it instantiates it. * * @param array $dbparams Database configuration parameters (hash). * Some pertinent parameters are: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-12-02 13:41:40
|
Revision: 9403 http://sourceforge.net/p/phpwiki/code/9403 Author: vargenau Date: 2014-12-02 13:41:37 +0000 (Tue, 02 Dec 2014) Log Message: ----------- static public --> public static to be consistent Modified Paths: -------------- trunk/lib/WikiDB.php trunk/lib/WikiPluginCached.php Modified: trunk/lib/WikiDB.php =================================================================== --- trunk/lib/WikiDB.php 2014-12-02 13:30:43 UTC (rev 9402) +++ trunk/lib/WikiDB.php 2014-12-02 13:41:37 UTC (rev 9403) @@ -95,7 +95,7 @@ * * @return WikiDB A WikiDB object. **/ - static public function open($dbparams) + public static function open($dbparams) { $dbtype = $dbparams{'dbtype'}; include_once("lib/WikiDB/$dbtype.php"); Modified: trunk/lib/WikiPluginCached.php =================================================================== --- trunk/lib/WikiPluginCached.php 2014-12-02 13:30:43 UTC (rev 9402) +++ trunk/lib/WikiPluginCached.php 2014-12-02 13:41:37 UTC (rev 9403) @@ -474,7 +474,7 @@ * * @return Cache copy of the cache object */ - static public function newCache() + public static function newCache() { static $staticcache; @@ -948,7 +948,7 @@ * @param array $bgcol background color; array(red,green,blue) * @return string image handle for gd routines */ - static public function text2img($txt, $fontnr, $textcol, $bgcol) + public static function text2img($txt, $fontnr, $textcol, $bgcol) { // basic (!) output for error handling This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-12-03 14:57:43
|
Revision: 9411 http://sourceforge.net/p/phpwiki/code/9411 Author: vargenau Date: 2014-12-03 14:57:35 +0000 (Wed, 03 Dec 2014) Log Message: ----------- New function is_limit Modified Paths: -------------- trunk/lib/plugin/AllPages.php trunk/lib/plugin/AllUsers.php trunk/lib/plugin/BackLinks.php trunk/lib/plugin/IncludePages.php trunk/lib/plugin/LinkDatabase.php trunk/lib/plugin/ListSubpages.php trunk/lib/plugin/MostPopular.php trunk/lib/plugin/OrphanedPages.php trunk/lib/plugin/PageHistory.php trunk/lib/plugin/PopularNearby.php trunk/lib/plugin/TitleSearch.php trunk/lib/plugin/WantedPages.php trunk/lib/plugin/WantedPagesOld.php trunk/lib/stdlib.php Modified: trunk/lib/plugin/AllPages.php =================================================================== --- trunk/lib/plugin/AllPages.php 2014-12-03 12:46:50 UTC (rev 9410) +++ trunk/lib/plugin/AllPages.php 2014-12-03 14:57:35 UTC (rev 9411) @@ -64,7 +64,7 @@ { $args = $this->getArgs($argstr, $request); - if (isset($args['limit']) && !is_numeric($args['limit'])) { + if (isset($args['limit']) && !is_limit($args['limit'])) { return HTML::p(array('class' => "error"), _("Illegal 'limit' argument: must be numeric")); } Modified: trunk/lib/plugin/AllUsers.php =================================================================== --- trunk/lib/plugin/AllUsers.php 2014-12-03 12:46:50 UTC (rev 9410) +++ trunk/lib/plugin/AllUsers.php 2014-12-03 14:57:35 UTC (rev 9411) @@ -68,7 +68,7 @@ { $args = $this->getArgs($argstr, $request); - if (isset($args['limit']) && !is_numeric($args['limit'])) { + if (isset($args['limit']) && !is_limit($args['limit'])) { return HTML::p(array('class' => "error"), _("Illegal 'limit' argument: must be numeric")); } Modified: trunk/lib/plugin/BackLinks.php =================================================================== --- trunk/lib/plugin/BackLinks.php 2014-12-03 12:46:50 UTC (rev 9410) +++ trunk/lib/plugin/BackLinks.php 2014-12-03 14:57:35 UTC (rev 9411) @@ -59,7 +59,7 @@ { $args = $this->getArgs($argstr, $request); - if (isset($args['limit']) && !is_numeric($args['limit'])) { + if (isset($args['limit']) && !is_limit($args['limit'])) { return HTML::p(array('class' => "error"), _("Illegal 'limit' argument: must be numeric")); } Modified: trunk/lib/plugin/IncludePages.php =================================================================== --- trunk/lib/plugin/IncludePages.php 2014-12-03 12:46:50 UTC (rev 9410) +++ trunk/lib/plugin/IncludePages.php 2014-12-03 14:57:35 UTC (rev 9411) @@ -55,7 +55,7 @@ { $args = $this->getArgs($argstr, $request); - if (isset($args['limit']) && !is_numeric($args['limit'])) { + if (isset($args['limit']) && !limit($args['limit'])) { return HTML::p(array('class' => "error"), _("Illegal 'limit' argument: must be numeric")); } Modified: trunk/lib/plugin/LinkDatabase.php =================================================================== --- trunk/lib/plugin/LinkDatabase.php 2014-12-03 12:46:50 UTC (rev 9410) +++ trunk/lib/plugin/LinkDatabase.php 2014-12-03 14:57:35 UTC (rev 9411) @@ -101,7 +101,7 @@ global $WikiTheme; $args = $this->getArgs($argstr, $request); - if (isset($args['limit']) && !is_numeric($args['limit'])) { + if (isset($args['limit']) && !is_limit($args['limit'])) { return HTML::p(array('class' => "error"), _("Illegal 'limit' argument: must be numeric")); } Modified: trunk/lib/plugin/ListSubpages.php =================================================================== --- trunk/lib/plugin/ListSubpages.php 2014-12-03 12:46:50 UTC (rev 9410) +++ trunk/lib/plugin/ListSubpages.php 2014-12-03 14:57:35 UTC (rev 9411) @@ -64,7 +64,7 @@ { $args = $this->getArgs($argstr, $request); - if (isset($args['limit']) && !is_numeric($args['limit'])) { + if (isset($args['limit']) && !is_limit($args['limit'])) { return HTML::p(array('class' => "error"), _("Illegal 'limit' argument: must be numeric")); } Modified: trunk/lib/plugin/MostPopular.php =================================================================== --- trunk/lib/plugin/MostPopular.php 2014-12-03 12:46:50 UTC (rev 9410) +++ trunk/lib/plugin/MostPopular.php 2014-12-03 14:57:35 UTC (rev 9411) @@ -64,7 +64,7 @@ extract($args); - if (isset($limit) && !is_numeric($limit)) { + if (isset($limit) && !is_limit($limit)) { return HTML::p(array('class' => "error"), _("Illegal 'limit' argument: must be numeric")); } Modified: trunk/lib/plugin/OrphanedPages.php =================================================================== --- trunk/lib/plugin/OrphanedPages.php 2014-12-03 12:46:50 UTC (rev 9410) +++ trunk/lib/plugin/OrphanedPages.php 2014-12-03 14:57:35 UTC (rev 9411) @@ -62,7 +62,7 @@ { $args = $this->getArgs($argstr, $request); - if (isset($args['limit']) && !is_numeric($args['limit'])) { + if (isset($args['limit']) && !is_limit($args['limit'])) { return HTML::p(array('class' => "error"), _("Illegal 'limit' argument: must be numeric")); } Modified: trunk/lib/plugin/PageHistory.php =================================================================== --- trunk/lib/plugin/PageHistory.php 2014-12-03 12:46:50 UTC (rev 9410) +++ trunk/lib/plugin/PageHistory.php 2014-12-03 14:57:35 UTC (rev 9411) @@ -341,7 +341,7 @@ { $args = $this->getArgs($argstr, $request); - if (isset($args['limit']) && !is_numeric($args['limit'])) { + if (isset($args['limit']) && !is_limit($args['limit'])) { return HTML::div(array('class' => "error"), _("Illegal 'limit' argument: must be numeric")); } Modified: trunk/lib/plugin/PopularNearby.php =================================================================== --- trunk/lib/plugin/PopularNearby.php 2014-12-03 12:46:50 UTC (rev 9410) +++ trunk/lib/plugin/PopularNearby.php 2014-12-03 14:57:35 UTC (rev 9411) @@ -65,7 +65,7 @@ { $args = $this->getArgs($argstr, $request); - if (isset($args['limit']) && !is_numeric($args['limit'])) { + if (isset($args['limit']) && !is_limit($args['limit'])) { return HTML::div(array('class' => "error"), _("Illegal 'limit' argument: must be numeric")); } Modified: trunk/lib/plugin/TitleSearch.php =================================================================== --- trunk/lib/plugin/TitleSearch.php 2014-12-03 12:46:50 UTC (rev 9410) +++ trunk/lib/plugin/TitleSearch.php 2014-12-03 14:57:35 UTC (rev 9411) @@ -78,7 +78,7 @@ { $args = $this->getArgs($argstr, $request); - if (isset($args['limit']) && !is_numeric($args['limit'])) { + if (isset($args['limit']) && !is_limit($args['limit'])) { return HTML::p(array('class' => "error"), _("Illegal 'limit' argument: must be numeric")); } Modified: trunk/lib/plugin/WantedPages.php =================================================================== --- trunk/lib/plugin/WantedPages.php 2014-12-03 12:46:50 UTC (rev 9410) +++ trunk/lib/plugin/WantedPages.php 2014-12-03 14:57:35 UTC (rev 9411) @@ -69,7 +69,7 @@ { $args = $this->getArgs($argstr, $request); - if (isset($args['limit']) && !is_numeric($args['limit'])) { + if (isset($args['limit']) && !is_limit($args['limit'])) { return HTML::p(array('class' => "error"), _("Illegal 'limit' argument: must be numeric")); } Modified: trunk/lib/plugin/WantedPagesOld.php =================================================================== --- trunk/lib/plugin/WantedPagesOld.php 2014-12-03 12:46:50 UTC (rev 9410) +++ trunk/lib/plugin/WantedPagesOld.php 2014-12-03 14:57:35 UTC (rev 9411) @@ -61,7 +61,7 @@ { extract($this->getArgs($argstr, $request)); - if (isset($limit) && !is_numeric($limit)) { + if (isset($limit) && !is_limit($limit)) { return HTML::p(array('class' => "error"), _("Illegal 'limit' argument: must be numeric")); } Modified: trunk/lib/stdlib.php =================================================================== --- trunk/lib/stdlib.php 2014-12-03 12:46:50 UTC (rev 9410) +++ trunk/lib/stdlib.php 2014-12-03 14:57:35 UTC (rev 9411) @@ -1972,6 +1972,22 @@ } /** + * Determine if a variable represents a limit + * It can be an integer or two integers separated by "," + */ + +function is_limit($var) +{ + if (is_whole_number($var)) { + return true; + } + $limits = explode(',', $var); + return (count($limits) == 2) + && is_whole_number($limits[0]) + && is_whole_number($limits[1]); +} + +/** * Determine if a variable represents a whole number */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-12-04 13:18:19
|
Revision: 9414 http://sourceforge.net/p/phpwiki/code/9414 Author: vargenau Date: 2014-12-04 13:18:15 +0000 (Thu, 04 Dec 2014) Log Message: ----------- Add public/private Modified Paths: -------------- trunk/lib/PageList.php trunk/lib/plugin/WantedPagesOld.php trunk/lib/plugin/WikiAdminUtils.php Modified: trunk/lib/PageList.php =================================================================== --- trunk/lib/PageList.php 2014-12-03 16:15:36 UTC (rev 9413) +++ trunk/lib/PageList.php 2014-12-04 13:18:15 UTC (rev 9414) @@ -600,16 +600,18 @@ { public $_group_rows = 3; public $_columns = array(); - public $_columnsMap = array(); // Maps column name to column number. - public $_excluded_pages = array(); + private $_columnsMap = array(); // Maps column name to column number. + private $_excluded_pages = array(); public $_pages = array(); public $_caption = ""; - public $_pagename_seen = false; public $_types = array(); public $_options = array(); public $_selected = array(); public $_sortby = array(); public $_maxlen = 0; + private $_messageIfEmpty = ''; + private $_columns_seen = array(); + private $_stack; function __construct($columns = array(), $exclude = array(), $options = array()) { @@ -724,7 +726,7 @@ // 1: info, 2: exclude, 3: hash of options // Here we declare which options are supported, so that // the calling plugin may simply merge this with its own default arguments - static function supportedArgs() + public static function supportedArgs() { // Todo: add all supported Columns, like locked, minor, ... return array( // Currently supported options: @@ -777,21 +779,15 @@ ); } - function pagingArgs() + private function pagingArgs() { return array('sortby', 'limit', 'paging', 'count', 'dosort'); } - function clearArg($arg_name) - { - if (isset($this->_options[$arg_name])) - unset($this->_options[$arg_name]); - } - /** * @param mixed $caption string or HTML */ - function setCaption($caption) + public function setCaption($caption) { $this->_caption = $caption; } @@ -799,12 +795,12 @@ /** * @param mixed $caption string or HTML */ - function addCaption($caption) + public function addCaption($caption) { $this->_caption = HTML($this->_caption, " ", $caption); } - function getCaption() + private function getCaption() { // put the total into the caption if needed if (is_string($this->_caption) && strstr($this->_caption, '%d')) @@ -812,23 +808,18 @@ return $this->_caption; } - function setMessageIfEmpty($msg) + public function getTotal() { - $this->_messageIfEmpty = $msg; - } - - function getTotal() - { return !empty($this->_options['count']) ? (integer)$this->_options['count'] : count($this->_pages); } - function isEmpty() + public function isEmpty() { return empty($this->_pages); } - function addPage($page_handle) + public function addPage($page_handle) { $pagename = is_string($page_handle) ? $page_handle : $page_handle->getName(); if (in_array($pagename, $this->pageNames())) { @@ -842,7 +833,7 @@ } } - function pageNames() + public function pageNames() { $pages = array(); $limit = @$this->_options['limit']; @@ -858,7 +849,7 @@ return $pages; } - function _getPageFromHandle($page_handle) + private function _getPageFromHandle($page_handle) { /** * @var WikiRequest $request @@ -866,7 +857,8 @@ global $request; if (is_string($page_handle)) { - if (empty($page_handle)) return $page_handle; + if (empty($page_handle)) + return $page_handle; $page_handle = $request->_dbi->getPage($page_handle); } return $page_handle; @@ -876,7 +868,7 @@ * Take a PageList_Page object, and return an HTML object to display * it in a table or list row. */ - function _renderPageRow(&$page_handle, $i = 0) + private function _renderPageRow(&$page_handle, $i = 0) { $page_handle = $this->_getPageFromHandle($page_handle); //FIXME. only on sf.net @@ -920,7 +912,7 @@ } /* ignore from, but honor limit */ - function addPages($page_iter) + public function addPages($page_iter) { // TODO: if limit check max(strlen(pagename)) $limit = $page_iter->limit(); @@ -948,7 +940,7 @@ $this->_options['count'] = $i; } - function addPageList($list) + public function addPageList($list) { if (empty($list)) return; // Protect reset from a null arg if (isset($this->_options['limit'])) { // extract from,count from limit @@ -970,7 +962,7 @@ } } - function maxLen() + private function maxLen() { global $request; $dbi =& $request->getDbh(); @@ -990,7 +982,7 @@ /** * @return bool|WikiDB_Page */ - function first() + public function first() { if (count($this->_pages) > 0) { return $this->_pages[0]; @@ -998,7 +990,7 @@ return false; } - function getContent() + public function getContent() { // Note that the <caption> element wants inline content. $caption = $this->getCaption(); @@ -1036,7 +1028,7 @@ * Now all columns are sortable. (patch by Dan Frankowski) * Some columns have native DB backend methods, some not. */ - function sortby($column, $action, $valid_fields = false) + public function sortby($column, $action, $valid_fields = false) { global $request; @@ -1129,7 +1121,7 @@ * Limitation: Doesn't split into comma-sep and then expand wildcards. * "Test1*,Test2*" is expanded into TextSearch "Test1* Test2*" */ - static function explodePageList($input, $include_empty = false, $sortby = '', + public static function explodePageList($input, $include_empty = false, $sortby = '', $limit = '', $exclude = '') { /** @@ -1162,8 +1154,8 @@ } // TODO: optimize getTotal => store in count - static function allPagesByAuthor($wildcard, $include_empty = false, $sortby = '', - $limit = '', $exclude = '') + public static function allPagesByAuthor($wildcard, $include_empty = false, $sortby = '', + $limit = '', $exclude = '') { /** * @var WikiRequest $request @@ -1194,8 +1186,8 @@ return $allPages; } - static function allPagesByOwner($wildcard, $include_empty = false, $sortby = '', - $limit = '', $exclude = '') + public static function allPagesByOwner($wildcard, $include_empty = false, $sortby = '', + $limit = '', $exclude = '') { /** * @var WikiRequest $request @@ -1225,7 +1217,7 @@ return $allPages; } - static function allPagesByCreator($wildcard, $include_empty = false, $sortby = '', + public static function allPagesByCreator($wildcard, $include_empty = false, $sortby = '', $limit = '', $exclude = '') { /** @@ -1257,8 +1249,8 @@ } // UserPages are pages NOT owned by ADMIN_USER - static function allUserPages($include_empty = false, $sortby = '', - $limit = '', $exclude = '') + public static function allUserPages($include_empty = false, $sortby = '', + $limit = '', $exclude = '') { /** * @var WikiRequest $request @@ -1278,14 +1270,11 @@ return $allPages; } - //////////////////// - // private - //////////////////// /** Plugin and theme hooks: * If the pageList is initialized with $options['types'] these types are also initialized, * overriding the standard types. */ - function _initAvailableColumns() + private function _initAvailableColumns() { global $customPageListColumns; $standard_types = @@ -1362,7 +1351,7 @@ } } - function getOption($option) + public function getOption($option) { if (array_key_exists($option, $this->_options)) { return $this->_options[$option]; @@ -1387,7 +1376,7 @@ * @param string $column column name * @return bool true if column is added, false otherwise */ - function _addColumn($column) + public function _addColumn($column) { if (isset($this->_columns_seen[$column])) return false; // Already have this one. @@ -1428,7 +1417,7 @@ * * @param array|object $col An object derived from _PageList_Column. **/ - function addColumnObject($col) + public function addColumnObject($col) { if (is_array($col)) { // custom column object $params =& $col; @@ -1447,7 +1436,7 @@ /** * Compare _PageList_Page objects. **/ - function _pageCompare(&$a, &$b) + private function _pageCompare(&$a, &$b) { if (empty($this->_sortby) or count($this->_sortby) == 0) { // No columns to sort by @@ -1491,7 +1480,7 @@ * If the sortby cols are already sorted by the DB call, don't do usort. * TODO: optimize for multiple sortable cols */ - function _sortPages() + private function _sortPages() { if (count($this->_sortby) > 0) { $need_sort = $this->_options['dosort']; @@ -1507,7 +1496,7 @@ } } - function limit($limit) + public function limit($limit) { if (is_array($limit)) { list($from, $count) = $limit; @@ -1533,7 +1522,7 @@ } } - function pagingTokens($numrows = false, $ncolumns = false, $limit = false) + public function pagingTokens($numrows = false, $ncolumns = false, $limit = false) { /** * @var WikiRequest $request @@ -1597,7 +1586,7 @@ } // make a table given the caption - function _generateTable($caption) + public function _generateTable($caption = '') { if (count($this->_sortby) > 0) $this->_sortPages(); @@ -1661,7 +1650,7 @@ } /* recursive stack for private sublist options (azhead, cols) */ - function _saveOptions($opts) + private function _saveOptions($opts) { $stack = array('pages' => $this->_pages); foreach ($opts as $k => $v) { @@ -1673,7 +1662,7 @@ $this->_stack->push($stack); } - function _restoreOptions() + private function _restoreOptions() { assert($this->_stack); $stack = $this->_stack->pop(); @@ -1689,7 +1678,7 @@ // 'ordered' - OL or UL list (not yet inherited to all plugins) // 'comma' - condensed comma-list only, 1: no links, >1: with links // FIXME: only unique list entries, esp. with nopage - function _generateList($caption = '') + private function _generateList($caption = '') { if (empty($this->_pages)) { return false; // stop recursion @@ -1791,7 +1780,7 @@ if ($this->_options['comma'] == 1) $out->pushContent($this->_generateCommaListAsString()); else - $out->pushContent($this->_generateCommaList($this->_options['comma'])); + $out->pushContent($this->_generateCommaList()); return $out; } @@ -1841,7 +1830,7 @@ // Condense list without a href links: "Page1, Page2, ..." // Alternative $seperator = HTML::Raw(' · ') // FIXME: only unique list entries, esp. with nopage - function _generateCommaListAsString() + private function _generateCommaListAsString() { if (defined($this->_options['commasep'])) $seperator = $this->_options['commasep']; @@ -1860,10 +1849,10 @@ // Future: 1 = reserved for plain string (see above) // 2 and more => HTML link specialization? // FIXME: only unique list entries, esp. with nopage - function _generateCommaList($style = false) + private function _generateCommaList() { if (defined($this->_options['commasep'])) - $seperator = HTML::Raw($this->_options['commasep']); + $seperator = HTML::raw($this->_options['commasep']); else $seperator = ', '; $html = HTML(); @@ -1882,7 +1871,7 @@ if ($caption) { $html->pushContent(HTML::p($caption)); } - if ($this->_messageIfEmpty) + if (!empty($this->_messageIfEmpty)) $html->pushContent(HTML::blockquote(HTML::p($this->_messageIfEmpty))); return $html; } Modified: trunk/lib/plugin/WantedPagesOld.php =================================================================== --- trunk/lib/plugin/WantedPagesOld.php 2014-12-03 16:15:36 UTC (rev 9413) +++ trunk/lib/plugin/WantedPagesOld.php 2014-12-04 13:18:15 UTC (rev 9414) @@ -28,7 +28,7 @@ { public $pagelist; public $_rows; - public $_messageIfEmpty; + private $_messageIfEmpty; public $_columns; function getDescription() Modified: trunk/lib/plugin/WikiAdminUtils.php =================================================================== --- trunk/lib/plugin/WikiAdminUtils.php 2014-12-03 16:15:36 UTC (rev 9413) +++ trunk/lib/plugin/WikiAdminUtils.php 2014-12-04 13:18:15 UTC (rev 9414) @@ -286,7 +286,7 @@ } $request->_user = $current_user; if (!empty($args['verify']) or empty($pagelist->_rows)) { - return HTML($pagelist->_generateTable(false)); + return HTML($pagelist->_generateTable()); } elseif (!empty($pagelist->_rows)) { $args['verify'] = 1; $args['return_url'] = $request->getURLtoSelf(); @@ -296,7 +296,7 @@ HiddenInputs(array('require_authority_for_post' => WIKIAUTH_ADMIN)), HiddenInputs($request->getArgs()), - $pagelist->_generateTable(false), + $pagelist->_generateTable(), HTML::p(Button('submit:', _("Change Verification Status"), 'wikiadmin'), HTML::raw(' '), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-12-04 15:42:53
|
Revision: 9416 http://sourceforge.net/p/phpwiki/code/9416 Author: vargenau Date: 2014-12-04 15:42:49 +0000 (Thu, 04 Dec 2014) Log Message: ----------- Add public Modified Paths: -------------- trunk/lib/WikiDB/ADODB.php trunk/lib/WikiDB/PDO.php trunk/lib/WikiDB/SQL.php trunk/lib/WikiDB.php trunk/lib/plugin/UnfoldSubpages.php Modified: trunk/lib/WikiDB/ADODB.php =================================================================== --- trunk/lib/WikiDB/ADODB.php 2014-12-04 13:41:43 UTC (rev 9415) +++ trunk/lib/WikiDB/ADODB.php 2014-12-04 15:42:49 UTC (rev 9416) @@ -55,7 +55,7 @@ } // add surrounding quotes '' if string - function quote($in) + public function quote($in) { if (is_int($in) || is_double($in)) { return $in; @@ -75,7 +75,7 @@ return $this->_backend->_dbh->addq($in); } - function isOpen() + public function isOpen() { /** * @var WikiRequest $request @@ -90,7 +90,7 @@ // SQL result: for simple select or create/update queries // returns the database specific resource type - function genericSqlQuery($sql, $args = false) + public function genericSqlQuery($sql, $args = false) { if ($args) $result = $this->_backend->_dbh->Execute($sql, $args); @@ -106,7 +106,7 @@ // SQL iter: for simple select or create/update queries // returns the generic iterator object (count,next) - function genericSqlIter($sql, $field_list = NULL) + public function genericSqlIter($sql, $field_list = NULL) { $result = $this->genericSqlQuery($sql); return new WikiDB_backend_ADODB_generic_iter($this->_backend, $result, $field_list); Modified: trunk/lib/WikiDB/PDO.php =================================================================== --- trunk/lib/WikiDB/PDO.php 2014-12-04 13:41:43 UTC (rev 9415) +++ trunk/lib/WikiDB/PDO.php 2014-12-04 15:42:49 UTC (rev 9416) @@ -54,7 +54,7 @@ // With PDO we should really use native quoting using prepared statements with ? // Add surrounding quotes '' if string - function quote($in) + public function quote($in) { if (is_int($in) || is_double($in)) { return $in; @@ -75,7 +75,7 @@ return str_replace("'", "\'", $in); } - function isOpen() + public function isOpen() { /** * @var WikiRequest $request @@ -90,7 +90,7 @@ // SQL result: for simple select or create/update queries // returns the database specific resource type - function genericSqlQuery($sql, $args = array()) + public function genericSqlQuery($sql, $args = array()) { try { $sth = $this->_backend->_dbh->prepare($sql); @@ -112,7 +112,7 @@ // SQL iter: for simple select or create/update queries // returns the generic iterator object (count, next) - function genericSqlIter($sql, $field_list = NULL) + public function genericSqlIter($sql, $field_list = NULL) { $result = $this->genericSqlQuery($sql); return new WikiDB_backend_PDO_generic_iter($this->_backend, $result, $field_list); Modified: trunk/lib/WikiDB/SQL.php =================================================================== --- trunk/lib/WikiDB/SQL.php 2014-12-04 13:41:43 UTC (rev 9415) +++ trunk/lib/WikiDB/SQL.php 2014-12-04 15:42:49 UTC (rev 9416) @@ -54,7 +54,7 @@ } // adds surrounding quotes - function quote($s) + public function quote($s) { return $this->_backend->_dbh->quoteSmart($s); } @@ -65,7 +65,7 @@ return $this->_backend->_dbh->escapeSimple($s); } - function isOpen() + public function isOpen() { /** * @var WikiRequest $request @@ -80,7 +80,7 @@ // SQL result: for simple select or create/update queries // returns the database specific resource type - function genericSqlQuery($sql, $args = false) + public function genericSqlQuery($sql, $args = false) { if ($args) $result = $this->_backend->_dbh->query($sql, $args); @@ -97,7 +97,7 @@ // SQL iter: for simple select or create/update queries // returns the generic iterator object (count,next) - function genericSqlIter($sql, $field_list = NULL) + public function genericSqlIter($sql, $field_list = NULL) { $result = $this->genericSqlQuery($sql); return new WikiDB_backend_PearDB_generic_iter($this->_backend, $result); Modified: trunk/lib/WikiDB.php =================================================================== --- trunk/lib/WikiDB.php 2014-12-04 13:41:43 UTC (rev 9415) +++ trunk/lib/WikiDB.php 2014-12-04 15:42:49 UTC (rev 9416) @@ -596,7 +596,7 @@ * int to get a timestamp, or you can use the string value * as a good hash for the entire database. */ - function getTimestamp() + public function getTimestamp() { $ts = $this->get('_timestamp'); return sprintf("%d %d", $ts[0], $ts[1]); @@ -605,7 +605,7 @@ /** * Update the database timestamp. */ - function touch() + public function touch() { $ts = $this->get('_timestamp'); $this->set('_timestamp', array(time(), $ts[1] + 1)); @@ -614,12 +614,12 @@ /** * Roughly similar to the float in phpwiki_version(). Set by action=upgrade. */ - function get_db_version() + public function get_db_version() { return (float)$this->get('_db_version'); } - function set_db_version($ver) + public function set_db_version($ver) { $this->set('_db_version', (float)$ver); } @@ -693,7 +693,7 @@ // SQL result: for simple select or create/update queries // returns the database specific resource type - function genericSqlQuery($sql, $args = false) + public function genericSqlQuery($sql, $args = false) { echo "<pre>"; printSimpleTrace(debug_backtrace()); @@ -704,7 +704,7 @@ // SQL iter: for simple select or create/update queries // returns the generic iterator object (count,next) - function genericSqlIter($sql, $field_list = NULL) + public function genericSqlIter($sql, $field_list = NULL) { echo "<pre>"; printSimpleTrace(debug_backtrace()); @@ -715,18 +715,18 @@ // see backend upstream methods // ADODB adds surrounding quotes, SQL not yet! - function quote($s) + public function quote($s) { return $s; } - function isOpen() + public function isOpen() { return false; /* so far only needed for sql so false it. later we have to check dba also */ } - function getParam($param) + public function getParam($param) { global $DBParams; if (isset($DBParams[$param])) @@ -737,7 +737,7 @@ return false; } - function getAuthParam($param) + public function getAuthParam($param) { global $DBAuthParams; if (isset($DBAuthParams[$param])) @@ -797,7 +797,7 @@ // To reduce the memory footprint for larger sets of pagelists, // we don't cache the content (only true or false) and // we purge the pagedata (_cached_html) also - function exists() + public function exists() { if (isset($this->_wikidb->_cache->_id_cache[$this->_pagename])) return true; $current = $this->getCurrentRevision(false); @@ -868,7 +868,7 @@ * <li>It has the same author as the immediately preceding revision. * </ul> */ - function mergeRevision($version) + public function mergeRevision($version) { if ($this->_wikidb->readonly) { trigger_error("readonly database", E_USER_WARNING); @@ -1022,7 +1022,7 @@ * * @return mixed */ - function save($wikitext, $version, $meta, $formatted = null) + public function save($wikitext, $version, $meta, $formatted = null) { /** * @var WikiRequest $request @@ -1192,7 +1192,7 @@ * WikiDB_PageRevisionIterator containing all revisions of this * WikiDB_Page in reverse order by version number. */ - function getAllRevisions() + public function getAllRevisions() { $backend = &$this->_wikidb->_backend; $revs = $backend->get_all_revisions($this->_pagename); @@ -1233,7 +1233,7 @@ /** * All Links from other pages to this page. */ - function getBackLinks($include_empty = false, $sortby = '', $limit = '', $exclude = '') + public function getBackLinks($include_empty = false, $sortby = '', $limit = '', $exclude = '') { return $this->getLinks(true, $include_empty, $sortby, $limit, $exclude); } @@ -1241,7 +1241,7 @@ /** * Forward Links: All Links from this page to other pages. */ - function getPageLinks($include_empty = false, $sortby = '', $limit = '', $exclude = '') + public function getPageLinks($include_empty = false, $sortby = '', $limit = '', $exclude = '') { return $this->getLinks(false, $include_empty, $sortby, $limit, $exclude); } @@ -1250,7 +1250,7 @@ * Relations: All links from this page to other pages with relation <> 0. * is_a:=page or population:=number */ - function getRelations($sortby = '', $limit = '', $exclude = '') + public function getRelations($sortby = '', $limit = '', $exclude = '') { $backend = &$this->_wikidb->_backend; $result = $backend->get_links($this->_pagename, false, true, @@ -1268,7 +1268,7 @@ /** * possibly faster link existance check. not yet accelerated. */ - function existLink($link, $reversed = false) + public function existLink($link, $reversed = false) { $backend = &$this->_wikidb->_backend; if (method_exists($backend, 'exists_link')) @@ -1341,7 +1341,7 @@ * * @return array The page meta-data (hash). */ - function getMetaData() + public function getMetaData() { $cache = &$this->_wikidb->_cache; $data = $cache->get_pagedata($this->_pagename); @@ -1464,14 +1464,14 @@ return $version; } - function isUserPage($include_empty = true) + public function isUserPage($include_empty = true) { if (!$include_empty and !$this->exists()) return false; return $this->get('pref') ? true : false; } // May be empty. Either the stored owner (/Chown), or the first authorized author - function getOwner() + public function getOwner() { if ($owner = $this->get('owner')) return $owner; @@ -1489,7 +1489,7 @@ } // The authenticated author of the first revision or empty if not authenticated then. - function getCreator() + public function getCreator() { if ($current = $this->getRevision(1, false)) return $current->get('author_id'); @@ -1498,7 +1498,7 @@ } // The authenticated author of the current revision. - function getAuthor() + public function getAuthor() { if ($current = $this->getCurrentRevision(false)) return $current->get('author_id'); @@ -1519,7 +1519,7 @@ $this->set('attributes', $attr); } - function getAttribute($relation) + public function getAttribute($relation) { $meta = $this->get('attributes'); if (empty($meta)) @@ -1643,7 +1643,7 @@ * @return object An XmlContent-like object containing the page transformed * contents. */ - function getTransformedContent($pagetype_override = false) + public function getTransformedContent($pagetype_override = false) { if ($pagetype_override) { // Figure out the normal page-type for this page. @@ -1762,7 +1762,7 @@ return $data['%content']; } - function _get_content() + public function _get_content() { $cache = &$this->_wikidb->_cache; $pagename = $this->_pagename; @@ -1833,7 +1833,7 @@ * * @return array The revision meta-data. */ - function getMetaData() + public function getMetaData() { $meta = array(); foreach ($this->_data as $key => $val) { @@ -1882,12 +1882,12 @@ $this->_options = $options; } - function count() + public function count() { return $this->_iter->count(); } - function limit() + public function limit() { return empty($this->_options['limit']) ? 0 : $this->_options['limit']; } @@ -1950,12 +1950,12 @@ // $this->_iter->free(); } - function reset() + public function reset() { $this->_iter->reset(); } - function asArray() + public function asArray() { $result = array(); while ($page = $this->next()) @@ -1963,58 +1963,6 @@ $this->reset(); return $result; } - - /** - * Apply filters for options like 'sortby', 'limit', 'exclude' - * for simple queries like titleSearch, where the backend is not ready yet. - * Since iteration is usually destructive for SQL results, - * we have to generate a copy. - */ - function applyFilters($options = false) - { - if (!$options) $options = $this->_options; - if (isset($options['sortby'])) { - $array = array(); - /* this is destructive */ - while ($page = $this->next()) - $result[] = $page->getName(); - $this->_doSort($array, $options['sortby']); - } - /* the rest is not destructive. - * reconstruct a new iterator - */ - $pagenames = array(); - $i = 0; - if (isset($options['limit'])) - $limit = $options['limit']; - else - $limit = 0; - if (isset($options['exclude'])) - $exclude = $options['exclude']; - if (is_string($exclude) and !is_array($exclude)) - $exclude = PageList::explodePageList($exclude, false, false, $limit); - foreach ($array as $pagename) { - if ($limit and $i++ > $limit) - return new WikiDB_Array_PageIterator($pagenames); - if (!empty($exclude) and !in_array($pagename, $exclude)) - $pagenames[] = $pagename; - elseif (empty($exclude)) - $pagenames[] = $pagename; - } - return new WikiDB_Array_PageIterator($pagenames); - } - - /* pagename only */ - function _doSort(&$array, $sortby) - { - $sortby = PageList::sortby($sortby, 'init'); - if ($sortby == '+pagename') - sort($array, SORT_STRING); - elseif ($sortby == '-pagename') - rsort($array, SORT_STRING); - reset($array); - } - } /** @@ -2034,7 +1982,7 @@ $this->_options = $options; } - function count() + public function count() { return $this->_revisions->count(); } @@ -2092,7 +2040,7 @@ $this->_revisions->free(); } - function asArray() + public function asArray() { $result = array(); while ($rev = $this->next()) @@ -2121,28 +2069,28 @@ reset($this->_pages); } - function next() + public function next() { $c = current($this->_pages); next($this->_pages); return $c !== false ? $this->_dbi->getPage($c) : false; } - function count() + public function count() { return count($this->_pages); } - function reset() + public function reset() { reset($this->_pages); } - function free() + public function free() { } - function asArray() + public function asArray() { reset($this->_pages); return $this->_pages; @@ -2167,28 +2115,28 @@ reset($this->_array); } - function next() + public function next() { $c = current($this->_array); next($this->_array); return $c !== false ? $c : false; } - function count() + public function count() { return count($this->_array); } - function reset() + public function reset() { reset($this->_array); } - function free() + public function free() { } - function asArray() + public function asArray() { if (!empty($this->_array)) reset($this->_array); @@ -2232,7 +2180,7 @@ $this->readonly = $request->_dbi->readonly; } - function close() + public function close() { $this->_pagedata_cache = array(); $this->_versiondata_cache = array(); @@ -2240,7 +2188,7 @@ $this->_id_cache = array(); } - function get_pagedata($pagename) + public function get_pagedata($pagename) { assert(is_string($pagename) && $pagename != ''); if (USECACHE) { @@ -2256,7 +2204,7 @@ } } - function update_pagedata($pagename, $newdata) + public function update_pagedata($pagename, $newdata) { assert(is_string($pagename) && $pagename != ''); if (!empty($this->readonly)) { @@ -2278,7 +2226,7 @@ } } - function invalidate_cache($pagename) + public function invalidate_cache($pagename) { unset ($this->_pagedata_cache[$pagename]); unset ($this->_versiondata_cache[$pagename]); @@ -2287,7 +2235,7 @@ //unset ($this->_backend->_page_data); } - function delete_page($pagename) + public function delete_page($pagename) { if (!empty($this->readonly)) { trigger_error("readonly database", E_USER_WARNING); @@ -2298,7 +2246,7 @@ return $result; } - function purge_page($pagename) + public function purge_page($pagename) { if (!empty($this->readonly)) { trigger_error("readonly database", E_USER_WARNING); @@ -2310,14 +2258,14 @@ } // FIXME: ugly and wrong. may overwrite full cache with partial cache - function cache_data($data) + public function cache_data($data) { ; //if (isset($data['pagedata'])) // $this->_pagedata_cache[$data['pagename']] = $data['pagedata']; } - function get_versiondata($pagename, $version, $need_content = false) + public function get_versiondata($pagename, $version, $need_content = false) { // FIXME: Seriously ugly hackage $readdata = false; @@ -2355,7 +2303,7 @@ return $vdata; } - function set_versiondata($pagename, $version, $data) + public function set_versiondata($pagename, $version, $data) { //unset($this->_versiondata_cache[$pagename][$version]); @@ -2386,7 +2334,7 @@ unset($this->_glv_cache[$pagename]); } - function delete_versiondata($pagename, $version) + public function delete_versiondata($pagename, $version) { if (!empty($this->readonly)) { trigger_error("readonly database", E_USER_WARNING); @@ -2400,7 +2348,7 @@ unset ($this->_glv_cache[$pagename]); } - function get_latest_version($pagename) + public function get_latest_version($pagename) { if (USECACHE) { assert(is_string($pagename) && $pagename != ''); @@ -2417,27 +2365,6 @@ } } -function _sql_debuglog($msg, $newline = true, $shutdown = false) -{ - static $fp = false; - static $i = 0; - if (!$fp) { - $stamp = strftime("%y%m%d-%H%M%S"); - $fp = fopen(TEMP_DIR . "/sql-$stamp.log", "a"); - register_shutdown_function("_sql_debuglog_shutdown_function"); - } elseif ($shutdown) { - fclose($fp); - return; - } - if ($newline) fputs($fp, "[$i++] $msg"); - else fwrite($fp, $msg); -} - -function _sql_debuglog_shutdown_function() -{ - _sql_debuglog('', false, true); -} - // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/UnfoldSubpages.php =================================================================== --- trunk/lib/plugin/UnfoldSubpages.php 2014-12-04 13:41:43 UTC (rev 9415) +++ trunk/lib/plugin/UnfoldSubpages.php 2014-12-04 15:42:49 UTC (rev 9416) @@ -84,10 +84,6 @@ extract($args); $query = new TextSearchQuery($pagename . '/' . '*', true, 'glob'); $subpages = $dbi->titleSearch($query, $sortby, $limit, $exclude); - //if ($sortby) - // $subpages = $subpages->applyFilters(array('sortby' => $sortby, 'limit' => $limit, 'exclude' => $exclude)); - //$subpages = explodePageList($pagename . SUBPAGE_SEPARATOR . '*', false, - // $sortby, $limit, $exclude); if (is_string($exclude) and !is_array($exclude)) $exclude = PageList::explodePageList($exclude, false, false, $limit); $content = HTML(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-12-08 17:17:05
|
Revision: 9433 http://sourceforge.net/p/phpwiki/code/9433 Author: vargenau Date: 2014-12-08 17:16:56 +0000 (Mon, 08 Dec 2014) Log Message: ----------- Remove unused Modified Paths: -------------- trunk/lib/loadsave.php trunk/lib/plugin/WikiBlog.php Modified: trunk/lib/loadsave.php =================================================================== --- trunk/lib/loadsave.php 2014-12-08 17:14:15 UTC (rev 9432) +++ trunk/lib/loadsave.php 2014-12-08 17:16:56 UTC (rev 9433) @@ -724,7 +724,6 @@ } $page_iter->free(); - $attrib = false; //array('is_ascii' => 0); if (!empty($WikiTheme->dumped_images) and is_array($WikiTheme->dumped_images)) { // @mkdir("$directory/images"); foreach ($WikiTheme->dumped_images as $img_file) { @@ -866,7 +865,7 @@ // //////////////////////////////////////////////////////////////// -function SavePage(&$request, &$pageinfo, $source, $filename) +function SavePage(&$request, &$pageinfo, $source) { static $overwite_all = false; $pagedata = $pageinfo['pagedata']; // Page level meta-data. @@ -912,10 +911,8 @@ $edit = $request->getArg('edit'); if ($merging) { if (isset($edit['keep_old'])) { - $merging = false; $skip = true; } elseif (isset($edit['overwrite'])) { - $merging = false; $overwrite = true; } elseif ($current and (!$current->hasDefaultContents()) && ($current->getPackedContent() != $content) @@ -949,7 +946,6 @@ $versiondata['author'] = ADMIN_USER; $versiondata['author_id'] = ADMIN_USER; $mesg->pushContent(' - ', _("New page")); - $isnew = true; } else { if ((!$current->hasDefaultContents()) && ($current->getPackedContent() != $content) @@ -978,7 +974,6 @@ $current->getVersion())); $skip = true; } - $isnew = false; } if (!$skip) { @@ -1001,7 +996,6 @@ $f = str_replace(sprintf(_("plain file %s"), ''), '', $f); //check if uploaded file? they pass just the content, but the file is gone if (@stat($f)) { - global $WikiTheme; $meb = Button(array('action' => 'loadfile', 'merge' => true, 'source' => $f), @@ -1222,7 +1216,7 @@ * because the sql passwords are in plaintext there. And the webserver must be able to read it. * Detected by Santtu Jarvi. */ -function LoadFile(&$request, $filename, $text = false, $mtime = false) +function LoadFile(&$request, $filename, $text = false) { if (preg_match("/config$/", dirname($filename)) // our or other config and preg_match("/config.*\.ini/", basename($filename)) @@ -1233,8 +1227,6 @@ } if (!is_string($text)) { // Read the file. - $stat = stat($filename); - $mtime = $stat[9]; $text = implode("", file($filename)); } @@ -1244,9 +1236,6 @@ // FIXME: basename("filewithnoslashes") seems to return garbage sometimes. $basename = basename("/dummy/" . $filename); - if (!$mtime) - $mtime = time(); // Last resort. - $default_pagename = rawurldecode($basename); if (($parts = ParseMimeifiedPages($text))) { if (count($parts) > 1) @@ -1256,8 +1245,7 @@ // force overwrite if (count($parts) > 1) $request->setArg('overwrite', 1); - SavePage($request, $pageinfo, sprintf(_("MIME file %s"), - $filename), $basename); + SavePage($request, $pageinfo, sprintf(_("MIME file %s"), $filename)); } if (count($parts) > 1) if ($overwrite) @@ -1267,8 +1255,7 @@ } elseif (($pageinfo = ParseSerializedPage($text, $default_pagename, $request->getUser())) ) { - SavePage($request, $pageinfo, sprintf(_("Serialized file %s"), - $filename), $basename); + SavePage($request, $pageinfo, sprintf(_("Serialized file %s"), $filename)); } else { // plain old file $user = $request->getUser(); @@ -1281,8 +1268,7 @@ 'content' => preg_replace('/[ \t\r]*\n/', "\n", chop($text)) ); - SavePage($request, $pageinfo, sprintf(_("plain file %s"), $filename), - $basename); + SavePage($request, $pageinfo, sprintf(_("plain file %s"))); } } @@ -1303,7 +1289,7 @@ continue; } longer_timeout($timeout); // longer timeout per page - LoadFile($request, $fn, $data, $attrib['mtime']); + LoadFile($request, $fn, $data); } } @@ -1446,7 +1432,7 @@ */ function SetupWiki(&$request) { - global $GenericPages, $LANG; + global $GenericPages; //FIXME: This is a hack (err, "interim solution") // This is a bogo-bogo-login: Login without @@ -1456,7 +1442,6 @@ // // This really needs to be cleaned up... // (I'm working on it.) - $real_user = $request->_user; $request->_user = new _BogoUser(ADMIN_USER); StartLoadDump($request, _("Loading up virgin wiki")); Modified: trunk/lib/plugin/WikiBlog.php =================================================================== --- trunk/lib/plugin/WikiBlog.php 2014-12-08 17:14:15 UTC (rev 9432) +++ trunk/lib/plugin/WikiBlog.php 2014-12-08 17:16:56 UTC (rev 9433) @@ -229,7 +229,7 @@ 'pagedata' => array(), 'versiondata' => array('author' => $blog_meta['creator'], 'is_minor_edit' => 1), ); - SavePage($request, $pageinfo, '', ''); + SavePage($request, $pageinfo, ''); } $redirected = $prefix . $pagename . '/' . preg_replace("/T.*/", "", "$time"); if (!$dbi->isWikiPage($redirected)) { @@ -240,7 +240,7 @@ 'pagedata' => array(), 'versiondata' => array('author' => $blog_meta['creator'], 'is_minor_edit' => 1), ); - SavePage($request, $pageinfo, '', ''); + SavePage($request, $pageinfo, ''); } $p = $dbi->getPage($prefix . $pagename . '/' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-12-10 17:54:52
|
Revision: 9441 http://sourceforge.net/p/phpwiki/code/9441 Author: vargenau Date: 2014-12-10 17:54:49 +0000 (Wed, 10 Dec 2014) Log Message: ----------- No space at end of line Modified Paths: -------------- trunk/lib/WikiTheme.php trunk/lib/main.php trunk/lib/plugin/IncludePage.php trunk/lib/plugin/Template.php trunk/lib/plugin/WikiAdminSearchReplace.php trunk/lib/stdlib.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2014-12-09 17:24:27 UTC (rev 9440) +++ trunk/lib/WikiTheme.php 2014-12-10 17:54:49 UTC (rev 9441) @@ -201,7 +201,7 @@ * @var WikiRequest $request */ global $request; - + $this->_name = $theme_name; $this->_themes_dir = NormalizeLocalFileName("themes"); $this->_path = defined('PHPWIKI_DIR') ? NormalizeLocalFileName("") : ""; Modified: trunk/lib/main.php =================================================================== --- trunk/lib/main.php 2014-12-09 17:24:27 UTC (rev 9440) +++ trunk/lib/main.php 2014-12-10 17:54:49 UTC (rev 9441) @@ -381,7 +381,7 @@ if (!empty($HTTP_GET_VARS['start_debug'])) // zend ide support return WikiURL($pagename, array('action' => $action, 'start_debug' => 1)); elseif ($action == 'edit') - return WikiURL($pagename); + return WikiURL($pagename); else return WikiURL($pagename, array('action' => $action)); } Modified: trunk/lib/plugin/IncludePage.php =================================================================== --- trunk/lib/plugin/IncludePage.php 2014-12-09 17:24:27 UTC (rev 9440) +++ trunk/lib/plugin/IncludePage.php 2014-12-10 17:54:49 UTC (rev 9441) @@ -68,7 +68,7 @@ $this->run($request->_dbi, $argstr, $request, $basepage); } - $backlinks[] = array('linkto' => $page->name); + $backlinks[] = array('linkto' => $page->name); return $backlinks; } Modified: trunk/lib/plugin/Template.php =================================================================== --- trunk/lib/plugin/Template.php 2014-12-09 17:24:27 UTC (rev 9440) +++ trunk/lib/plugin/Template.php 2014-12-10 17:54:49 UTC (rev 9441) @@ -100,7 +100,7 @@ $this->run($request->_dbi, $argstr, $request, $basepage); } - $backlinks[] = array('linkto' => $page->name); + $backlinks[] = array('linkto' => $page->name); return $backlinks; } Modified: trunk/lib/plugin/WikiAdminSearchReplace.php =================================================================== --- trunk/lib/plugin/WikiAdminSearchReplace.php 2014-12-09 17:24:27 UTC (rev 9440) +++ trunk/lib/plugin/WikiAdminSearchReplace.php 2014-12-10 17:54:49 UTC (rev 9441) @@ -116,7 +116,7 @@ } else { $columns = array_merge($args, // with highlighted search for SearchReplace - array('types' => array('hi_content' + array('types' => array('hi_content' => new _PageList_Column_content('rev:hi_content', _("Content"))))); } Modified: trunk/lib/stdlib.php =================================================================== --- trunk/lib/stdlib.php 2014-12-09 17:24:27 UTC (rev 9440) +++ trunk/lib/stdlib.php 2014-12-10 17:54:49 UTC (rev 9441) @@ -895,7 +895,7 @@ if (is_a($page, 'WikiDB_Page')) return $page->getName(); elseif (is_a($page, 'WikiDB_PageRevision')) - return $page->getPageName(); + return $page->getPageName(); elseif (is_a($page, 'WikiPageName')) return $page->name; return $page; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-12-11 18:01:07
|
Revision: 9442 http://sourceforge.net/p/phpwiki/code/9442 Author: vargenau Date: 2014-12-11 18:00:59 +0000 (Thu, 11 Dec 2014) Log Message: ----------- Add public/protected/private Modified Paths: -------------- trunk/lib/diff.php trunk/lib/diff3.php trunk/lib/difflib.php Modified: trunk/lib/diff.php =================================================================== --- trunk/lib/diff.php 2014-12-10 17:54:49 UTC (rev 9441) +++ trunk/lib/diff.php 2014-12-11 18:00:59 UTC (rev 9442) @@ -20,7 +20,7 @@ $this->_tag = '~begin'; } - function _flushGroup($new_tag) + private function _flushGroup($new_tag) { if ($this->_group !== false) { if (!$this->_line) @@ -34,7 +34,7 @@ $this->_tag = $new_tag; } - function _flushLine($new_tag) + private function _flushLine($new_tag) { $this->_flushGroup($new_tag); if ($this->_line) @@ -42,7 +42,7 @@ $this->_line = HTML(); } - function addWords($words, $tag = '') + public function addWords($words, $tag = '') { if ($tag != $this->_tag) $this->_flushGroup($tag); @@ -61,7 +61,7 @@ } } - function getLines() + public function getLines() { $this->_flushLine('~done'); return $this->_lines; @@ -79,7 +79,7 @@ $orig_stripped, $final_stripped); } - function _split($lines) + private function _split($lines) { // FIXME: fix POSIX char class. if (!preg_match_all('/ ( [^\S\n]+ | [[:alnum:]]+ | . ) (?: (?!< \n) [^\S\n])? /xs', @@ -91,7 +91,7 @@ return array($m[0], $m[1]); } - function orig() + public function orig() { $orig = new _HWLDF_WordAccumulator; @@ -104,7 +104,7 @@ return $orig->getLines(); } - function _final() + public function _final() { $final = new _HWLDF_WordAccumulator; @@ -143,31 +143,31 @@ parent::__construct($context_lines); } - function _start_diff() + protected function _start_diff() { $this->_top = HTML::div(array('class' => 'diff')); } - function _end_diff() + protected function _end_diff() { $val = $this->_top; unset($this->_top); return $val; } - function _start_block($header) + protected function _start_block($header) { $this->_block = HTML::div(array('class' => 'block'), HTML::samp($header)); } - function _end_block() + protected function _end_block() { $this->_top->pushContent($this->_block); unset($this->_block); } - function _lines($lines, $class, $prefix = false, $elem = false) + protected function _lines($lines, $class, $prefix = false, $elem = false) { if (!$prefix) $prefix = HTML::raw(' '); @@ -183,22 +183,22 @@ $this->_block->pushContent($div); } - function _context($lines) + protected function _context($lines) { $this->_lines($lines, 'context'); } - function _deleted($lines) + protected function _deleted($lines) { $this->_lines($lines, 'deleted', '-', 'del'); } - function _added($lines) + protected function _added($lines) { $this->_lines($lines, 'added', '+', 'ins'); } - function _changed($orig, $final) + protected function _changed($orig, $final) { $diff = new WordLevelDiff($orig, $final); $this->_lines($diff->orig(), 'original', '-'); Modified: trunk/lib/diff3.php =================================================================== --- trunk/lib/diff3.php 2014-12-10 17:54:49 UTC (rev 9441) +++ trunk/lib/diff3.php 2014-12-11 18:00:59 UTC (rev 9442) @@ -21,7 +21,7 @@ $this->final2 = $final2 ? $final2 : array(); } - function merged() + protected function merged() { if (!isset($this->_merged)) { if ($this->final1 === $this->final2) @@ -34,7 +34,7 @@ return $this->_merged; } - function is_conflict() + protected function is_conflict() { return $this->merged() === false; } @@ -51,12 +51,12 @@ $this->final2 = &$this->orig; } - function merged() + protected function merged() { return $this->orig; } - function is_conflict() + protected function is_conflict() { return false; } @@ -73,40 +73,42 @@ $this->_init(); } - function _init() + private function _init() { - $this->orig = $this->final1 = $this->final2 = array(); + $this->orig = array(); + $this->final1 = array(); + $this->final2 = array(); } - function _append(&$array, $lines) + private function _append(&$array, $lines) { array_splice($array, sizeof($array), 0, $lines); } - function input($lines) + public function input($lines) { if ($lines) $this->_append($this->orig, $lines); } - function out1($lines) + public function out1($lines) { if ($lines) $this->_append($this->final1, $lines); } - function out2($lines) + public function out2($lines) { if ($lines) $this->_append($this->final2, $lines); } - function is_empty() + private function is_empty() { return !$this->orig && !$this->final1 && !$this->final2; } - function finish() + public function finish() { if ($this->is_empty()) return false; @@ -128,7 +130,7 @@ $eng->diff($orig, $final2)); } - function __diff3($edits1, $edits2) + private function __diff3($edits1, $edits2) { $blocks = array(); $bb = new _Diff3_BlockBuilder; @@ -136,11 +138,6 @@ $e1 = current($edits1); $e2 = current($edits2); while ($e1 || $e2) { -// echo "====\n"; -// print_r($e1); -// print_r($e2); -// echo "====\n"; - if ($e1 && $e2 && $e1->type == 'copy' && $e2->type == 'copy') { // We have copy blocks from both diffs. This is the (only) // time we want to emit a diff3 copy block. @@ -195,7 +192,7 @@ return $blocks; } - function merged_output($label1 = false, $label2 = false) + public function merged_output($label1 = false, $label2 = false) { $lines = array(); foreach ($this->blocks as $block) { Modified: trunk/lib/difflib.php =================================================================== --- trunk/lib/difflib.php 2014-12-10 17:54:49 UTC (rev 9441) +++ trunk/lib/difflib.php 2014-12-11 18:00:59 UTC (rev 9442) @@ -14,14 +14,14 @@ public $orig; public $final; - abstract function reverse(); + abstract public function reverse(); - function norig() + public function norig() { return $this->orig ? sizeof($this->orig) : 0; } - function nfinal() + public function nfinal() { return $this->final ? sizeof($this->final) : 0; } @@ -39,7 +39,7 @@ $this->final = $final; } - function reverse() + public function reverse() { return new _DiffOp_Copy($this->final, $this->orig); } @@ -55,7 +55,7 @@ $this->final = false; } - function reverse() + public function reverse() { return new _DiffOp_Add($this->orig); } @@ -71,7 +71,7 @@ $this->orig = false; } - function reverse() + public function reverse() { return new _DiffOp_Delete($this->final); } @@ -87,7 +87,7 @@ $this->final = $final; } - function reverse() + public function reverse() { return new _DiffOp_Change($this->final, $this->orig); } @@ -125,7 +125,7 @@ public $seq; public $in_seq; - function diff($from_lines, $to_lines) + public function diff($from_lines, $to_lines) { $n_from = sizeof($from_lines); $n_to = sizeof($to_lines); @@ -229,7 +229,7 @@ * match. The caller must trim matching lines from the beginning and end * of the portions it is going to specify. */ - function _diag($xoff, $xlim, $yoff, $ylim, $nchunks) + private function _diag($xoff, $xlim, $yoff, $ylim, $nchunks) { $flip = false; @@ -303,7 +303,7 @@ return array($this->lcs, $seps); } - function _lcs_pos($ypos) + private function _lcs_pos($ypos) { $end = $this->lcs; if ($end == 0 || $ypos > $this->seq[$end]) { @@ -340,7 +340,7 @@ * Note that XLIM, YLIM are exclusive bounds. * All line numbers are origin-0 and discarded lines are not counted. */ - function _compareseq($xoff, $xlim, $yoff, $ylim) + private function _compareseq($xoff, $xlim, $yoff, $ylim) { // Slide down the bottom initial diagonal. while ($xoff < $xlim && $yoff < $ylim @@ -397,7 +397,7 @@ * * This is extracted verbatim from analyze.c (GNU diffutils-2.7). */ - function _shift_boundaries($lines, &$changed, $other_changed) + private function _shift_boundaries($lines, &$changed, $other_changed) { $i = 0; $j = 0; @@ -526,35 +526,14 @@ { $eng = new _DiffEngine; $this->edits = $eng->diff($from_lines, $to_lines); - //$this->_check($from_lines, $to_lines); } /** - * Compute reversed Diff. - * - * SYNOPSIS: - * - * $diff = new Diff($lines1, $lines2); - * $rev = $diff->reverse(); - * @return object A Diff object representing the inverse of the - * original diff. - */ - function reverse() - { - $rev = $this; - $rev->edits = array(); - foreach ($this->edits as $edit) { - $rev->edits[] = $edit->reverse(); - } - return $rev; - } - - /** * Check for empty diff. * * @return bool True iff two sequences were identical. */ - function isEmpty() + public function isEmpty() { foreach ($this->edits as $edit) { if ($edit->type != 'copy') @@ -564,23 +543,6 @@ } /** - * Compute the length of the Longest Common Subsequence (LCS). - * - * This is mostly for diagnostic purposed. - * - * @return int The length of the LCS. - */ - function lcs() - { - $lcs = 0; - foreach ($this->edits as $edit) { - if ($edit->type == 'copy') - $lcs += sizeof($edit->orig); - } - return $lcs; - } - - /** * Get the original set of lines. * * This reconstructs the $from_lines parameter passed to the @@ -588,7 +550,7 @@ * * @return array The original sequence of strings. */ - function orig() + public function orig() { $lines = array(); @@ -607,7 +569,7 @@ * * @return array The sequence of strings. */ - function _final() + public function _final() { $lines = array(); @@ -617,37 +579,6 @@ } return $lines; } - - /** - * Check a Diff for validity. - * - * This is here only for debugging purposes. - * @param string $from_lines - * @param string $to_lines - */ - function _check($from_lines, $to_lines) - { - if (serialize($from_lines) != serialize($this->orig())) - trigger_error("Reconstructed original doesn't match", E_USER_ERROR); - if (serialize($to_lines) != serialize($this->_final())) - trigger_error("Reconstructed final doesn't match", E_USER_ERROR); - - $rev = $this->reverse(); - if (serialize($to_lines) != serialize($rev->orig())) - trigger_error("Reversed original doesn't match", E_USER_ERROR); - if (serialize($from_lines) != serialize($rev->_final())) - trigger_error("Reversed final doesn't match", E_USER_ERROR); - - $prevtype = 'none'; - foreach ($this->edits as $edit) { - if ($prevtype == $edit->type) - trigger_error("Edit sequence is non-optimal", E_USER_ERROR); - $prevtype = $edit->type; - } - - $lcs = $this->lcs(); - trigger_error("Diff okay: LCS = $lcs", E_USER_NOTICE); - } } /** @@ -738,7 +669,7 @@ * @param $diff object A Diff object. * @return string The formatted output. */ - function format($diff) + public function format($diff) { $xi = $yi = 1; @@ -793,7 +724,7 @@ return $this->_end_diff(); } - function _block($xbeg, $xlen, $ybeg, $ylen, &$edits) + private function _block($xbeg, $xlen, $ybeg, $ylen, &$edits) { $this->_start_block($this->_block_header($xbeg, $xlen, $ybeg, $ylen)); foreach ($edits as $edit) { @@ -808,19 +739,19 @@ $this->_end_block(); } - function _start_diff() + protected function _start_diff() { ob_start(); } - function _end_diff() + protected function _end_diff() { $val = ob_get_contents(); ob_end_clean(); return $val; } - function _block_header($xbeg, $xlen, $ybeg, $ylen) + protected function _block_header($xbeg, $xlen, $ybeg, $ylen) { if ($xlen > 1) $xbeg .= "," . ($xbeg + $xlen - 1); @@ -830,37 +761,37 @@ return $xbeg . ($xlen ? ($ylen ? 'c' : 'd') : 'a') . $ybeg; } - function _start_block($header) + protected function _start_block($header) { echo $header; } - function _end_block() + protected function _end_block() { } - function _lines($lines, $prefix = ' ') + protected function _lines($lines, $prefix = ' ') { foreach ($lines as $line) echo "$prefix $line\n"; } - function _context($lines) + protected function _context($lines) { $this->_lines($lines); } - function _added($lines) + protected function _added($lines) { $this->_lines($lines, ">"); } - function _deleted($lines) + protected function _deleted($lines) { $this->_lines($lines, "<"); } - function _changed($orig, $final) + protected function _changed($orig, $final) { $this->_deleted($orig); echo "---\n"; @@ -881,7 +812,7 @@ $this->trailing_context_lines = $context_lines; } - function _block_header($xbeg, $xlen, $ybeg, $ylen) + protected function _block_header($xbeg, $xlen, $ybeg, $ylen) { if ($xlen != 1) $xbeg .= "," . $xlen; @@ -890,17 +821,17 @@ return "@@ -$xbeg +$ybeg @@\n"; } - function _added($lines) + protected function _added($lines) { $this->_lines($lines, "+"); } - function _deleted($lines) + protected function _deleted($lines) { $this->_lines($lines, "-"); } - function _changed($orig, $final) + protected function _changed($orig, $final) { $this->_deleted($orig); $this->_added($final); @@ -926,7 +857,7 @@ $this->trailing_context_lines = $context_lines; } - function _lines($lines, $prefix = '') + protected function _lines($lines, $prefix = '') { if (!$prefix == '') echo "$prefix\n"; @@ -936,22 +867,22 @@ echo "$prefix\n"; } - function _added($lines) + protected function _added($lines) { $this->_lines($lines, ">>>>>>>"); } - function _deleted($lines) + protected function _deleted($lines) { $this->_lines($lines, "<<<<<<<"); } - function _block_header($xbeg, $xlen, $ybeg, $ylen) + protected function _block_header($xbeg, $xlen, $ybeg, $ylen) { return ""; } - function _changed($orig, $final) + protected function _changed($orig, $final) { $this->_deleted($orig); $this->_added($final); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-12-17 14:25:05
|
Revision: 9445 http://sourceforge.net/p/phpwiki/code/9445 Author: vargenau Date: 2014-12-17 14:25:01 +0000 (Wed, 17 Dec 2014) Log Message: ----------- Remove unused Modified Paths: -------------- trunk/lib/Template.php trunk/lib/WikiDB/backend/ADODB.php trunk/lib/WikiDB/backend/PDO.php trunk/lib/WikiPlugin.php trunk/lib/WikiUser.php trunk/lib/display.php trunk/lib/pdf.php trunk/lib/plugin/ModeratedPage.php trunk/lib/stdlib.php Modified: trunk/lib/Template.php =================================================================== --- trunk/lib/Template.php 2014-12-17 14:23:56 UTC (rev 9444) +++ trunk/lib/Template.php 2014-12-17 14:25:01 UTC (rev 9445) @@ -288,7 +288,7 @@ if (!isset($args['HEADER'])) $args['HEADER'] = SplitPagename($title); - global $HIDE_TOOLBARS, $NO_BASEHREF, $WikiTheme; + global $HIDE_TOOLBARS, $WikiTheme; $HIDE_TOOLBARS = true; if (!$WikiTheme->DUMP_MODE) $WikiTheme->DUMP_MODE = 'HTML'; Modified: trunk/lib/WikiDB/backend/ADODB.php =================================================================== --- trunk/lib/WikiDB/backend/ADODB.php 2014-12-17 14:23:56 UTC (rev 9444) +++ trunk/lib/WikiDB/backend/ADODB.php 2014-12-17 14:25:01 UTC (rev 9445) @@ -280,7 +280,7 @@ $dbh = &$this->_dbh; $page_tbl = $this->_table_names['page_tbl']; if (empty($data)) $data = ''; - $rs = $dbh->Execute("UPDATE $page_tbl" + $dbh->Execute("UPDATE $page_tbl" . " SET cached_html=?" . " WHERE pagename=?", array($data, $pagename)); @@ -1366,7 +1366,6 @@ function next() { $result = &$this->_result; - $backend = &$this->_backend; if (!$result || $result->EOF) { $this->free(); return false; Modified: trunk/lib/WikiDB/backend/PDO.php =================================================================== --- trunk/lib/WikiDB/backend/PDO.php 2014-12-17 14:23:56 UTC (rev 9444) +++ trunk/lib/WikiDB/backend/PDO.php 2014-12-17 14:25:01 UTC (rev 9445) @@ -1321,7 +1321,6 @@ function write_accesslog(&$entry) { - global $request; $dbh = &$this->_dbh; $log_tbl = $entry->_accesslog->logtable; $dbh->prepare("INSERT INTO $log_tbl" Modified: trunk/lib/WikiPlugin.php =================================================================== --- trunk/lib/WikiPlugin.php 2014-12-17 14:23:56 UTC (rev 9444) +++ trunk/lib/WikiPlugin.php 2014-12-17 14:25:01 UTC (rev 9445) @@ -322,7 +322,6 @@ 'class' => $args['class'], 'accept-charset' => 'UTF-8')); if (!USE_PATH_INFO) { - $pagename = $request->get('pagename'); $form->pushContent(HTML::input(array('type' => 'hidden', 'name' => 'pagename', 'value' => $args['targetpage']))); Modified: trunk/lib/WikiUser.php =================================================================== --- trunk/lib/WikiUser.php 2014-12-17 14:23:56 UTC (rev 9444) +++ trunk/lib/WikiUser.php 2014-12-17 14:25:01 UTC (rev 9445) @@ -1254,7 +1254,7 @@ while ($user and $user->_userid) { $user = UpgradeUser($this, $user); if ($user->userExists()) { - $user = UpgradeUser($this, $user); + UpgradeUser($this, $user); return true; } // prevent endless loop. does this work on all PHP's? @@ -1405,7 +1405,7 @@ while ($user = new $class($this->_userid, $this->_prefs)) { $user = UpgradeUser($this, $user); if ($user->userExists()) { - $user = UpgradeUser($this, $user); + UpgradeUser($this, $user); return true; } if ($class == "_ForbiddenPassUser") return false; Modified: trunk/lib/display.php =================================================================== --- trunk/lib/display.php 2014-12-17 14:23:56 UTC (rev 9444) +++ trunk/lib/display.php 2014-12-17 14:25:01 UTC (rev 9445) @@ -157,7 +157,7 @@ if ($format == 'pdf') { require_once 'lib/pdf.php'; array_unshift($args['VALID_LINKS'], $pagename); - ConvertAndDisplayPdfPageList($request, $pagelist, $args); + ConvertAndDisplayPdfPageList($request, $pagelist); } elseif ($format == 'ziphtml') { // need to fix links require_once 'lib/loadsave.php'; array_unshift($args['VALID_LINKS'], $pagename); Modified: trunk/lib/pdf.php =================================================================== --- trunk/lib/pdf.php 2014-12-17 14:23:56 UTC (rev 9444) +++ trunk/lib/pdf.php 2014-12-17 14:25:01 UTC (rev 9445) @@ -28,13 +28,12 @@ * htmldoc or ghostscript + html2ps or docbook (dbdoclet, xsltproc, fop) * http://www.easysw.com/htmldoc */ -function ConvertAndDisplayPdfPageList(&$request, $pagelist, $args = array()) +function ConvertAndDisplayPdfPageList(&$request, $pagelist) { global $WikiTheme; if (empty($request->_is_buffering_output)) $request->buffer_output(false /*'nocompress'*/); $pagename = $request->getArg('pagename'); - $dest = $request->getArg('dest'); $request->setArg('dest', false); $request->setArg('format', false); include_once 'lib/display.php'; Modified: trunk/lib/plugin/ModeratedPage.php =================================================================== --- trunk/lib/plugin/ModeratedPage.php 2014-12-17 14:23:56 UTC (rev 9444) +++ trunk/lib/plugin/ModeratedPage.php 2014-12-17 14:25:01 UTC (rev 9445) @@ -304,8 +304,6 @@ $this->cleanup_and_notify($request, $args, $moderation); // start from scratch, dispatch the action as in lib/main to the action handler $request->discardOutput(); - $oldargs = $request->args; - $olduser = $request->_user; $request->args = $moderation['args']; $request->_user->_userid = $moderation['userid']; // keep current perms but fake the id. // TODO: fake author ip also Modified: trunk/lib/stdlib.php =================================================================== --- trunk/lib/stdlib.php 2014-12-17 14:23:56 UTC (rev 9444) +++ trunk/lib/stdlib.php 2014-12-17 14:25:01 UTC (rev 9445) @@ -2019,8 +2019,6 @@ if (empty($line)) return $options; // First we have an attribute name. - $attribute = ""; - $value = ""; $i = 0; while (($i < strlen($line)) && ($line[$i] != '=')) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-12-18 17:08:19
|
Revision: 9448 http://sourceforge.net/p/phpwiki/code/9448 Author: vargenau Date: 2014-12-18 17:08:11 +0000 (Thu, 18 Dec 2014) Log Message: ----------- Add public/protected/private Modified Paths: -------------- trunk/lib/loadsave.php trunk/lib/stdlib.php Modified: trunk/lib/loadsave.php =================================================================== --- trunk/lib/loadsave.php 2014-12-17 14:35:04 UTC (rev 9447) +++ trunk/lib/loadsave.php 2014-12-18 17:08:11 UTC (rev 9448) @@ -1327,10 +1327,10 @@ $this->_includefiles = $_include; $this->_exclude = $exclude; $this->_skiplist = array(); - parent::FileSet($dirname); + parent::__construct($dirname); } - function _filenameSelector($fn) + protected function _filenameSelector($fn) { $incl = &$this->_includefiles; $excl = &$this->_exclude; Modified: trunk/lib/stdlib.php =================================================================== --- trunk/lib/stdlib.php 2014-12-17 14:35:04 UTC (rev 9447) +++ trunk/lib/stdlib.php 2014-12-18 17:08:11 UTC (rev 9448) @@ -657,20 +657,20 @@ class Stack { - function Stack() + function __construct() { $this->items = array(); $this->size = 0; } - function push($item) + public function push($item) { $this->items[$this->size] = $item; $this->size++; return true; } - function pop() + public function pop() { if ($this->size == 0) { return false; // stack is empty @@ -679,12 +679,12 @@ return $this->items[$this->size]; } - function cnt() + public function cnt() { return $this->size; } - function top() + public function top() { if ($this->size) return $this->items[$this->size - 1]; @@ -768,9 +768,7 @@ return $WikiTheme->linkBadWikiWord($wikipage, $url); } - return HTML::a(array('href' => WikiURL($pagename, $args), - 'class' => $class), - $text); + return HTML::a(array('href' => WikiURL($pagename, $args), 'class' => $class), $text); } /** @@ -890,7 +888,7 @@ $this->shortName, join(', ', $warnings)); } - function _pagename($page) + private function _pagename($page) { if (is_a($page, 'WikiDB_Page')) return $page->getName(); @@ -901,7 +899,7 @@ return $page; } - function _normalize_bad_pagename($name) + private function _normalize_bad_pagename($name) { trigger_error("Bad pagename: " . $name, E_USER_WARNING); @@ -922,7 +920,7 @@ * which cannot be deleted anymore, because unknown chars are compressed. * So BEFORE importing a file _check must be done !!! */ - function _check($pagename) + private function _check($pagename) { // Compress internal white-space to single space character. $pagename = preg_replace('/[\s\xa0]+/', ' ', $orig = $pagename); @@ -972,7 +970,7 @@ * Converts all tabs to (the appropriate number of) spaces. * * @param string $str - * @param integer $tab_width + * @param int $tab_width * @return string */ function expand_tabs($str, $tab_width = 8) @@ -1338,7 +1336,7 @@ class fileSet { - function fileSet($directory, $filepattern = false) + function __construct($directory, $filepattern = false) { $this->_fileList = array(); $this->_pattern = $filepattern; @@ -1374,7 +1372,7 @@ * (This was a function LoadDir in lib/loadsave.php) * See also http://www.php.net/manual/en/function.readdir.php */ - function getFiles($exclude = '', $sortby = '', $limit = '') + public function getFiles($exclude = '', $sortby = '', $limit = '') { $list = $this->_fileList; @@ -1400,7 +1398,7 @@ return $list; } - function _filenameSelector($filename) + protected function _filenameSelector($filename) { if (!$this->_pattern) return true; @@ -1419,7 +1417,7 @@ * A file is considered an image when the suffix matches one from * INLINE_IMAGES. */ - function _filenameSelector($filename) + protected function _filenameSelector($filename) { return is_image($filename); } @@ -1427,7 +1425,7 @@ class imageOrVideoSet extends fileSet { - function _filenameSelector($filename) + protected function _filenameSelector($filename) { return is_image($filename) or is_video($filename); } @@ -1638,7 +1636,7 @@ /** * Show the alert box. */ - function show() + public function show() { global $request; @@ -1651,7 +1649,7 @@ $request->finish(); } - function _getButtons() + private function _getButtons() { global $request; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2015-01-09 15:40:08
|
Revision: 9458 http://sourceforge.net/p/phpwiki/code/9458 Author: vargenau Date: 2015-01-09 15:40:00 +0000 (Fri, 09 Jan 2015) Log Message: ----------- Add public/private; update PHP Doc; remove unused functions Modified Paths: -------------- trunk/lib/MailNotify.php trunk/lib/WikiDB.php trunk/lib/main.php Modified: trunk/lib/MailNotify.php =================================================================== --- trunk/lib/MailNotify.php 2015-01-06 17:29:35 UTC (rev 9457) +++ trunk/lib/MailNotify.php 2015-01-09 15:40:00 UTC (rev 9458) @@ -52,7 +52,7 @@ class MailNotify { - function MailNotify($pagename) + function __construct($pagename) { $this->pagename = $pagename; /* which page */ $this->emails = array(); /* to which addresses */ @@ -62,7 +62,7 @@ $this->from = $this->fromId(); } - function fromId() + private function fromId() { global $request; if (defined('FUSIONFORGE') and FUSIONFORGE) { @@ -72,13 +72,13 @@ } } - function fromEmail() + private function fromEmail() { global $request; return $this->userEmail($request->_user->getId(), false); } - function userEmail($userid, $doverify = true) + private function userEmail($userid, $doverify = true) { global $request; @@ -108,14 +108,17 @@ } /** - * getPageChangeEmails($notify) - * @param $notify: hash ( page => (userid => userhash) ) - * @return array - * unique array of ($emails, $userids) + * getPageChangeEmails + * @param array $notify hash ( page => (userid => userhash) ) + * @return array unique array of ($emails, $userids) */ - function getPageChangeEmails($notify) + public function getPageChangeEmails($notify) { + /** + * @var WikiRequest $request + */ global $request; + $emails = array(); $userids = array(); foreach ($notify as $page => $users) { @@ -176,10 +179,14 @@ return array($this->emails, $this->userids); } - function sendMail($subject, - $content, - $notice = false, - $silent = true) + /** + * @param string $subject Subject of the e-mail + * @param string $content Content of the e-mail + * @param bool $notice Message used when triggering error + * @param bool $silent If true, do not trigger error + * @return bool Return false in case of error + */ + public function sendMail($subject, $content, $notice = false, $silent = true) { // Add WIKI_NAME to Subject $subject = "[" . WIKI_NAME . "] " . $subject; @@ -187,7 +194,7 @@ $encoded_subject = $this->subject_encode($subject); $emails = $this->emails; // Do not send if modification is from FusionForge admin - if ((defined('FUSIONFORGE') and FUSIONFORGE) and ($this->fromId() == ADMIN_USER)) { + if ((defined('FUSIONFORGE') && FUSIONFORGE) && ($this->fromId() == ADMIN_USER)) { return true; } if (!$notice) { @@ -249,7 +256,7 @@ * Send udiff for a changed page to multiple users. * See rename and remove methods also */ - function sendPageChangeNotification(&$wikitext, $version, &$meta) + private function sendPageChangeNotification(&$wikitext, $version, &$meta) { global $request; @@ -306,21 +313,28 @@ /** * Support mass rename / remove (TBD) + * @param string $to New page name */ - function sendPageRenameNotification($to) + private function sendPageRenameNotification($to) { $pagename = $this->pagename; $editedby = sprintf(_("Renamed by: %s"), $this->fromId()); $subject = sprintf(_("Page rename %s to %s"), $pagename, $to); $link = WikiURL($to, true); - $this->sendMail($subject, - $editedby . "\n" . $link . "\n\n" . "Renamed $pagename to $to"); + $this->sendMail($subject, $editedby . "\n" . $link . "\n\n" . "Renamed $pagename to $to"); } - /** + /* * The handlers: */ - function onChangePage(&$wikidb, &$wikitext, $version, &$meta) + + /** + * @param WikiDB $wikidb + * @param string $wikitext + * @param string $version + * @param array $meta + */ + public function onChangePage(&$wikidb, &$wikitext, $version, &$meta) { /** * @var WikiRequest $request @@ -342,7 +356,12 @@ } } - function onDeletePage(&$wikidb, $pagename) + /** + * @param WikiDB $wikidb + * @param string $pagename + * @return bool + */ + public function onDeletePage(&$wikidb, $pagename) { /** * @var WikiRequest $request @@ -365,7 +384,12 @@ return $result; } - function onRenamePage(&$wikidb, $oldpage, $new_pagename) + /** + * @param WikiDB $wikidb + * @param string $oldpage + * @param string $new_pagename + */ + public function onRenamePage(&$wikidb, $oldpage, $new_pagename) { /** * @var WikiRequest $request @@ -384,76 +408,8 @@ } } - /** - * Send mail to user and store the cookie in the db - * wikiurl?action=ConfirmEmail&id=bla - */ - function sendEmailConfirmation($email, $userid) + private function subject_encode($subject) { - global $request; - $id = rand_ascii_readable(16); - $wikidb = $request->getDbh(); - $data = $wikidb->get('ConfirmEmail'); - while (!empty($data[$id])) { // id collision - $id = rand_ascii_readable(16); - } - $subject = _("E-mail address confirmation"); - $ip = $request->get('REMOTE_HOST'); - $expire_date = time() + 7 * 86400; - $content = fmt("Someone, probably you from IP address %s, has registered an -account \"%s\" with this e-mail address on %s. - -To confirm that this account really does belong to you and activate -e-mail features on %s, open this link in your browser: - -%s - -If this is *not* you, don't follow the link. This confirmation code -will expire at %s.", - $ip, $userid, WIKI_NAME, WIKI_NAME, - WikiURL(HOME_PAGE, array('action' => 'ConfirmEmail', - 'id' => $id), - true), - CTime($expire_date)); - $this->sendMail($subject, $content, "", true); - $data[$id] = array('email' => $email, - 'userid' => $userid, - 'expire' => $expire_date); - $wikidb->set('ConfirmEmail', $data); - return ''; - } - - function checkEmailConfirmation() - { - global $request; - $wikidb = $request->getDbh(); - $data = $wikidb->get('ConfirmEmail'); - $id = $request->getArg('id'); - if (empty($data[$id])) { // id not found - return HTML(HTML::h1("Confirm E-mail address"), - HTML::h1("Sorry! Wrong URL")); - } - // upgrade the user - $userid = $data['userid']; - $u = $request->getUser(); - if ($u->UserName() == $userid) { // lucky: current user (session) - $request->_user->_level = WIKIAUTH_USER; - $request->_prefs->set('emailVerified', true); - } else { // not current user - $u = WikiUser($userid); - $u->getPreferences(); - $u->_level = WIKIAUTH_USER; - $request->setUser($u); - $request->_prefs->set('emailVerified', true); - } - unset($data[$id]); - $wikidb->set('ConfirmEmail', $data); - return HTML(HTML::h1("Confirm E-mail address"), - HTML::p("Your e-mail address has now been confirmed.")); - } - - function subject_encode($subject) - { // We need to encode the subject if it contains non-ASCII characters // The page name may contain non-ASCII characters, as well as // the translation of the messages, e.g. _("PageChange Notification of %s"); Modified: trunk/lib/WikiDB.php =================================================================== --- trunk/lib/WikiDB.php 2015-01-06 17:29:35 UTC (rev 9457) +++ trunk/lib/WikiDB.php 2015-01-09 15:40:00 UTC (rev 9458) @@ -41,6 +41,11 @@ class WikiDB { /** + * @var WikiDB_backend $_backend + */ + public $_backend; + + /** * @see open() */ function __construct(&$backend, $dbparams) Modified: trunk/lib/main.php =================================================================== --- trunk/lib/main.php 2015-01-06 17:29:35 UTC (rev 9457) +++ trunk/lib/main.php 2015-01-09 15:40:00 UTC (rev 9458) @@ -47,6 +47,9 @@ class WikiRequest extends Request { + /** + * @var WikiDB $_dbi + */ public $_dbi; function __construct() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2015-01-12 10:09:29
|
Revision: 9464 http://sourceforge.net/p/phpwiki/code/9464 Author: vargenau Date: 2015-01-12 10:09:13 +0000 (Mon, 12 Jan 2015) Log Message: ----------- HTML::Table --> HTML::table Modified Paths: -------------- trunk/lib/diff.php trunk/lib/plugin/Diff.php Modified: trunk/lib/diff.php =================================================================== --- trunk/lib/diff.php 2015-01-12 10:05:48 UTC (rev 9463) +++ trunk/lib/diff.php 2015-01-12 10:09:13 UTC (rev 9464) @@ -341,7 +341,7 @@ if ($old and $old->getVersion() == 0) $old = false; - $html->pushContent(HTML::Table(PageInfoRow(_("Newer page:"), $new, + $html->pushContent(HTML::table(PageInfoRow(_("Newer page:"), $new, $request, empty($version)), PageInfoRow(_("Older page:"), $old, $request, false))); Modified: trunk/lib/plugin/Diff.php =================================================================== --- trunk/lib/plugin/Diff.php 2015-01-12 10:05:48 UTC (rev 9463) +++ trunk/lib/plugin/Diff.php 2015-01-12 10:09:13 UTC (rev 9464) @@ -173,7 +173,7 @@ if ($old and $old->getVersion() == 0) $old = false; - $html->pushContent(HTML::Table($this->PageInfoRow(_("Newer page:"), $new, + $html->pushContent(HTML::table($this->PageInfoRow(_("Newer page:"), $new, $request), $this->PageInfoRow(_("Older page:"), $old, $request))); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2015-01-14 14:47:59
|
Revision: 9472 http://sourceforge.net/p/phpwiki/code/9472 Author: vargenau Date: 2015-01-14 14:47:52 +0000 (Wed, 14 Jan 2015) Log Message: ----------- Simplify require_once Modified Paths: -------------- trunk/lib/InlineParser.php trunk/lib/imagecache.php trunk/lib/main.php Modified: trunk/lib/InlineParser.php =================================================================== --- trunk/lib/InlineParser.php 2015-01-14 14:17:27 UTC (rev 9471) +++ trunk/lib/InlineParser.php 2015-01-14 14:47:52 UTC (rev 9472) @@ -35,7 +35,7 @@ define('ESCAPE_CHAR', '~'); require_once 'lib/CachedMarkup.php'; -require_once(dirname(__FILE__) . '/stdlib.php'); +require_once 'lib/stdlib.php'; function WikiEscape($text) { Modified: trunk/lib/imagecache.php =================================================================== --- trunk/lib/imagecache.php 2015-01-14 14:17:27 UTC (rev 9471) +++ trunk/lib/imagecache.php 2015-01-14 14:47:52 UTC (rev 9472) @@ -27,9 +27,9 @@ */ include_once 'lib/config.php'; -require_once(dirname(__FILE__) . "/stdlib.php"); +require_once 'lib/stdlib.php'; require_once 'lib/Request.php'; -require_once("lib/WikiUser.php"); +require_once 'lib/WikiUser.php'; require_once 'lib/WikiDB.php'; require_once 'lib/WikiPluginCached.php'; Modified: trunk/lib/main.php =================================================================== --- trunk/lib/main.php 2015-01-14 14:17:27 UTC (rev 9471) +++ trunk/lib/main.php 2015-01-14 14:47:52 UTC (rev 9472) @@ -25,7 +25,7 @@ define ('USE_PREFS_IN_PAGE', true); //include "lib/config.php"; -require_once(dirname(__FILE__) . "/stdlib.php"); +require_once 'lib/stdlib.php'; require_once 'lib/Request.php'; require_once 'lib/WikiDB.php'; require_once 'lib/WikiUser.php'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |