From: <ru...@us...> - 2010-06-07 13:31:47
|
Revision: 7482 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7482&view=rev Author: rurban Date: 2010-06-07 13:31:38 +0000 (Mon, 07 Jun 2010) Log Message: ----------- fix nasty / escape in regexp Modified Paths: -------------- trunk/lib/FileFinder.php trunk/lib/InlineParser.php Modified: trunk/lib/FileFinder.php =================================================================== --- trunk/lib/FileFinder.php 2010-06-07 12:14:25 UTC (rev 7481) +++ trunk/lib/FileFinder.php 2010-06-07 13:31:38 UTC (rev 7482) @@ -158,7 +158,9 @@ function _is_abs($path) { if (substr($path,0,1) == '/') { return true; - } elseif (isWindows() and (preg_match('#^[a-z]:[/\\]#i', $path))) { + } elseif (isWindows() and preg_match("/^[a-z]:/i", $path) + and (substr($path,3,1) == "/" or substr($path,3,1) == "\\")) + { return true; } else { return false; Modified: trunk/lib/InlineParser.php =================================================================== --- trunk/lib/InlineParser.php 2010-06-07 12:14:25 UTC (rev 7481) +++ trunk/lib/InlineParser.php 2010-06-07 13:31:38 UTC (rev 7482) @@ -1,7 +1,7 @@ <?php // rcs_id('$Id$'); /* Copyright (C) 2002 Geoffrey T. Dairiki <da...@da...> - * Copyright (C) 2004-2009 Reini Urban + * Copyright (C) 2004-2010 Reini Urban * Copyright (C) 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent * * This file is part of PhpWiki. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ru...@us...> - 2010-06-07 14:12:33
|
Revision: 7486 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7486&view=rev Author: rurban Date: 2010-06-07 14:12:27 +0000 (Mon, 07 Jun 2010) Log Message: ----------- Remove the rest of the require_once('lib/HtmlElement.php') lines, as it is already loaded by prepend => ErrorManager 4 vs. 5. Modified Paths: -------------- trunk/lib/BlockParser.php trunk/lib/diff.php Modified: trunk/lib/BlockParser.php =================================================================== --- trunk/lib/BlockParser.php 2010-06-07 14:05:29 UTC (rev 7485) +++ trunk/lib/BlockParser.php 2010-06-07 14:12:27 UTC (rev 7486) @@ -19,7 +19,7 @@ * along with PhpWiki; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -require_once('lib/HtmlElement.php'); +//require_once('lib/HtmlElement.php'); require_once('lib/CachedMarkup.php'); require_once('lib/InlineParser.php'); Modified: trunk/lib/diff.php =================================================================== --- trunk/lib/diff.php 2010-06-07 14:05:29 UTC (rev 7485) +++ trunk/lib/diff.php 2010-06-07 14:12:27 UTC (rev 7486) @@ -9,7 +9,6 @@ // require_once('lib/difflib.php'); -require_once('lib/HtmlElement.php'); class _HWLDF_WordAccumulator { function _HWLDF_WordAccumulator () { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ru...@us...> - 2010-06-08 10:41:36
|
Revision: 7494 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7494&view=rev Author: rurban Date: 2010-06-08 10:41:29 +0000 (Tue, 08 Jun 2010) Log Message: ----------- fix paging: almost all backends do now slice by themselves, so do not slice in PageList. simplify constants new AllPages default: include_empty is faster Modified Paths: -------------- trunk/lib/PageList.php trunk/lib/WikiDB.php trunk/lib/plugin/AllPages.php Modified: trunk/lib/PageList.php =================================================================== --- trunk/lib/PageList.php 2010-06-08 08:22:56 UTC (rev 7493) +++ trunk/lib/PageList.php 2010-06-08 10:41:29 UTC (rev 7494) @@ -1,5 +1,5 @@ <?php -// rcs_id('$Id$'); +//rcs_id('$Id$'); /* Copyright (C) 2004-2009 $ThePhpWikiProgrammingTeam * Copyright (C) 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent * @@ -692,9 +692,7 @@ * These options may also be given to _generate(List|Table) later * But limit and offset might help the query WikiDB::getAllPages() */ - // Use big value since paging does not work. - // 'limit' => 50, // number of rows (pagesize) - 'limit' => 5000, // number of rows (pagesize) + 'limit' => 50, // number of rows (pagesize) 'paging' => 'auto', // 'auto' top + bottom rows if applicable // // 'top' top only if applicable // // 'bottom' bottom only if applicable @@ -844,23 +842,25 @@ /* ignore from, but honor limit */ function addPages ($page_iter) { // TODO: if limit check max(strlen(pagename)) - $i = 0; $from = 0; - if (isa($page_iter->_iter, "WikiDB_backend_dbaBase_pageiter")) { - $limit = 0; - } - elseif (isset($this->_options['limit'])) { // extract from,count from limit - list($from, $limit) = WikiDB_backend::limit($this->_options['limit']); + $limit = $page_iter->limit(); + if ($limit) { + list($from, $limit) = $this->limit($limit); + $this->_options['slice'] = 0; $limit += $from; - } else { - $limit = 0; - } - while ($page = $page_iter->next()) { - $i++; - if ($from and $i < $from) - continue; - if (!$limit or ($limit and $i < $limit)) + $i = 0; + while ($page = $page_iter->next()) { + $i++; + if ($from and $i < $from) + continue; + if (!$limit or ($limit and $i < $limit)) + $this->addPage($page); + } + } else { + $this->_options['slice'] = 0; + while ($page = $page_iter->next()) { $this->addPage($page); - } + } + } if (empty($this->_options['count'])) $this->_options['count'] = $i; } @@ -873,6 +873,7 @@ } else { $limit = 0; } + $this->_options['slice'] = 0; $i = 0; foreach ($list as $page) { $i++; @@ -1445,18 +1446,19 @@ $tokens['LIMIT'] = $prev['limit']; $tokens['PREV'] = true; $tokens['PREV_LINK'] = WikiURL($pagename, $prev); - $prev['limit'] = "0,$pagesize"; + $prev['limit'] = "0,$pagesize"; // FIRST_LINK $tokens['FIRST_LINK'] = WikiURL($pagename, $prev); } $next = $defargs; $tokens['NEXT'] = false; $tokens['NEXT_LINK'] = ""; if (($offset + $pagesize) < $numrows) { - $next['limit'] = min($offset + $pagesize, $numrows - $pagesize) . ",$pagesize"; + $next['limit'] = min($offset + $pagesize, $numrows - $pagesize) + . ",$pagesize"; $next['count'] = $numrows; $tokens['LIMIT'] = $next['limit']; $tokens['NEXT'] = true; $tokens['NEXT_LINK'] = WikiURL($pagename, $next); - $next['limit'] = $numrows - $pagesize . ",$pagesize"; + $next['limit'] = $numrows - $pagesize . ",$pagesize"; // LAST_LINK $tokens['LAST_LINK'] = WikiURL($pagename, $next); } return $tokens; @@ -1478,14 +1480,12 @@ $tokens = $this->pagingTokens($count, count($this->_columns), $this->_options['limit']); - if ($tokens) + if ($tokens and $this->_options['slice']) $this->_pages = array_slice($this->_pages, $tokens['OFFSET'], $tokens['COUNT']); } - $nb_row = 0; foreach ($this->_pages as $pagenum => $page) { - $one_row = $this->_renderPageRow($page, $i++); + $one_row = $this->_renderPageRow($page, $i++); $rows[] = $one_row; - if ($one_row) $nb_row++; } $table = HTML::table(array('cellpadding' => 0, 'cellspacing' => 1, @@ -1494,8 +1494,6 @@ 'class' => 'pagelist', )); if ($caption) { - if (is_string($caption)) - $caption = preg_replace('/{total}/', $nb_row, asString($caption)); $table->pushContent(HTML::caption(array('align'=>'top'), $caption)); } @@ -1570,16 +1568,12 @@ if (empty($this->_pages)) return; // stop recursion if (!isset($this->_options['listtype'])) $this->_options['listtype'] = ''; - $nb_row = 0; foreach ($this->_pages as $pagenum => $page) { $one_row = $this->_renderPageRow($page); $rows[] = array('header' => WikiLink($page), 'render' => $one_row); - if ($one_row) $nb_row++; } $out = HTML(); if ($caption) { - if (is_string($caption)) - $caption = preg_replace('/{total}/', $nb_row, asString($caption)); $out->pushContent(HTML::p($caption)); } // Semantic Search et al: only unique list entries, esp. with nopage @@ -1602,7 +1596,7 @@ } } - if (!empty($this->_options['limit'])) + if (!empty($this->_options['limit']) and $this->_options['slice']) list($offset, $count) = $this->limit($this->_options['limit']); else { $offset = 0; $count = count($this->_pages); @@ -1756,8 +1750,6 @@ function _emptyList($caption) { $html = HTML(); if ($caption) { - if (is_string($caption)) - $caption = preg_replace('/{total}/', '0', asString($caption)); $html->pushContent(HTML::p($caption)); } if ($this->_messageIfEmpty) Modified: trunk/lib/WikiDB.php =================================================================== --- trunk/lib/WikiDB.php 2010-06-08 08:22:56 UTC (rev 7493) +++ trunk/lib/WikiDB.php 2010-06-08 10:41:29 UTC (rev 7494) @@ -286,12 +286,10 @@ } $result = $this->_backend->get_all_pages($include_empty, $sortby, $limit, $exclude); - if (isa($this->_backend, "WikiDB_backend_dba")) - $limit = false; return new WikiDB_PageIterator($this, $result, array('include_empty' => $include_empty, 'exclude' => $exclude, - 'limit' => $limit)); + 'limit' => $result->limit())); } /** @@ -1821,6 +1819,9 @@ function count () { return $this->_iter->count(); } + function limit () { + return empty($this->_options['limit']) ? 0 : $this->_options['limit']; + } /** * Get next WikiDB_Page in sequence. Modified: trunk/lib/plugin/AllPages.php =================================================================== --- trunk/lib/plugin/AllPages.php 2010-06-08 08:22:56 UTC (rev 7493) +++ trunk/lib/plugin/AllPages.php 2010-06-08 10:41:29 UTC (rev 7494) @@ -44,7 +44,7 @@ PageList::supportedArgs(), array( 'noheader' => false, - 'include_empty' => false, + 'include_empty' => true, // is faster //'pages' => false, // DONT, this would be ListPages then. 'info' => '', 'debug' => false, @@ -63,49 +63,55 @@ $pages = false; // Todo: extend given _GET args - if (defined('DEBUG') && DEBUG && $args['debug']) { + if (DEBUG && $args['debug']) { $timer = new DebugTimer; } - $caption = _("All pages in this wiki ({total} total):"); + $caption = _("All pages in this wiki (%d total):"); if ( !empty($args['userpages']) ) { $pages = PageList::allUserPages($args['include_empty'], $args['sortby'], '' ); - $caption = _("List of user-created pages ({total} total):"); + $caption = _("List of user-created pages (%d total):"); $args['count'] = $request->getArg('count'); } elseif ( !empty($args['owner']) ) { $pages = PageList::allPagesByOwner($args['owner'], $args['include_empty'], $args['sortby'], '' ); - $caption = fmt("List of pages owned by [%s] ({total} total):", + $args['count'] = $request->getArg('count'); + if (!$args['count']) + $args['count'] = $dbi->numPages($args['include_empty'], $args['exclude']); + $caption = fmt("List of pages owned by [%s] (%d total):", WikiLink($args['owner'] == '[]' ? $request->_user->getAuthenticatedId() : $args['owner'], - 'if_known')); - $args['count'] = $request->getArg('count'); + 'if_known'), $args['count']); $pages->_options['count'] = $args['count']; } elseif ( !empty($args['author']) ) { $pages = PageList::allPagesByAuthor($args['author'], $args['include_empty'], $args['sortby'], '' ); - $caption = fmt("List of pages last edited by [%s] ({total} total):", + $args['count'] = $request->getArg('count'); + if (!$args['count']) + $args['count'] = $dbi->numPages($args['include_empty'], $args['exclude']); + $caption = fmt("List of pages last edited by [%s] (%d total):", WikiLink($args['author'] == '[]' ? $request->_user->getAuthenticatedId() : $args['author'], - 'if_known')); - $args['count'] = $request->getArg('count'); + 'if_known'), $args['count']); $pages->_options['count'] = $args['count']; } elseif ( !empty($args['creator']) ) { $pages = PageList::allPagesByCreator($args['creator'], $args['include_empty'], $args['sortby'], '' ); - $caption = fmt("List of pages created by [%s] ({total} total):", + $args['count'] = $request->getArg('count'); + if (!$args['count']) + $args['count'] = $dbi->numPages($args['include_empty'], $args['exclude']); + $caption = fmt("List of pages created by [%s] (%d total):", WikiLink($args['creator'] == '[]' ? $request->_user->getAuthenticatedId() : $args['creator'], - 'if_known')); - $args['count'] = $request->getArg('count'); + 'if_known'), $args['count']); $pages->_options['count'] = $args['count']; //} elseif ($pages) { // $args['count'] = count($pages); @@ -129,7 +135,7 @@ else $pagelist->addPages( $dbi->getAllPages($args['include_empty'], $args['sortby'], $args['limit']) ); - if (defined('DEBUG') && DEBUG && $args['debug']) { + if (DEBUG && $args['debug']) { return HTML($pagelist, HTML::p(fmt("Elapsed time: %s s", $timer->getStats()))); } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2010-06-09 10:06:44
|
Revision: 7506 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7506&view=rev Author: vargenau Date: 2010-06-09 10:06:37 +0000 (Wed, 09 Jun 2010) Log Message: ----------- split is deprecated, replace with explode Modified Paths: -------------- trunk/lib/IniConfig.php trunk/lib/PageList.php trunk/lib/WikiDB/adodb/drivers/adodb-informix72.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-ldap.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php trunk/lib/WikiDB/backend.php trunk/lib/WikiUser/POP3.php trunk/lib/WikiUser/Session.php trunk/lib/WikiUserNew.php trunk/lib/XMLRPC/xmlrpc.inc trunk/lib/XmlParser.php trunk/lib/config.php trunk/lib/plugin/LdapSearch.php trunk/lib/plugin/ListPages.php trunk/lib/plugin/Template.php trunk/lib/wikilens/Utils.php trunk/lib/ziplib.php Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2010-06-09 08:47:52 UTC (rev 7505) +++ trunk/lib/IniConfig.php 2010-06-09 10:06:37 UTC (rev 7506) @@ -425,7 +425,7 @@ if (defined('PLUGIN_MARKUP_MAP') and trim(PLUGIN_MARKUP_MAP) != "") { $_map = preg_split('/\s+/', PLUGIN_MARKUP_MAP); foreach ($_map as $v) { - list($xml,$plugin) = split(':', $v); + list($xml,$plugin) = explode(':', $v); if (!empty($xml) and !empty($plugin)) $PLUGIN_MARKUP_MAP[$xml] = $plugin; } Modified: trunk/lib/PageList.php =================================================================== --- trunk/lib/PageList.php 2010-06-09 08:47:52 UTC (rev 7505) +++ trunk/lib/PageList.php 2010-06-09 10:06:37 UTC (rev 7506) @@ -1395,7 +1395,7 @@ return $limit; } if (strstr($limit, ',')) { - list($from, $limit) = split(',', $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")); } Modified: trunk/lib/WikiDB/adodb/drivers/adodb-informix72.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/drivers/adodb-informix72.inc.php 2010-06-09 08:47:52 UTC (rev 7505) +++ trunk/lib/WikiDB/adodb/drivers/adodb-informix72.inc.php 2010-06-09 10:06:37 UTC (rev 7506) @@ -312,7 +312,7 @@ foreach($fp as $k => $v) { $o = new ADOFieldObject; $o->name = $k; - $arr = split(';',$v); //"SQLTYPE;length;precision;scale;ISNULLABLE" + $arr = explode(';', $v); //"SQLTYPE;length;precision;scale;ISNULLABLE" $o->type = $arr[0]; $o->max_length = $arr[1]; $this->_fieldprops[] = $o; @@ -389,4 +389,4 @@ } } -?> \ No newline at end of file +?> Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ldap.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/drivers/adodb-ldap.inc.php 2010-06-09 08:47:52 UTC (rev 7505) +++ trunk/lib/WikiDB/adodb/drivers/adodb-ldap.inc.php 2010-06-09 10:06:37 UTC (rev 7506) @@ -39,7 +39,7 @@ $conn_info = array( $host ); if ( strstr( $host, ':' ) ) { - $conn_info = split( ':', $host ); + $conn_info = explode(':', $host); } $this->_connectionID = ldap_connect( $conn_info[0], $conn_info[1] ) @@ -306,4 +306,4 @@ } } -?> \ No newline at end of file +?> Modified: trunk/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php 2010-06-09 08:47:52 UTC (rev 7505) +++ trunk/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php 2010-06-09 10:06:37 UTC (rev 7506) @@ -571,7 +571,7 @@ if (strlen($db) == 0) $db = 'template1'; $db = adodb_addslashes($db); if ($str) { - $host = split(":", $str); + $host = explode(":", $str); if ($host[0]) $str = "host=".adodb_addslashes($host[0]); else $str = 'host=localhost'; if (isset($host[1])) $str .= " port=$host[1]"; Modified: trunk/lib/WikiDB/backend.php =================================================================== --- trunk/lib/WikiDB/backend.php 2010-06-09 08:47:52 UTC (rev 7505) +++ trunk/lib/WikiDB/backend.php 2010-06-09 10:06:37 UTC (rev 7506) @@ -525,7 +525,7 @@ */ function limit($limit) { if (strstr($limit, ',')) { - list($from, $limit) = split(',', $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")); } Modified: trunk/lib/WikiUser/POP3.php =================================================================== --- trunk/lib/WikiUser/POP3.php 2010-06-09 08:47:52 UTC (rev 7505) +++ trunk/lib/WikiUser/POP3.php 2010-06-09 10:06:37 UTC (rev 7506) @@ -28,7 +28,7 @@ if (defined('POP3_AUTH_PORT')) $port = POP3_AUTH_PORT; elseif (strstr($host,':')) { - list(,$port) = split(':',$host); + list(,$port) = explode(':', $host); } else { $port = 110; } Modified: trunk/lib/WikiUser/Session.php =================================================================== --- trunk/lib/WikiUser/Session.php 2010-06-09 08:47:52 UTC (rev 7505) +++ trunk/lib/WikiUser/Session.php 2010-06-09 10:06:37 UTC (rev 7506) @@ -27,14 +27,14 @@ if (strstr(AUTH_SESS_USER,"][")) { $sess = $GLOBALS['HTTP_SESSION_VARS']; // recurse into hashes: "[user][userid]", sess = sess[user] => sess = sess[userid] - foreach (split("][",AUTH_SESS_USER) as $v) { + foreach (explode("][", AUTH_SESS_USER) as $v) { $v = str_replace(array("[","]"),'',$v); $sess = $sess[$v]; } $this->_userid = $sess; } elseif (strstr(AUTH_SESS_USER,"->")) { // object "user->id" (no objects inside hashes supported!) - list($obj,$key) = split("->",AUTH_SESS_USER); + list($obj,$key) = explode("->", AUTH_SESS_USER); $this->_userid = $sess[$obj]->$key; } else { $this->_userid = $sess[AUTH_SESS_USER]; Modified: trunk/lib/WikiUserNew.php =================================================================== --- trunk/lib/WikiUserNew.php 2010-06-09 08:47:52 UTC (rev 7505) +++ trunk/lib/WikiUserNew.php 2010-06-09 10:06:37 UTC (rev 7506) @@ -1883,7 +1883,7 @@ if ($noconnect) return array(true, sprintf(_("E-Mail address '%s' is properly formatted"), $email)); - list ( $Username, $Domain ) = split ("@", $email); + list ( $Username, $Domain ) = explode("@", $email); //Todo: getmxrr workaround on windows or manual input field to verify it manually if (!isWindows() and getmxrr($Domain, $MXHost)) { // avoid warning on Windows. $ConnectAddress = $MXHost[0]; Modified: trunk/lib/XMLRPC/xmlrpc.inc =================================================================== --- trunk/lib/XMLRPC/xmlrpc.inc 2010-06-09 08:47:52 UTC (rev 7505) +++ trunk/lib/XMLRPC/xmlrpc.inc 2010-06-09 10:06:37 UTC (rev 7506) @@ -201,7 +201,7 @@ */ function xmlrpc_entity_decode($string) { - $top=split('&', $string); + $top=explode('&', $string); $op=''; $i=0; while($i<sizeof($top)) @@ -1500,7 +1500,7 @@ } } // be tolerant to line endings, and extra empty lines - $ar = split("\r?\n", trim(substr($data, 0, $pos))); + $ar = explode("\r?\n", trim(substr($data, 0, $pos))); while (list(,$line) = @each($ar)) { // take care of multi-line headers Modified: trunk/lib/XmlParser.php =================================================================== --- trunk/lib/XmlParser.php 2010-06-09 08:47:52 UTC (rev 7505) +++ trunk/lib/XmlParser.php 2010-06-09 10:06:37 UTC (rev 7506) @@ -92,9 +92,9 @@ $node = new XmlElement($this->_tag); if (is_string($attrs) and !empty($attrs)) { // lowercase attr names - foreach(split(' ',$attrs) as $pair) { + foreach(explode(' ', $attrs) as $pair) { if (strstr($pair,"=")) { - list($key,$val) = split('=',$pair); + list($key,$val) = explode('=', $pair); $key = strtolower(trim($key)); $val = str_replace(array('"',"'"),'',trim($val)); $node->_attr[$key] = $val; Modified: trunk/lib/config.php =================================================================== --- trunk/lib/config.php 2010-06-09 08:47:52 UTC (rev 7505) +++ trunk/lib/config.php 2010-06-09 10:06:37 UTC (rev 7506) @@ -178,7 +178,7 @@ // do the reverse: return the detected locale collapsed to our LANG $locale = setlocale($category, ''); if ($locale) { - if (strstr($locale, '_')) list ($lang) = split('_', $locale); + if (strstr($locale, '_')) list ($lang) = explode('_', $locale); else $lang = $locale; if (strlen($lang) > 2) { foreach ($alt as $try => $locs) { @@ -193,7 +193,7 @@ if (strlen($locale) == 2) $lang = $locale; else - list ($lang) = split('_', $locale); + list ($lang) = explode('_', $locale); if (!isset($alt[$lang])) return false; @@ -228,7 +228,7 @@ $setlocale = guessing_setlocale(LC_ALL, $loc); // [56ms] if (!$setlocale) { // system has no locale for this language, so gettext might fail $setlocale = FileFinder::_get_lang(); - list ($setlocale,) = split('_', $setlocale, 2); + list ($setlocale,) = explode('_', $setlocale, 2); $setlocale = guessing_setlocale(LC_ALL, $setlocale); // try again if (!$setlocale) $setlocale = $loc; } Modified: trunk/lib/plugin/LdapSearch.php =================================================================== --- trunk/lib/plugin/LdapSearch.php 2010-06-09 08:47:52 UTC (rev 7505) +++ trunk/lib/plugin/LdapSearch.php 2010-06-09 10:06:37 UTC (rev 7506) @@ -135,7 +135,7 @@ if (!$attributes) { $res = ldap_search($connect, $basedn, $filter); } else { - $attr_array = split (" ",$attributes); + $attr_array = explode(" ", $attributes); $res = ldap_search($connect, $basedn, $filter, $attr_array); } $entries = ldap_get_entries($connect, $res); Modified: trunk/lib/plugin/ListPages.php =================================================================== --- trunk/lib/plugin/ListPages.php 2010-06-09 08:47:52 UTC (rev 7505) +++ trunk/lib/plugin/ListPages.php 2010-06-09 10:06:37 UTC (rev 7506) @@ -69,7 +69,7 @@ if ($info == 'pagename' and isa($GLOBALS['WikiTheme'], 'wikilens')) $info .= ",top3recs"; if ($info) - $info = split(',', $info); + $info = explode(',', $info); else $info = array(); Modified: trunk/lib/plugin/Template.php =================================================================== --- trunk/lib/plugin/Template.php 2010-06-09 08:47:52 UTC (rev 7505) +++ trunk/lib/plugin/Template.php 2010-06-09 10:06:37 UTC (rev 7506) @@ -210,8 +210,8 @@ $dbi =& $request->_dbi; $var = array(); if (is_string($vars) and !empty($vars)) { - foreach (split("&",$vars) as $pair) { - list($key,$val) = split("=",$pair); + foreach (explode("&", $vars) as $pair) { + list($key,$val) = explode("=", $pair); $var[$key] = $val; } } elseif (is_array($vars)) { Modified: trunk/lib/wikilens/Utils.php =================================================================== --- trunk/lib/wikilens/Utils.php 2010-06-09 08:47:52 UTC (rev 7505) +++ trunk/lib/wikilens/Utils.php 2010-06-09 10:06:37 UTC (rev 7506) @@ -82,7 +82,7 @@ $singles = $pageArray[$p]; $singles = substr($singles, strpos($singles, $START_DELIM) + strlen($START_DELIM)); - $retArray = split($DELIM, $singles); + $retArray = explode($DELIM, $singles); } for ($i = 0; $i < count($retArray); $i++) { $retArray[$i] = trim($retArray[$i]); Modified: trunk/lib/ziplib.php =================================================================== --- trunk/lib/ziplib.php 2010-06-09 08:47:52 UTC (rev 7505) +++ trunk/lib/ziplib.php 2010-06-09 10:06:37 UTC (rev 7506) @@ -767,10 +767,10 @@ return ''; } $hash = array(); - foreach (split(";",trim($string)) as $accessgroup) { - list($access,$groupstring) = split(":",trim($accessgroup)); + foreach (explode(";", trim($string)) as $accessgroup) { + list($access,$groupstring) = explode(":", trim($accessgroup)); $access = trim($access); - $groups = split(",",trim($groupstring)); + $groups = explode(",", trim($groupstring)); foreach ($groups as $group) { $group = trim($group); $bool = (boolean) (substr($group,0,1) != '-'); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ru...@us...> - 2010-06-09 12:08:14
|
Revision: 7510 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7510&view=rev Author: rurban Date: 2010-06-09 12:08:08 +0000 (Wed, 09 Jun 2010) Log Message: ----------- fix cosmetic warnings Modified Paths: -------------- trunk/lib/PageList.php trunk/lib/stdlib.php Modified: trunk/lib/PageList.php =================================================================== --- trunk/lib/PageList.php 2010-06-09 11:35:44 UTC (rev 7509) +++ trunk/lib/PageList.php 2010-06-09 12:08:08 UTC (rev 7510) @@ -843,11 +843,11 @@ function addPages ($page_iter) { // TODO: if limit check max(strlen(pagename)) $limit = $page_iter->limit(); + $i = 0; if ($limit) { list($from, $limit) = $this->limit($limit); $this->_options['slice'] = 0; $limit += $from; - $i = 0; while ($page = $page_iter->next()) { $i++; if ($from and $i < $from) @@ -861,7 +861,7 @@ $this->addPage($page); } } - if (empty($this->_options['count'])) + if ($i and empty($this->_options['count'])) $this->_options['count'] = $i; } @@ -1480,7 +1480,7 @@ $tokens = $this->pagingTokens($count, count($this->_columns), $this->_options['limit']); - if ($tokens and $this->_options['slice']) + if ($tokens and !empty($this->_options['slice'])) $this->_pages = array_slice($this->_pages, $tokens['OFFSET'], $tokens['COUNT']); } foreach ($this->_pages as $pagenum => $page) { Modified: trunk/lib/stdlib.php =================================================================== --- trunk/lib/stdlib.php 2010-06-09 11:35:44 UTC (rev 7509) +++ trunk/lib/stdlib.php 2010-06-09 12:08:08 UTC (rev 7510) @@ -1,4 +1,4 @@ -<?php //// rcs_id('$Id$'); +<?php // rcs_id('$Id$'); /* * Copyright 1999-2008 $ThePhpWikiProgrammingTeam * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2010-06-17 11:35:02
|
Revision: 7541 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7541&view=rev Author: vargenau Date: 2010-06-17 11:34:55 +0000 (Thu, 17 Jun 2010) Log Message: ----------- We assume PHP >= 4.3.10 Modified Paths: -------------- trunk/lib/DbaDatabase.php trunk/lib/HttpClient.php trunk/lib/WikiDB.php trunk/lib/WikiPluginCached.php trunk/lib/XMLRPC/utils.php trunk/lib/XmlElement.php trunk/lib/plugin/SyntaxHighlighter.php trunk/lib/stdlib.php trunk/lib/ziplib.php Modified: trunk/lib/DbaDatabase.php =================================================================== --- trunk/lib/DbaDatabase.php 2010-06-17 10:15:47 UTC (rev 7540) +++ trunk/lib/DbaDatabase.php 2010-06-17 11:34:55 UTC (rev 7541) @@ -50,8 +50,7 @@ $mode = 'r'; } - // lock supported since 4.3.0: - if (check_php_version(4,3,0) and (strlen($mode) == 1)) { + if ((strlen($mode) == 1)) { // PHP 4.3.x Windows lock bug workaround: http://bugs.php.net/bug.php?id=23975 if (isWindows()) { $mode .= "-"; // suppress locking, or Modified: trunk/lib/HttpClient.php =================================================================== --- trunk/lib/HttpClient.php 2010-06-17 10:15:47 UTC (rev 7540) +++ trunk/lib/HttpClient.php 2010-06-17 11:34:55 UTC (rev 7541) @@ -121,8 +121,7 @@ } return false; } - if (check_php_version(4,3,0)) - socket_set_timeout($fp, $this->timeout); + socket_set_timeout($fp, $this->timeout); if ( $this->method == 'POST' and preg_match("/\<methodCall\>/", $this->postdata)) $request = $this->buildRequest("text/xml"); //xmlrpc else if ( $this->method == 'POST' and strstr("\r\nContent-Disposition: form-data; filename=", Modified: trunk/lib/WikiDB.php =================================================================== --- trunk/lib/WikiDB.php 2010-06-17 10:15:47 UTC (rev 7540) +++ trunk/lib/WikiDB.php 2010-06-17 11:34:55 UTC (rev 7541) @@ -275,15 +275,6 @@ */ function getAllPages($include_empty=false, $sortby='', $limit='', $exclude='') { - // HACK: memory_limit=8M will fail on too large pagesets. old php on unix only! - if (USECACHE) { - $mem = ini_get("memory_limit"); - if ($mem and !$limit and !isWindows() and !check_php_version(4,3)) { - $limit = 450; - $GLOBALS['request']->setArg('limit', $limit); - $GLOBALS['request']->setArg('paging', 'auto'); - } - } $result = $this->_backend->get_all_pages($include_empty, $sortby, $limit, $exclude); return new WikiDB_PageIterator($this, $result, @@ -527,12 +518,6 @@ if ($updateWikiLinks) { $lookbehind = "/(?<=[\W:])\Q"; $lookahead = "\E(?=[\W:])/"; - if (!check_php_version(4,3,3)) { - $lookbehind = "/(?<=[\W:])"; - $lookahead = "(?=[\W:])/"; - $from = preg_quote($from, "/"); - $to = preg_quote($to, "/"); - } require_once('lib/plugin/WikiAdminSearchReplace.php'); $links = $oldpage->getBackLinks(); while ($linked_page = $links->next()) { Modified: trunk/lib/WikiPluginCached.php =================================================================== --- trunk/lib/WikiPluginCached.php 2010-06-17 10:15:47 UTC (rev 7540) +++ trunk/lib/WikiPluginCached.php 2010-06-17 11:34:55 UTC (rev 7541) @@ -1119,12 +1119,7 @@ // run "echo $source | $commandLine" and return result function filterThroughCmd($source, $commandLine) { - if (check_php_version(4,3,0)) - return $this->newFilterThroughCmd($source, $commandLine); - elseif (strlen($source) < 255) - return $this->oldFilterThroughCmd($source, $commandLine); - else - return $this->oldFilterThroughCmd_File($source, $commandLine); + return $this->newFilterThroughCmd($source, $commandLine); } /** Modified: trunk/lib/XMLRPC/utils.php =================================================================== --- trunk/lib/XMLRPC/utils.php 2010-06-17 10:15:47 UTC (rev 7540) +++ trunk/lib/XMLRPC/utils.php 2010-06-17 11:34:55 UTC (rev 7541) @@ -211,27 +211,8 @@ $response_buf = ""; if ($host && $uri && $port) { $request_xml = xmlrpc_encode_request($method, $args, $output); - if (isWindows() and !check_php_version(4,3,0)) { - include_once("lib/HttpClient.php"); - $http = new HttpClient($host, $port); - if ($timeout) - $http->timeout = $timeout; - $http->setDebug($debug); - // todo: new auth and/or session cookies - if ($user) - $http->setAuthorization($user, $pass); - if ($cookies) - $http->setCookies($cookies); - if ($http->post($uri, $request_xml)) - $response_buf = $http->content; - else { - $response_buf = $http->errormsg; - return $response_buf; - } - } else { - $response_buf = xu_query_http_post($request_xml, $host, $uri, $port, $debug, - $timeout, $user, $pass, $secure); - } + $response_buf = xu_query_http_post($request_xml, $host, $uri, $port, $debug, + $timeout, $user, $pass, $secure); $retval = find_and_decode_xml($response_buf, $debug); } return $retval; Modified: trunk/lib/XmlElement.php =================================================================== --- trunk/lib/XmlElement.php 2010-06-17 10:15:47 UTC (rev 7540) +++ trunk/lib/XmlElement.php 2010-06-17 11:34:55 UTC (rev 7541) @@ -536,7 +536,7 @@ */ function XmlContent_quote ($string) { if (!$string) return $string; - if (check_php_version(4,1) and isset($GLOBALS['charset']) + if (isset($GLOBALS['charset']) and (!defined('IGNORE_CHARSET_NOT_SUPPORTED_WARNING') or !IGNORE_CHARSET_NOT_SUPPORTED_WARNING)) { return htmlspecialchars($string, ENT_COMPAT, $GLOBALS['charset']); Modified: trunk/lib/plugin/SyntaxHighlighter.php =================================================================== --- trunk/lib/plugin/SyntaxHighlighter.php 2010-06-17 10:15:47 UTC (rev 7540) +++ trunk/lib/plugin/SyntaxHighlighter.php 2010-06-17 11:34:55 UTC (rev 7541) @@ -161,10 +161,7 @@ if (!empty($color)) $args .= " --style $color --inline-css"; if (!empty($style)) $args .= " -F $style"; $commandLine = HIGHLIGHT_EXE . "$args -q -X -f -S $syntax"; - if (check_php_version(4,3,0)) - $code = $this->newFilterThroughCmd($source, $commandLine); - else - $code = $this->oldFilterThroughCmd($source, $commandLine); + $code = $this->newFilterThroughCmd($source, $commandLine); if (empty($code)) return $this->error(fmt("Couldn't start commandline '%s'",$commandLine)); $pre = HTML::pre(HTML::raw($code)); Modified: trunk/lib/stdlib.php =================================================================== --- trunk/lib/stdlib.php 2010-06-17 10:15:47 UTC (rev 7540) +++ trunk/lib/stdlib.php 2010-06-17 11:34:55 UTC (rev 7541) @@ -529,8 +529,6 @@ ; elseif (! preg_match("/\.$force_img$/i", $url)) ; // only valid image extensions or scripts assumed to generate images - elseif (!check_php_version(4,3) and preg_match("/^http.+\.png$/i",$url)) - ; // it's safe to assume that this will fail. elseif (preg_match("/^http/",$url)) { // external url $size = @getimagesize($url); } else { // local file @@ -1050,11 +1048,9 @@ global $WikiNameRegexp, $request; $bang_esc[] = "(?:" . ALLOWED_PROTOCOLS . "):[^\s<>\[\]\"'()]*[^\s<>\[\]\"'(),.?]"; // before 4.3.9 pcre had a memory release bug, which might hit us here. so be safe. - if (check_php_version(4,3,9)) { - $map = getInterwikiMap(); - if ($map_regex = $map->getRegexp()) + $map = getInterwikiMap(); + if ($map_regex = $map->getRegexp()) $bang_esc[] = $map_regex . ":[^\\s.,;?()]+"; // FIXME: is this really needed? - } $bang_esc[] = $WikiNameRegexp; $orig[] = '/!((?:' . join(')|(', $bang_esc) . '))/'; $repl[] = '~\\1'; @@ -1751,7 +1747,7 @@ function isa ($object, $class) { //if (check_php_version(5)) // return $object instanceof $class; - if (check_php_version(4,2) and !check_php_version(5)) + if (!check_php_version(5)) return is_a($object, $class); $lclass = check_php_version(5) ? $class : strtolower($class); Modified: trunk/lib/ziplib.php =================================================================== --- trunk/lib/ziplib.php 2010-06-17 10:15:47 UTC (rev 7540) +++ trunk/lib/ziplib.php 2010-06-17 11:34:55 UTC (rev 7541) @@ -268,10 +268,7 @@ function addSrcFile ($target, $src, $attrib = false) { if (empty($attrib['mtime'])) $attrib = array('mtime' => filemtime($src), 'is_ascii' => 0); - if (check_php_version(4,3)) - $this->addRegularFile($target, file_get_contents($src), $attrib); - else - $this->addRegularFile($target, join('', file($src)), $attrib); + $this->addRegularFile($target, file_get_contents($src), $attrib); } function addRegularFile ($filename, $content, $attrib = false) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2010-06-17 14:09:39
|
Revision: 7546 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7546&view=rev Author: vargenau Date: 2010-06-17 14:09:32 +0000 (Thu, 17 Jun 2010) Log Message: ----------- Remove unused TableUnifiedDiffFormatter Modified Paths: -------------- trunk/lib/diff.php trunk/lib/editpage.php Modified: trunk/lib/diff.php =================================================================== --- trunk/lib/diff.php 2010-06-17 13:50:31 UTC (rev 7545) +++ trunk/lib/diff.php 2010-06-17 14:09:32 UTC (rev 7546) @@ -176,63 +176,6 @@ } } -/** - * HTML table-based unified diff formatter. - * - * This class formats a diff into a table-based - * unified diff format. (Similar to what was produced - * by previous versions of PhpWiki.) - * - * Within groups of changed lines, diffs are highlit - * at the character-diff level. - */ -class TableUnifiedDiffFormatter extends HtmlUnifiedDiffFormatter -{ - function TableUnifiedDiffFormatter($context_lines = 4) { - $this->HtmlUnifiedDiffFormatter($context_lines); - } - - function _start_diff() { - $this->_top = HTML::table(array('width' => '100%', - 'class' => 'diff', - 'cellspacing' => 1, - 'cellpadding' => 1, - 'border' => 1)); - } - - function _start_block($header) { - $this->_block = HTML::table(array('width' => '100%', - 'class' => 'block', - 'cellspacing' => 0, - 'cellpadding' => 1, - 'border' => 0), - HTML::tr(HTML::td(array('colspan' => 2), - HTML::tt($header)))); - } - - function _end_block() { - $this->_top->pushContent(HTML::tr(HTML::td($this->_block))); - unset($this->_block); - } - - function _lines($lines, $class, $prefix = false, $elem = false) { - if (!$prefix) - $prefix = HTML::raw(' '); - $prefix = HTML::td(array('class' => 'prefix', - 'width' => "1%"), $prefix); - foreach ($lines as $line) { - if (! trim($line)) - $line = HTML::raw(' '); - elseif ($elem) - $line = new HtmlElement($elem, $line); - $this->_block->pushContent(HTML::tr(array('valign' => 'top'), - $prefix, - HTML::td(array('class' => $class), - $line))); - } - } -} - ///////////////////////////////////////////////////////////////// function PageInfoRow ($label, $rev, &$request, $is_current = false) Modified: trunk/lib/editpage.php =================================================================== --- trunk/lib/editpage.php 2010-06-17 13:50:31 UTC (rev 7545) +++ trunk/lib/editpage.php 2010-06-17 14:09:32 UTC (rev 7546) @@ -527,10 +527,8 @@ ']')); } else { - // New CSS formatted unified diffs (ugly in NS4). + // New CSS formatted unified diffs $fmt = new HtmlUnifiedDiffFormatter; - // Use this for old table-formatted diffs. - //$fmt = new TableUnifiedDiffFormatter; $html->pushContent($fmt->format($diff)); } return $html; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ru...@us...> - 2010-06-19 20:16:25
|
Revision: 7551 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7551&view=rev Author: rurban Date: 2010-06-19 20:16:19 +0000 (Sat, 19 Jun 2010) Log Message: ----------- Exact Title Search fails with blank page patch 3018192 by Sebastien Le Callonnec plus some more fixes to enable the redirect. whitespace fixes Modified Paths: -------------- trunk/lib/PageList.php trunk/lib/plugin/TitleSearch.php Modified: trunk/lib/PageList.php =================================================================== --- trunk/lib/PageList.php 2010-06-17 15:48:19 UTC (rev 7550) +++ trunk/lib/PageList.php 2010-06-19 20:16:19 UTC (rev 7551) @@ -904,6 +904,13 @@ return false; } + function first() { + if (count($this->_pages) > 0) { + return $this->_pages[0]; + } + return false; + } + function getContent() { // Note that the <caption> element wants inline content. $caption = $this->getCaption(); Modified: trunk/lib/plugin/TitleSearch.php =================================================================== --- trunk/lib/plugin/TitleSearch.php 2010-06-17 15:48:19 UTC (rev 7550) +++ trunk/lib/plugin/TitleSearch.php 2010-06-19 20:16:19 UTC (rev 7551) @@ -1,7 +1,7 @@ <?php // -*-php-*- // rcs_id('$Id$'); /** - * Copyright 1999,2000,2001,2002,2004,2005 $ThePhpWikiProgrammingTeam + * Copyright 1999,2000,2001,2002,2004,2005,2010 $ThePhpWikiProgrammingTeam * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent * * This file is part of PhpWiki. @@ -26,8 +26,8 @@ /** * Display results of pagename search. - * Provides no own input box, just <?plugin-form TitleSearch ?> is enough. - * Fancier Inputforms can be made using WikiForm Rich, to support regex and case_exact args. + * Provides no own input box, just <<TitleSearch>> is enough. + * Fancier Inputforms can be made using <<WikiFormRich>> to support regex and case_exact args. * * If only one pages is found and auto_redirect is true, this page is displayed immediatly, * otherwise the found pagelist is displayed. @@ -58,8 +58,8 @@ 'exclude' => false, 'info' => false, 'case_exact' => false, - 'regex' => 'auto', - 'format' => false, + 'regex' => 'auto', + 'format' => false, )); } // info arg allows multiple columns @@ -79,18 +79,7 @@ $pagelist = new PageList($args['info'], $args['exclude'], $args); $pagelist->addPages($pages); - // this hack will go away - if ($args['format'] == 'livesearch') { - $request->discardOutput(); - $request->buffer_output(false); - echo '<div class="LSRes">'; - echo $pagelist->asXml(); - echo '</div>'; - if (empty($WikiTheme->DUMP_MODE)) { - unset($GLOBALS['ErrorManager']->_postponed_errors); - $request->finish(); - } - } + // Provide an unknown WikiWord link to allow for page creation // when a search returns no results if (!$args['noheader']) { @@ -100,16 +89,15 @@ $s = WikiLink($args['s'], 'auto'); } if ($total) { - $pagelist->setCaption(fmt("Title search results for '%s' (%d total)", $s, $total)); + $pagelist->setCaption(fmt("Title search results for '%s' (%d total)", $s, $total)); } else { $pagelist->setCaption(fmt("Title search results for '%s'", $s)); } } if ($args['auto_redirect'] && ($pagelist->getTotal() == 1)) { - $page = $pages->next(); - return HTML($request->redirect(WikiURL($page->getName(), false, 'absurl'), false), - $pagelist); + $page = $pagelist->first(); + $request->redirect(WikiURL($page->getName(), false, 'absurl'), false); } return $pagelist; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2010-06-26 14:53:27
|
Revision: 7575 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7575&view=rev Author: vargenau Date: 2010-06-26 14:53:21 +0000 (Sat, 26 Jun 2010) Log Message: ----------- No target _top Modified Paths: -------------- trunk/lib/WikiTheme.php trunk/lib/display.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2010-06-26 14:51:42 UTC (rev 7574) +++ trunk/lib/WikiTheme.php 2010-06-26 14:53:21 UTC (rev 7575) @@ -606,8 +606,6 @@ $link->pushContent($this->maybeSplitWikiWord($default_text)); $link->setAttr('class', 'wiki'); } - if ($request->getArg('frame')) - $link->setAttr('target', '_top'); return $link; } @@ -662,8 +660,6 @@ $gbutton->addTooltip(sprintf(_("Google:%s"), $wikiword)); $link->pushContent($gbutton); } - if ($request->getArg('frame')) - $link->setAttr('target', '_top'); return $link; } @@ -1670,8 +1666,6 @@ } if ($class) $this->setAttr('class', $class); - if ($request->getArg('frame')) - $this->setAttr('target', '_top'); if (!empty($options) and is_array($options)) { foreach ($options as $key => $val) $this->setAttr($key, $val); Modified: trunk/lib/display.php =================================================================== --- trunk/lib/display.php 2010-06-26 14:51:42 UTC (rev 7574) +++ trunk/lib/display.php 2010-06-26 14:53:21 UTC (rev 7575) @@ -266,8 +266,6 @@ 'class' => 'backlinks'), $WikiTheme->maybeSplitWikiWord($pagename)); $pageheader->addTooltip(sprintf(_("BackLinks for %s"), $pagename)); - if ($request->getArg('frame')) - $pageheader->setAttr('target', '_top'); } $pagetitle = SplitPagename($pagename); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ru...@us...> - 2010-06-26 22:09:51
|
Revision: 7582 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7582&view=rev Author: rurban Date: 2010-06-26 22:09:45 +0000 (Sat, 26 Jun 2010) Log Message: ----------- Revert r7575 "No target _top" There are target _tops in custom themes, esp. in frame'd wiki's. Modified Paths: -------------- trunk/lib/WikiTheme.php trunk/lib/display.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2010-06-26 19:47:57 UTC (rev 7581) +++ trunk/lib/WikiTheme.php 2010-06-26 22:09:45 UTC (rev 7582) @@ -606,6 +606,8 @@ $link->pushContent($this->maybeSplitWikiWord($default_text)); $link->setAttr('class', 'wiki'); } + if ($request->getArg('frame')) + $link->setAttr('target', '_top'); return $link; } @@ -660,6 +662,8 @@ $gbutton->addTooltip(sprintf(_("Google:%s"), $wikiword)); $link->pushContent($gbutton); } + if ($request->getArg('frame')) + $link->setAttr('target', '_top'); return $link; } @@ -1666,6 +1670,8 @@ } if ($class) $this->setAttr('class', $class); + if ($request->getArg('frame')) + $this->setAttr('target', '_top'); if (!empty($options) and is_array($options)) { foreach ($options as $key => $val) $this->setAttr($key, $val); Modified: trunk/lib/display.php =================================================================== --- trunk/lib/display.php 2010-06-26 19:47:57 UTC (rev 7581) +++ trunk/lib/display.php 2010-06-26 22:09:45 UTC (rev 7582) @@ -266,6 +266,8 @@ 'class' => 'backlinks'), $WikiTheme->maybeSplitWikiWord($pagename)); $pageheader->addTooltip(sprintf(_("BackLinks for %s"), $pagename)); + if ($request->getArg('frame')) + $pageheader->setAttr('target', '_top'); } $pagetitle = SplitPagename($pagename); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2010-06-28 12:33:58
|
Revision: 7588 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7588&view=rev Author: vargenau Date: 2010-06-28 12:33:51 +0000 (Mon, 28 Jun 2010) Log Message: ----------- No border for <img> Modified Paths: -------------- trunk/lib/PageList.php trunk/lib/WikiPluginCached.php trunk/lib/WikiTheme.php trunk/lib/plugin/DynamicIncludePage.php trunk/lib/plugin/PhotoAlbum.php trunk/lib/plugin/RecentChanges.php trunk/lib/plugin/WhoIsOnline.php Modified: trunk/lib/PageList.php =================================================================== --- trunk/lib/PageList.php 2010-06-28 12:32:23 UTC (rev 7587) +++ trunk/lib/PageList.php 2010-06-28 12:33:51 UTC (rev 7588) @@ -148,7 +148,6 @@ $noimg_src = $WikiTheme->getButtonURL('no_order'); if ($noimg_src) $noimg = HTML::img(array('src' => $noimg_src, - 'border' => 0, 'alt' => '.')); else $noimg = $nbsp; @@ -167,7 +166,6 @@ $img->setAttr('alt', "."); } else { $img = HTML::img(array('src' => $src, - 'border' => 0, 'alt' => _("Click to reverse sort order"))); } $s = HTML::a(array('href' => Modified: trunk/lib/WikiPluginCached.php =================================================================== --- trunk/lib/WikiPluginCached.php 2010-06-28 12:32:23 UTC (rev 7587) +++ trunk/lib/WikiPluginCached.php 2010-06-28 12:33:51 UTC (rev 7588) @@ -417,7 +417,6 @@ return HTML(HTML::map(array( 'name' => $key ), $map ), HTML::img( array( 'src' => $url, - 'border' => 0, // 'alt' => htmlspecialchars($this->getAlt($dbi,$argarray,$request)) 'usemap' => '#'.$key )) ); @@ -442,7 +441,6 @@ function embedImg($url, $dbi, $argarray, $request) { return HTML::img( array( 'src' => $url, - 'border' => 0, 'alt' => htmlspecialchars($this->getAlt($dbi, $argarray, $request)) ) ); } Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2010-06-28 12:32:23 UTC (rev 7587) +++ trunk/lib/WikiTheme.php 2010-06-28 12:33:51 UTC (rev 7588) @@ -1715,7 +1715,6 @@ $img_attr['src'] = $img_url; $img_attr['alt'] = $text; $img_attr['class'] = 'wiki-button'; - $img_attr['border'] = 0; $this->pushContent(HTML::img($img_attr)); } }; Modified: trunk/lib/plugin/DynamicIncludePage.php =================================================================== --- trunk/lib/plugin/DynamicIncludePage.php 2010-06-28 12:32:23 UTC (rev 7587) +++ trunk/lib/plugin/DynamicIncludePage.php 2010-06-28 12:33:51 UTC (rev 7588) @@ -74,7 +74,6 @@ 'onclick' => ENABLE_AJAX ? "showHideAsync('".$ajaxuri."','$id')" : "showHideFolder('$id')", - 'border' => 0, 'alt' => _("Click to hide/show"), 'title' => _("Click to hide/show"))); $header = HTML::p(array('class' => 'transclusion-title', Modified: trunk/lib/plugin/PhotoAlbum.php =================================================================== --- trunk/lib/plugin/PhotoAlbum.php 2010-06-28 12:32:23 UTC (rev 7587) +++ trunk/lib/plugin/PhotoAlbum.php 2010-06-28 12:33:51 UTC (rev 7588) @@ -251,7 +251,6 @@ // $params will be used for each <img > tag $params = array('src' => $value["name"], 'src_tile' => $value["name_tile"], - 'border' => "0", 'alt' => ($value["desc"] != "" and in_array("alt", $attributes)) ? $value["desc"] : basename($value["name"])); Modified: trunk/lib/plugin/RecentChanges.php =================================================================== --- trunk/lib/plugin/RecentChanges.php 2010-06-28 12:32:23 UTC (rev 7587) +++ trunk/lib/plugin/RecentChanges.php 2010-06-28 12:33:51 UTC (rev 7588) @@ -605,7 +605,6 @@ //logo click opens the HomePage in the main browser frame global $WikiTheme; $img = HTML::img(array('src' => $WikiTheme->getImageURL('logo'), - 'border' => 0, 'align' => 'right', 'style' => 'height:2.5ex' )); Modified: trunk/lib/plugin/WhoIsOnline.php =================================================================== --- trunk/lib/plugin/WhoIsOnline.php 2010-06-28 12:32:23 UTC (rev 7587) +++ trunk/lib/plugin/WhoIsOnline.php 2010-06-28 12:33:51 UTC (rev 7588) @@ -60,9 +60,7 @@ // todo: check which arguments are really needed in the template. $stats = $this->getStats($dbi,$request,$args['mode']); if ($src = $WikiTheme->getImageURL("whosonline")) - $img = HTML::img(array('src' => $src, - 'alt' => $this->getName(), - 'border' => 0)); + $img = HTML::img(array('src' => $src, 'alt' => $this->getName())); else $img = ''; $other = array(); $other['ONLINE_ICON'] = $img; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2010-07-15 19:22:20
|
Revision: 7617 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7617&view=rev Author: vargenau Date: 2010-07-15 19:22:14 +0000 (Thu, 15 Jul 2010) Log Message: ----------- Protect set_magic_quotes_runtime with PHP version Modified Paths: -------------- trunk/lib/fpdf/chinese.php trunk/lib/fpdf/japanese.php trunk/lib/fpdf.php trunk/lib/nusoap/nusoap.php Modified: trunk/lib/fpdf/chinese.php =================================================================== --- trunk/lib/fpdf/chinese.php 2010-07-15 19:09:00 UTC (rev 7616) +++ trunk/lib/fpdf/chinese.php 2010-07-15 19:22:14 UTC (rev 7617) @@ -322,8 +322,11 @@ $this->_out('<</Type /Encoding /BaseEncoding /WinAnsiEncoding /Differences ['.$diff.']>>'); $this->_out('endobj'); } - $mqr=get_magic_quotes_runtime(); - set_magic_quotes_runtime(0); + + if (!check_php_version(5,3)) { + $mqr=get_magic_quotes_runtime(); + set_magic_quotes_runtime(0); + } foreach($this->FontFiles as $file=>$info) { //Font file embedding @@ -346,7 +349,9 @@ fclose($f); $this->_out('endobj'); } - set_magic_quotes_runtime($mqr); + if (!check_php_version(5,3)) { + set_magic_quotes_runtime($mqr); + } foreach($this->fonts as $k=>$font) { //Font objects @@ -456,4 +461,4 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> \ No newline at end of file +?> Modified: trunk/lib/fpdf/japanese.php =================================================================== --- trunk/lib/fpdf/japanese.php 2010-07-15 19:09:00 UTC (rev 7616) +++ trunk/lib/fpdf/japanese.php 2010-07-15 19:22:14 UTC (rev 7617) @@ -302,8 +302,10 @@ $this->_out('<</Type /Encoding /BaseEncoding /WinAnsiEncoding /Differences ['.$diff.']>>'); $this->_out('endobj'); } - $mqr=get_magic_quotes_runtime(); - set_magic_quotes_runtime(0); + if (!check_php_version(5,3)) { + $mqr=get_magic_quotes_runtime(); + set_magic_quotes_runtime(0); + } foreach($this->FontFiles as $file=>$info) { //Font file embedding $this->_newobj(); @@ -325,7 +327,9 @@ fclose($f); $this->_out('endobj'); } - set_magic_quotes_runtime($mqr); + if (!check_php_version(5,3)) { + set_magic_quotes_runtime($mqr); + } foreach($this->fonts as $k=>$font) { //Font objects $this->_newobj(); Modified: trunk/lib/fpdf.php =================================================================== --- trunk/lib/fpdf.php 2010-07-15 19:09:00 UTC (rev 7616) +++ trunk/lib/fpdf.php 2010-07-15 19:22:14 UTC (rev 7617) @@ -1073,8 +1073,10 @@ $this->_out('<</Type /Encoding /BaseEncoding /WinAnsiEncoding /Differences ['.$diff.']>>'); $this->_out('endobj'); } - $mqr=get_magic_quotes_runtime(); - set_magic_quotes_runtime(0); + if (!check_php_version(5,3)) { + $mqr=get_magic_quotes_runtime(); + set_magic_quotes_runtime(0); + } foreach($this->FontFiles as $file=>$info) { //Font file embedding $this->_newobj(); @@ -1096,7 +1098,9 @@ fclose($f); $this->_out('endobj'); } - set_magic_quotes_runtime($mqr); + if (!check_php_version(5,3)) { + set_magic_quotes_runtime($mqr); + } foreach($this->fonts as $k=>$font) { //Font objects $this->fonts[$k]['n']=$this->n+1; @@ -1558,4 +1562,4 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> \ No newline at end of file +?> Modified: trunk/lib/nusoap/nusoap.php =================================================================== --- trunk/lib/nusoap/nusoap.php 2010-07-15 19:09:00 UTC (rev 7616) +++ trunk/lib/nusoap/nusoap.php 2010-07-15 19:22:14 UTC (rev 7617) @@ -1390,7 +1390,9 @@ if($this->encoding != '' && function_exists('gzdeflate')){ $this->outgoing_payload .= "Accept-Encoding: $this->encoding\r\n". "Connection: close\r\n"; - set_magic_quotes_runtime(0); + if (!check_php_version(5,3)) { + set_magic_quotes_runtime(0); + } } // set soapaction if($this->useSOAPAction){ @@ -1556,7 +1558,9 @@ if(function_exists('gzdeflate')){ $encoding_headers = "Accept-Encoding: $this->encoding\r\n". "Connection: close\r\n"; - set_magic_quotes_runtime(0); + if (!check_php_version(5,3)) { + set_magic_quotes_runtime(0); + } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2010-07-16 08:14:14
|
Revision: 7621 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7621&view=rev Author: vargenau Date: 2010-07-16 08:13:55 +0000 (Fri, 16 Jul 2010) Log Message: ----------- Patch 3024787 by S?\195?\169bastien Le Callonnec: AllPages plugin not working for ?\226?\128?\156AllPages?\226?\128?\157 page Modified Paths: -------------- trunk/lib/PageList.php trunk/lib/WikiDB/backend/ADODB.php trunk/lib/plugin/AllPages.php Modified: trunk/lib/PageList.php =================================================================== --- trunk/lib/PageList.php 2010-07-16 08:01:14 UTC (rev 7620) +++ trunk/lib/PageList.php 2010-07-16 08:13:55 UTC (rev 7621) @@ -90,16 +90,12 @@ $this->_heading = $default_heading; if ($align) { - // align="char" isn't supported by any browsers yet :( - //if (is_array($align)) - // $this->_tdattr = $align; - //else $this->_tdattr['align'] = $align; } } function format ($pagelist, $page_handle, &$revision_handle) { - $nbsp = HTML::raw(' '); + $nbsp = HTML::raw(' '); return HTML::td($this->_tdattr, $nbsp, $this->_getValue($page_handle, $revision_handle), @@ -116,7 +112,7 @@ // old-style heading function heading () { - global $request; + global $request; $nbsp = HTML::raw(' '); // allow sorting? if (1 /* or in_array($this->_field, PageList::sortable_columns())*/) { @@ -157,8 +153,8 @@ $src = $WikiTheme->getButtonURL($desc ? 'asc_order' : 'desc_order'); $reverse = $desc ? _("reverse")." " : ""; } else { - // initially unsorted - $sortby = $pagelist->sortby($colNum, 'get'); + // initially unsorted + $sortby = $pagelist->sortby($colNum, 'get'); } if (!$src) { $img = $noimg; @@ -252,7 +248,7 @@ */ class _PageList_Column_custom extends _PageList_Column { function _PageList_Column_custom($params) { - $this->_pagelist =& $params[3]; + $this->_pagelist =& $params[3]; $this->_PageList_Column($params[0], $params[1], $params[2]); } } @@ -281,8 +277,8 @@ function _getSortableValue ($page_handle, &$revision_handle) { if (!$revision_handle) $revision_handle = $page_handle->getCurrentRevision(true); - return (empty($revision_handle->_data['%content'])) - ? 0 : strlen($revision_handle->_data['%content']); + return (empty($revision_handle->_data['%content'])) + ? 0 : strlen($revision_handle->_data['%content']); } function _getSize($revision_handle) { @@ -300,7 +296,7 @@ } function _getValue ($page_handle, &$revision_handle) { - //FIXME: check if $this is available in the parent (->need_rev) + //FIXME: check if $this is available in the parent (->need_rev) $val = _PageList_Column::_getValue($page_handle, $revision_handle); return $val ? $this->_textIfTrue : $this->_textIfFalse; } @@ -402,23 +398,20 @@ or $revision_handle->_data['%content'] === true)) { $revision_handle = $page_handle->getCurrentRevision(true); } - //if (!empty($pagelist->_sortby) and empty($pagelist->_sortby[$this->_field])) - // unset($revision_handle->_data['%content']); + if ($this->_field == 'hi_content') { if (!empty($revision_handle->_data['%pagedata'])) { $revision_handle->_data['%pagedata']['_cached_html'] = ''; - // PHP Fatal error: Cannot unset string offsets - //unset($revision_handle->_data['%pagedata']['_cached_html']); } $search = $this->search; $score = ''; if (is_object($page_handle) and !empty($page_handle->score)) - $score = $page_handle->score; - elseif (is_array($page_handle) and !empty($page_handle['score'])) - $score = $page_handle['score']; - - $hilight_re = $this->hilight_re; - // use the TextSearchQuery highlighter + $score = $page_handle->score; + elseif (is_array($page_handle) and !empty($page_handle['score'])) + $score = $page_handle['score']; + + $hilight_re = $this->hilight_re; + // use the TextSearchQuery highlighter if ($search and $hilight_re) { $matches = preg_grep("/$hilight_re/i", $revision_handle->getContent()); $html = array(); @@ -431,8 +424,8 @@ return $html; } // Remove special characters so that highlighting works - $search = preg_replace('/^[\^\*]/', '', $search); - $search = preg_replace('/[\^\*]$/', '', $search); + $search = preg_replace('/^[\^\*]/', '', $search); + $search = preg_replace('/[\^\*]$/', '', $search); $c =& $revision_handle->getPackedContent(); if ($search and ($i = strpos(strtolower($c), strtolower($search))) !== false) { $l = strlen($search); @@ -448,8 +441,8 @@ .($score ? sprintf("[%0.1f]",$score):"")))); } else { if (strpos($c," ") !== false) - $c = ""; - else + $c = ""; + else $c = sprintf(_("%s not found"), '»'.$search.'«'); return HTML::div(array('style' => 'font-size:x-small','align'=>'center'), $c." ".($score ? sprintf("[%0.1f]",$score):"")); @@ -468,16 +461,18 @@ ($this->parent->_columns_seen['size'] or !$len) ? "" : ByteFormatter($len, /*$longformat = */true)); } + function _getSortableValue ($page_handle, &$revision_handle) { - if (is_object($page_handle) and !empty($page_handle->score)) - return $page_handle->score; - elseif (is_array($page_handle) and !empty($page_handle['score'])) - return $page_handle['score']; - else - return substr(_PageList_Column::_getValue($page_handle, $revision_handle),0,50); + if (is_object($page_handle) and !empty($page_handle->score)) + return $page_handle->score; + elseif (is_array($page_handle) and !empty($page_handle['score'])) + return $page_handle['score']; + else + return substr(_PageList_Column::_getValue($page_handle, $revision_handle),0,50); } }; + class _PageList_Column_author extends _PageList_Column { function _PageList_Column_author ($field, $default_heading, $align = false) { _PageList_Column::_PageList_Column($field, $default_heading, $align); @@ -540,7 +535,7 @@ } function _getSortableValue ($page_handle, &$revision_handle) { - return $page_handle->getName(); + return $page_handle->getName(); } /** @@ -566,14 +561,14 @@ var $_maxlen = 0; function PageList ($columns = false, $exclude = false, $options = false) { - // unique id per pagelist on each page. - if (!isset($GLOBALS['request']->_pagelist)) - $GLOBALS['request']->_pagelist = 0; - else - $GLOBALS['request']->_pagelist++; - $this->id = $GLOBALS['request']->_pagelist; - if ($GLOBALS['request']->getArg('count')) - $options['count'] = $GLOBALS['request']->getArg('count'); + // unique id per pagelist on each page. + if (!isset($GLOBALS['request']->_pagelist)) + $GLOBALS['request']->_pagelist = 0; + else + $GLOBALS['request']->_pagelist++; + $this->id = $GLOBALS['request']->_pagelist; + if ($GLOBALS['request']->getArg('count')) + $options['count'] = $GLOBALS['request']->getArg('count'); if ($options) $this->_options = $options; @@ -587,9 +582,9 @@ 'most' => array('pagename','mtime','author','hits'), 'some' => array('pagename','mtime','author') ); - if (isset($this->_options['listtype']) - and $this->_options['listtype'] == 'dl') - $this->_options['nopage'] = 1; + if (isset($this->_options['listtype']) + and $this->_options['listtype'] == 'dl') + $this->_options['nopage'] = 1; if ($columns) { if (!is_array($columns)) $columns = explode(',', $columns); @@ -603,18 +598,18 @@ if (empty($this->_options['nopage']) and !in_array('pagename',$columns)) $this->_addColumn('pagename'); foreach ($columns as $col) { - if (!empty($col)) - $this->_addColumn($col); + if (!empty($col)) + $this->_addColumn($col); } unset($col); } // If 'pagename' is already present, _addColumn() will not add it again - if (empty($this->_options['nopage'])) - $this->_addColumn('pagename'); + if (empty($this->_options['nopage'])) + $this->_addColumn('pagename'); - if (!empty($this->_options['types'])) { + if (!empty($this->_options['types'])) { foreach ($this->_options['types'] as $type) { - $this->_types[$type->_field] = $type; + $this->_types[$type->_field] = $type; $this->_addColumn($type->_field); } unset($this->_options['types']); @@ -631,32 +626,32 @@ $this->_options['sortby'] = $request->getArg('sortby'); } // plugin options if (!empty($options['sortby'])) { - if (empty($this->_options['sortby'])) - $this->_options['sortby'] = $options['sortby']; + if (empty($this->_options['sortby'])) + $this->_options['sortby'] = $options['sortby']; $this->sortby($options['sortby'], 'init'); - } // global options - if (!isset($request->args["id"]) and $request->getArg('sortby') - and empty($this->_options['sortby'])) - { - $this->_options['sortby'] = $request->getArg('sortby'); + } // global options + if (!isset($request->args["id"]) and $request->getArg('sortby') + and empty($this->_options['sortby'])) + { + $this->_options['sortby'] = $request->getArg('sortby'); $this->sortby($this->_options['sortby'], 'init'); - } - // same as above but without the special sortby push, and mutually exclusive (elseif) + } + // same as above but without the special sortby push, and mutually exclusive (elseif) foreach ($this->pagingArgs() as $key) { - if ($key == 'sortby') continue; + if ($key == 'sortby') continue; if (($this->id == $request->getArg("id")) and $request->getArg($key)) { $this->_options[$key] = $request->getArg($key); } // plugin options elseif (!empty($options) and !empty($options[$key])) { - $this->_options[$key] = $options[$key]; - } // global options - elseif (!isset($request->args["id"]) and $request->getArg($key)) { - $this->_options[$key] = $request->getArg($key); - } - else - $this->_options[$key] = false; + $this->_options[$key] = $options[$key]; + } // global options + elseif (!isset($request->args["id"]) and $request->getArg($key)) { + $this->_options[$key] = $request->getArg($key); + } + else + $this->_options[$key] = false; } if ($exclude) { if (is_string($exclude) and !is_array($exclude)) @@ -678,7 +673,7 @@ /* what columns, what pages */ 'info' => 'pagename', 'exclude' => '', // also wildcards, comma-seperated lists - // and <!plugin-list !> arrays + // and <!plugin-list !> arrays /* select pages by meta-data: */ 'author' => false, // current user by [] 'owner' => false, // current user by [] @@ -686,17 +681,17 @@ /* for the sort buttons in <th> */ 'sortby' => '', // same as for WikiDB::getAllPages - // (unsorted is faster) + // (unsorted is faster) /* PageList pager options: * These options may also be given to _generate(List|Table) later * But limit and offset might help the query WikiDB::getAllPages() */ 'limit' => 50, // number of rows (pagesize) - 'paging' => 'auto', // 'auto' top + bottom rows if applicable - // // 'top' top only if applicable - // // 'bottom' bottom only if applicable - // // 'none' don't page at all + 'paging' => 'auto', // 'auto' top + bottom rows if applicable + // // 'top' top only if applicable + // // 'bottom' bottom only if applicable + // // 'none' don't page at all // (TODO: clarify what if $paging==false ?) /* list-style options (with single pagename column only so far) */ @@ -704,30 +699,35 @@ 'azhead' => 0, // 1: group by initials // 2: provide shortcut links to initials also 'comma' => 0, // condensed comma-seperated list, - // 1 if without links, 2 if with + // 1 if without links, 2 if with 'commasep' => false, // Default: ', ' 'listtype' => '', // ul (default), ol, dl, comma 'ordered' => false, // OL or just UL lists (ignored for comma) - 'linkmore' => '', // If count>0 and limit>0 display a link with - // the number of all results, linked to the given pagename. - - 'nopage' => false, // for info=col omit the pagename column - // array_keys($this->_types). filter by columns: e.g. locked=1 - 'pagename' => null, // string regex - 'locked' => null, - 'minor' => null, - 'mtime' => null, - 'hits' => null, - 'size' => null, - 'version' => null, - 'markup' => null, - 'external' => null, + 'linkmore' => '', // If count>0 and limit>0 display a link with + // the number of all results, linked to the given pagename. + + 'nopage' => false, // for info=col omit the pagename column + // array_keys($this->_types). filter by columns: e.g. locked=1 + 'pagename' => null, // string regex + 'locked' => null, + 'minor' => null, + 'mtime' => null, + 'hits' => null, + 'size' => null, + 'version' => null, + 'markup' => null, + 'external' => null, ); } function pagingArgs() { - return array('sortby','limit','paging','count','dosort'); + return array('sortby','limit','paging','count','dosort'); } + + function clearArg($arg_name) { + if (isset($this->_options[$arg_name])) + unset($this->_options[$arg_name]); + } /** * @param caption string or HTML @@ -756,8 +756,8 @@ function getTotal () { - return !empty($this->_options['count']) - ? (integer) $this->_options['count'] : count($this->_pages); + return !empty($this->_options['count']) + ? (integer) $this->_options['count'] : count($this->_pages); } function isEmpty () { @@ -765,7 +765,7 @@ } function addPage($page_handle) { - if (!empty($this->_excluded_pages)) { + if (!empty($this->_excluded_pages)) { if (!in_array((is_string($page_handle) ? $page_handle : $page_handle->getName()), $this->_excluded_pages)) $this->_pages[] = $page_handle; @@ -776,11 +776,11 @@ function pageNames() { $pages = array(); - $limit = @$this->_options['limit']; + $limit = @$this->_options['limit']; foreach ($this->_pages as $page_handle) { $pages[] = $page_handle->getName(); - if ($limit and count($pages) > $limit) - break; + if ($limit and count($pages) > $limit) + break; } return $pages; } @@ -788,7 +788,6 @@ function _getPageFromHandle($page_handle) { if (is_string($page_handle)) { if (empty($page_handle)) return $page_handle; - //$dbi = $GLOBALS['request']->getDbh(); // no, safe some memory! $page_handle = $GLOBALS['request']->_dbi->getPage($page_handle); } return $page_handle; @@ -824,15 +823,15 @@ $row = HTML::tr(array('class' => $class)); $j = 0; foreach ($this->_columns as $col) { - $col->current_row = $i; - $col->current_column = $j; + $col->current_row = $i; + $col->current_column = $j; $row->pushContent($col->format($this, $page_handle, $revision_handle)); $j++; } } else { $col = $this->_columns[0]; - $col->current_row = $i; - $col->current_column = 0; + $col->current_row = $i; + $col->current_column = 0; $row = $col->_getValue($page_handle, $revision_handle); } @@ -918,8 +917,7 @@ if ($this->isEmpty()) return $this->_emptyList($caption); elseif (isset($this->_options['listtype']) - and in_array($this->_options['listtype'], - array('ol','ul','comma','dl'))) + and in_array($this->_options['listtype'], array('ol','ul','comma','dl'))) return $this->_generateList($caption); elseif (count($this->_columns) == 1) return $this->_generateList($caption); @@ -954,9 +952,8 @@ if (empty($column)) return ''; if (is_int($column)) { $column = $this->_columns[$column - 1]->_field; - //$column = $col->_field; } - //if (!is_string($column)) return ''; + // support multiple comma-delimited sortby args: "+hits,+pagename" // recursive concat if (strstr($column, ',')) { @@ -994,13 +991,12 @@ return $order . $column; } elseif ($action == 'flip_order') { if (0 and DEBUG) - trigger_error("flip $order $column ".$this->id, E_USER_NOTICE); + trigger_error("flip $order $column ".$this->id, E_USER_NOTICE); return ($order == '+' ? '-' : '+') . $column; } elseif ($action == 'init') { // only allowed from PageList::PageList if (0 and DEBUG) { if ($this->sortby($column, 'clicked')) { - trigger_error("clicked $order $column $this->id", E_USER_NOTICE); - //$order = ($order == '+' ? '-' : '+'); // $this->sortby($sortby, 'flip_order'); + trigger_error("clicked $order $column $this->id", E_USER_NOTICE); } } $this->_sortby[$column] = $order; // forces show icon @@ -1011,7 +1007,7 @@ if (0 and $show and DEBUG) { trigger_error("show $order $column ".$this->id, E_USER_NOTICE); } - return $show; + return $show; } elseif ($action == 'clicked') { // flip sort order? global $request; $arg = $request->getArg('sortby'); @@ -1058,15 +1054,6 @@ $pages[] = trim($pagehandle->getName()); } return $pages; - /* - //TODO: need an SQL optimization here - $allPagehandles = $dbi->getAllPages($include_empty, $sortby, $limit, - $exclude); - while ($pagehandle = $allPagehandles->next()) { - $allPages[] = $pagehandle->getName(); - } - return explodeList($input, $allPages); - */ } else { //TODO: do the sorting, normally not needed if used for exclude only return array_map("trim", explode(',', $input)); @@ -1279,10 +1266,9 @@ * @return true if column is added, false otherwise */ function _addColumn ($column) { - if (isset($this->_columns_seen[$column])) return false; // Already have this one. - if (!isset($this->_types[$column])) + if (!isset($this->_types[$column])) $this->_initAvailableColumns(); $this->_columns_seen[$column] = true; @@ -1295,7 +1281,6 @@ $silently_ignore = array('numbacklinks', 'rating','ratingvalue', 'coagreement', 'minmisery', - /*'prediction',*/ 'averagerating', 'top3recs', 'relation', 'linkto'); if (!in_array($column, $silently_ignore)) @@ -1321,8 +1306,8 @@ * @param $col object An object derived from _PageList_Column. **/ function addColumnObject($col) { - if (is_array($col)) {// custom column object - $params =& $col; + if (is_array($col)) {// custom column object + $params =& $col; $class_name = array_shift($params); $params[3] =& $this; $col = new $class_name($params); @@ -1349,7 +1334,7 @@ $pageb = $this->_getPageFromHandle($b); // If a string, convert to page assert(isa($pageb, 'WikiDB_Page')); foreach ($this->_sortby as $colNum => $direction) { - // get column type object + // get column type object if (!is_int($colNum)) { // or column fieldname if (isset($this->_columnsMap[$colNum])) $col = $this->_columns[$this->_columnsMap[$colNum] - 1]; @@ -1391,15 +1376,14 @@ $need_sort = true; } if ($need_sort) { // There are some columns to sort by - // TODO: consider nopage + // TODO: consider nopage usort($this->_pages, array($this, '_pageCompare')); } } - //unset($GLOBALS['PhpWiki_pagelist']); } function limit($limit) { - if (is_array($limit)) { + 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")); @@ -1485,9 +1469,9 @@ $i = 0; $count = $this->getTotal(); $do_paging = ( isset($this->_options['paging']) - and !empty($this->_options['limit']) - and $count - and $this->_options['paging'] != 'none' ); + and !empty($this->_options['limit']) + and $count + and $this->_options['paging'] != 'none' ); if ($do_paging) { $tokens = $this->pagingTokens($count, count($this->_columns), @@ -1503,11 +1487,10 @@ 'cellspacing' => 1, 'border' => 0, 'width' => '100%', - 'class' => 'pagelist', - )); + 'class' => 'pagelist')); if ($caption) { $table->pushContent(HTML::caption(array('align'=>'top'), $caption)); - } + } $row = HTML::tr(); $table_summary = array(); @@ -1518,7 +1501,6 @@ and isset($col->_field) and $col->_field == 'pagename' and ($maxlen = $this->maxLen())) { - // $heading->setAttr('width', $maxlen * 7); } $row->pushContent($heading); if (is_string($col->getHeading())) @@ -1562,8 +1544,8 @@ $this->_stack->push($stack); } function _restoreOptions() { - assert($this->_stack); - $stack = $this->_stack->pop(); + assert($this->_stack); + $stack = $this->_stack->pop(); $this->_pages = $stack['pages']; unset($stack['pages']); foreach ($stack as $k => $v) { @@ -1577,27 +1559,28 @@ // 'comma' - condensed comma-list only, 1: no links, >1: with links // FIXME: only unique list entries, esp. with nopage function _generateList($caption='') { - if (empty($this->_pages)) return; // stop recursion - if (!isset($this->_options['listtype'])) - $this->_options['listtype'] = ''; - foreach ($this->_pages as $pagenum => $page) { - $one_row = $this->_renderPageRow($page); + if (empty($this->_pages)) return; // stop recursion + if (!isset($this->_options['listtype'])) + $this->_options['listtype'] = ''; + foreach ($this->_pages as $pagenum => $page) { + $one_row = $this->_renderPageRow($page); $rows[] = array('header' => WikiLink($page), 'render' => $one_row); - } + } $out = HTML(); if ($caption) { $out->pushContent(HTML::p($caption)); } - // Semantic Search et al: only unique list entries, esp. with nopage - if (!is_array($this->_pages[0]) and is_string($this->_pages[0])) { - $this->_pages = array_unique($this->_pages); - } + + // Semantic Search et al: only unique list entries, esp. with nopage + if (!is_array($this->_pages[0]) and is_string($this->_pages[0])) { + $this->_pages = array_unique($this->_pages); + } if (count($this->_sortby) > 0) $this->_sortPages(); - $count = $this->getTotal(); + $count = $this->getTotal(); $do_paging = ( isset($this->_options['paging']) - and !empty($this->_options['limit']) - and $count - and $this->_options['paging'] != 'none' ); + and !empty($this->_options['limit']) + and $count + and $this->_options['paging'] != 'none' ); if ( $do_paging ) { $tokens = $this->pagingTokens($count, count($this->_columns), @@ -1632,8 +1615,7 @@ } // speed up table rendering by defining colgroups $out->pushContent(HTML::table(HTML::colgroup - (array('span' => $this->_options['cols'], - 'width' => $width)), + (array('span' => $this->_options['cols'], 'width' => $width)), $cols)); return $out; } @@ -1668,7 +1650,7 @@ } return $out; } - + if ($this->_options['listtype'] == 'comma') $this->_options['comma'] = 2; if (!empty($this->_options['comma'])) { @@ -1686,29 +1668,28 @@ } elseif ($this->_options['listtype'] == 'ul') $this->_options['ordered'] = 0; if ($this->_options['listtype'] == 'ol' and !empty($this->_options['ordered'])) { - $list = HTML::ol(array('class' => 'pagelist', - 'start' => $this->_options['ordered'])); + $list = HTML::ol(array('class' => 'pagelist', + 'start' => $this->_options['ordered'])); } elseif ($this->_options['listtype'] == 'dl') { $list = HTML::dl(array('class' => 'pagelist')); - } else { + } else { $list = HTML::ul(array('class' => 'pagelist')); - } + } $i = 0; //TODO: currently we ignore limit here and hope that the backend didn't ignore it. (BackLinks) if (!empty($this->_options['limit'])) list($offset, $pagesize) = $this->limit($this->_options['limit']); - else - $pagesize=0; - foreach (array_reverse($rows) as $one_row) { - $pagehtml = $one_row['render']; + else + $pagesize=0; + foreach (array_reverse($rows) as $one_row) { + $pagehtml = $one_row['render']; if (!$pagehtml) continue; $group = ($i++ / $this->_group_rows); //TODO: here we switch every row, in tables every third. // unification or parametrized? $class = ($group % 2) ? 'oddrow' : 'evenrow'; if ($this->_options['listtype'] == 'dl') { - $header = $one_row['header']; - //if ($this->_sortby['hi_content']) + $header = $one_row['header']; $list->pushContent(HTML::dt(array('class' => $class), $header), HTML::dd(array('class' => $class), $pagehtml)); } else @@ -1727,15 +1708,15 @@ // Alternative $seperator = HTML::Raw(' · ') // FIXME: only unique list entries, esp. with nopage function _generateCommaListAsString() { - if (defined($this->_options['commasep'])) - $seperator = $this->_options['commasep']; - else - $seperator = ', '; - $pages = array(); - foreach ($this->_pages as $pagenum => $page) { - if ($s = $this->_renderPageRow($page)) // some pages are not viewable - $pages[] = is_string($s) ? $s : $s->asString(); - } + if (defined($this->_options['commasep'])) + $seperator = $this->_options['commasep']; + else + $seperator = ', '; + $pages = array(); + foreach ($this->_pages as $pagenum => $page) { + if ($s = $this->_renderPageRow($page)) // some pages are not viewable + $pages[] = is_string($s) ? $s : $s->asString(); + } return HTML(join($seperator, $pages)); } @@ -1745,17 +1726,17 @@ // 2 and more => HTML link specialization? // FIXME: only unique list entries, esp. with nopage function _generateCommaList($style = false) { - if (defined($this->_options['commasep'])) - $seperator = HTLM::Raw($this->_options['commasep']); - else - $seperator = ', '; - $html = HTML(); + if (defined($this->_options['commasep'])) + $seperator = HTLM::Raw($this->_options['commasep']); + else + $seperator = ', '; + $html = HTML(); $html->pushContent($this->_renderPageRow($this->_pages[0])); next($this->_pages); - foreach ($this->_pages as $pagenum => $page) { - if ($s = $this->_renderPageRow($page)) // some pages are not viewable + foreach ($this->_pages as $pagenum => $page) { + if ($s = $this->_renderPageRow($page)) // some pages are not viewable $html->pushContent($seperator, $s); - } + } return $html; } Modified: trunk/lib/WikiDB/backend/ADODB.php =================================================================== --- trunk/lib/WikiDB/backend/ADODB.php 2010-07-16 08:01:14 UTC (rev 7620) +++ trunk/lib/WikiDB/backend/ADODB.php 2010-07-16 08:13:55 UTC (rev 7621) @@ -828,10 +828,13 @@ extract($this->_table_names); $orderby = $this->sortby($sortby, 'db'); if ($orderby) $orderby = ' ORDER BY ' . $orderby; - if ($exclude) // array of pagenames - $exclude = " AND $page_tbl.pagename NOT IN ".$this->_sql_set($exclude); - else + $and = ''; + if ($exclude) {// array of pagenames + $and = ' AND '; + $exclude = " $page_tbl.pagename NOT IN ".$this->_sql_set($exclude); + } else { $exclude=''; + } //$dbh->SetFetchMode(ADODB_FETCH_ASSOC); if (strstr($orderby, 'mtime ')) { // was ' mtime' @@ -841,7 +844,7 @@ ." FROM $page_tbl, $recent_tbl, $version_tbl" . " WHERE $page_tbl.id=$recent_tbl.id" . " AND $page_tbl.id=$version_tbl.id AND latestversion=version" - . $exclude + . " $and$exclude" . $orderby; } else { @@ -851,7 +854,7 @@ . " WHERE $nonempty_tbl.id=$page_tbl.id" . " AND $page_tbl.id=$recent_tbl.id" . " AND $page_tbl.id=$version_tbl.id AND latestversion=version" - . $exclude + . " $and$exclude" . $orderby; } } else { @@ -866,7 +869,7 @@ . $this->page_tbl_fields . " FROM $nonempty_tbl, $page_tbl" . " WHERE $nonempty_tbl.id=$page_tbl.id" - . $exclude + . " $and$exclude" . $orderby; } } Modified: trunk/lib/plugin/AllPages.php =================================================================== --- trunk/lib/plugin/AllPages.php 2010-07-16 08:01:14 UTC (rev 7620) +++ trunk/lib/plugin/AllPages.php 2010-07-16 08:13:55 UTC (rev 7621) @@ -67,17 +67,18 @@ $timer = new DebugTimer; } $caption = _("All pages in this wiki (%d total):"); + $exclude_empty_pagename = array(''); if ( !empty($args['userpages']) ) { $pages = PageList::allUserPages($args['include_empty'], - $args['sortby'], '' - ); + $args['sortby'], '', + $exclude_empty_pagename); $caption = _("List of user-created pages (%d total):"); $args['count'] = $request->getArg('count'); } elseif ( !empty($args['owner']) ) { $pages = PageList::allPagesByOwner($args['owner'], $args['include_empty'], - $args['sortby'], '' - ); + $args['sortby'], '', + $exclude_empty_pagename); $args['count'] = $request->getArg('count'); if (!$args['count']) $args['count'] = $dbi->numPages($args['include_empty'], $args['exclude']); @@ -89,8 +90,8 @@ $pages->_options['count'] = $args['count']; } elseif ( !empty($args['author']) ) { $pages = PageList::allPagesByAuthor($args['author'], $args['include_empty'], - $args['sortby'], '' - ); + $args['sortby'], '', + $exclude_empty_pagename); $args['count'] = $request->getArg('count'); if (!$args['count']) $args['count'] = $dbi->numPages($args['include_empty'], $args['exclude']); @@ -102,7 +103,8 @@ $pages->_options['count'] = $args['count']; } elseif ( !empty($args['creator']) ) { $pages = PageList::allPagesByCreator($args['creator'], $args['include_empty'], - $args['sortby'], '' + $args['sortby'], '', + $exclude_empty_pagename ); $args['count'] = $request->getArg('count'); if (!$args['count']) @@ -113,8 +115,6 @@ : $args['creator'], 'if_known'), $args['count']); $pages->_options['count'] = $args['count']; - //} elseif ($pages) { - // $args['count'] = count($pages); } else { if (! $request->getArg('count')) $args['count'] = $dbi->numPages($args['include_empty'], $args['exclude']); @@ -126,15 +126,17 @@ $pagelist = new PageList($args['info'], $args['exclude'], $args); if (!$args['noheader']) $pagelist->setCaption($caption); - // deleted pages show up as version 0. - //if ($args['include_empty']) - // $pagelist->_addColumn('version'); - - if ($pages !== false) + if ($pages !== false) { $pagelist->addPageList($pages); - else - $pagelist->addPages( $dbi->getAllPages($args['include_empty'], $args['sortby'], - $args['limit']) ); + } + else { + // Clear count as previous value was for non-empty pages. + $pagelist->clearArg('count'); + $pagelist->addPages($dbi->getAllPages($args['include_empty'], + $args['sortby'], + $args['limit'], + $exclude_empty_pagename)); + } if (DEBUG && $args['debug']) { return HTML($pagelist, HTML::p(fmt("Elapsed time: %s s", $timer->getStats()))); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2010-08-11 12:15:25
|
Revision: 7639 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7639&view=rev Author: vargenau Date: 2010-08-11 12:15:16 +0000 (Wed, 11 Aug 2010) Log Message: ----------- Harmonize file footer Modified Paths: -------------- trunk/lib/AccessLog.php trunk/lib/WikiDB/adodb/adodb.inc.php trunk/lib/WikiPluginCached.php trunk/lib/pear/DB/common.php trunk/lib/pear/DB/dbase.php trunk/lib/pear/DB/fbsql.php trunk/lib/pear/DB/ibase.php trunk/lib/pear/DB/ifx.php trunk/lib/pear/DB/ldap.php trunk/lib/pear/DB/msql.php trunk/lib/pear/DB/mssql.php trunk/lib/pear/DB/mysql.php trunk/lib/pear/DB/mysqli.php trunk/lib/pear/DB/oci8.php trunk/lib/pear/DB/odbc.php trunk/lib/pear/DB/pgsql.php trunk/lib/pear/DB/sqlite.php trunk/lib/pear/DB/storage.php trunk/lib/pear/DB/sybase.php trunk/lib/pear/DB.php trunk/lib/pear/PEAR.php trunk/lib/plugin/CacheTest.php trunk/lib/plugin/FacebookLike.php trunk/lib/plugin/RecentChangesCached.php trunk/lib/plugin/TexToPng.php trunk/lib/plugin/Video.php trunk/lib/plugin/text2png.php Modified: trunk/lib/AccessLog.php =================================================================== --- trunk/lib/AccessLog.php 2010-08-11 11:58:40 UTC (rev 7638) +++ trunk/lib/AccessLog.php 2010-08-11 12:15:16 UTC (rev 7639) @@ -730,10 +730,10 @@ } // Local Variables: -// mode: php -// tab-width: 8 -// c-basic-offset: 4 -// c-hanging-comment-ender-p: nil -// indent-tabs-mode: nil +// mode: php +// tab-width: 8 +// c-basic-offset: 4 +// c-hanging-comment-ender-p: nil +// indent-tabs-mode: nil // End: ?> Modified: trunk/lib/WikiDB/adodb/adodb.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/adodb.inc.php 2010-08-11 11:58:40 UTC (rev 7638) +++ trunk/lib/WikiDB/adodb/adodb.inc.php 2010-08-11 12:15:16 UTC (rev 7639) @@ -12,1958 +12,1958 @@ */ /** - \mainpage + \mainpage - @version V4.22 15 Apr 2004 (c) 2000-2004 John Lim (jlim\@natsoft.com.my). All rights reserved. + @version V4.22 15 Apr 2004 (c) 2000-2004 John Lim (jlim\@natsoft.com.my). All rights reserved. - Released under both BSD license and Lesser GPL library license. You can choose which license - you prefer. + Released under both BSD license and Lesser GPL library license. You can choose which license + you prefer. - PHP's database access functions are not standardised. This creates a need for a database - class library to hide the differences between the different database API's (encapsulate - the differences) so we can easily switch databases. + PHP's database access functions are not standardised. This creates a need for a database + class library to hide the differences between the different database API's (encapsulate + the differences) so we can easily switch databases. - We currently support MySQL, Oracle, Microsoft SQL Server, Sybase, Sybase SQL Anywhere, DB2, - Informix, PostgreSQL, FrontBase, Interbase (Firebird and Borland variants), Foxpro, Access, - ADO, SAP DB, SQLite and ODBC. We have had successful reports of connecting to Progress and - other databases via ODBC. + We currently support MySQL, Oracle, Microsoft SQL Server, Sybase, Sybase SQL Anywhere, DB2, + Informix, PostgreSQL, FrontBase, Interbase (Firebird and Borland variants), Foxpro, Access, + ADO, SAP DB, SQLite and ODBC. We have had successful reports of connecting to Progress and + other databases via ODBC. - Latest Download at http://php.weblogs.com/adodb<br> - Manual is at http://php.weblogs.com/adodb_manual + Latest Download at http://php.weblogs.com/adodb<br> + Manual is at http://php.weblogs.com/adodb_manual */ if (!defined('_ADODB_LAYER')) { - define('_ADODB_LAYER',1); + define('_ADODB_LAYER',1); - //========================================================================== - // CONSTANT DEFINITIONS - //========================================================================== + //========================================================================== + // CONSTANT DEFINITIONS + //========================================================================== - /** - * Set ADODB_DIR to the directory where this file resides... - * This constant was formerly called $ADODB_RootPath - */ - if (!defined('ADODB_DIR')) define('ADODB_DIR',dirname(__FILE__)); + /** + * Set ADODB_DIR to the directory where this file resides... + * This constant was formerly called $ADODB_RootPath + */ + if (!defined('ADODB_DIR')) define('ADODB_DIR',dirname(__FILE__)); - //========================================================================== - // GLOBAL VARIABLES - //========================================================================== + //========================================================================== + // GLOBAL VARIABLES + //========================================================================== - GLOBAL - $ADODB_vers, // database version - $ADODB_COUNTRECS, // count number of records returned - slows down query - $ADODB_CACHE_DIR, // directory to cache recordsets - $ADODB_EXTENSION, // ADODB extension installed - $ADODB_COMPAT_PATCH, // If $ADODB_COUNTRECS and this is true, $rs->fields is available on EOF - $ADODB_FETCH_MODE; // DEFAULT, NUM, ASSOC or BOTH. Default follows native driver default... + GLOBAL + $ADODB_vers, // database version + $ADODB_COUNTRECS, // count number of records returned - slows down query + $ADODB_CACHE_DIR, // directory to cache recordsets + $ADODB_EXTENSION, // ADODB extension installed + $ADODB_COMPAT_PATCH, // If $ADODB_COUNTRECS and this is true, $rs->fields is available on EOF + $ADODB_FETCH_MODE; // DEFAULT, NUM, ASSOC or BOTH. Default follows native driver default... - //========================================================================== - // GLOBAL SETUP - //========================================================================== + //========================================================================== + // GLOBAL SETUP + //========================================================================== - $ADODB_EXTENSION = defined('ADODB_EXTENSION'); - if (!$ADODB_EXTENSION || ADODB_EXTENSION < 4.0) { + $ADODB_EXTENSION = defined('ADODB_EXTENSION'); + if (!$ADODB_EXTENSION || ADODB_EXTENSION < 4.0) { - define('ADODB_BAD_RS','<p>Bad $rs in %s. Connection or SQL invalid. Try using $connection->debug=true;</p>'); + define('ADODB_BAD_RS','<p>Bad $rs in %s. Connection or SQL invalid. Try using $connection->debug=true;</p>'); - // allow [ ] @ ` " and . in table names - define('ADODB_TABLE_REGEX','([]0-9a-z_\"\`\.\@\[-]*)'); + // allow [ ] @ ` " and . in table names + define('ADODB_TABLE_REGEX','([]0-9a-z_\"\`\.\@\[-]*)'); - // prefetching used by oracle - if (!defined('ADODB_PREFETCH_ROWS')) define('ADODB_PREFETCH_ROWS',10); + // prefetching used by oracle + if (!defined('ADODB_PREFETCH_ROWS')) define('ADODB_PREFETCH_ROWS',10); - /* - Controls ADODB_FETCH_ASSOC field-name case. Default is 2, use native case-names. - This currently works only with mssql, odbc, oci8po and ibase derived drivers. + /* + Controls ADODB_FETCH_ASSOC field-name case. Default is 2, use native case-names. + This currently works only with mssql, odbc, oci8po and ibase derived drivers. - 0 = assoc lowercase field names. $rs->fields['orderid'] - 1 = assoc uppercase field names. $rs->fields['ORDERID'] - 2 = use native-case field names. $rs->fields['OrderID'] - */ + 0 = assoc lowercase field names. $rs->fields['orderid'] + 1 = assoc uppercase field names. $rs->fields['ORDERID'] + 2 = use native-case field names. $rs->fields['OrderID'] + */ - define('ADODB_FETCH_DEFAULT',0); - define('ADODB_FETCH_NUM',1); - define('ADODB_FETCH_ASSOC',2); - define('ADODB_FETCH_BOTH',3); + define('ADODB_FETCH_DEFAULT',0); + define('ADODB_FETCH_NUM',1); + define('ADODB_FETCH_ASSOC',2); + define('ADODB_FETCH_BOTH',3); - if (!defined('TIMESTAMP_FIRST_YEAR')) define('TIMESTAMP_FIRST_YEAR',100); + if (!defined('TIMESTAMP_FIRST_YEAR')) define('TIMESTAMP_FIRST_YEAR',100); - if (strnatcmp(PHP_VERSION,'4.3.0')>=0) { - define('ADODB_PHPVER',0x4300); - } else if (strnatcmp(PHP_VERSION,'4.2.0')>=0) { - define('ADODB_PHPVER',0x4200); - } else if (strnatcmp(PHP_VERSION,'4.0.5')>=0) { - define('ADODB_PHPVER',0x4050); - } else { - define('ADODB_PHPVER',0x4000); - } - } + if (strnatcmp(PHP_VERSION,'4.3.0')>=0) { + define('ADODB_PHPVER',0x4300); + } else if (strnatcmp(PHP_VERSION,'4.2.0')>=0) { + define('ADODB_PHPVER',0x4200); + } else if (strnatcmp(PHP_VERSION,'4.0.5')>=0) { + define('ADODB_PHPVER',0x4050); + } else { + define('ADODB_PHPVER',0x4000); + } + } - //if (!defined('ADODB_ASSOC_CASE')) define('ADODB_ASSOC_CASE',2); + //if (!defined('ADODB_ASSOC_CASE')) define('ADODB_ASSOC_CASE',2); - /** - Accepts $src and $dest arrays, replacing string $data - */ - function ADODB_str_replace($src, $dest, $data) - { - if (ADODB_PHPVER >= 0x4050) return str_replace($src,$dest,$data); + /** + Accepts $src and $dest arrays, replacing string $data + */ + function ADODB_str_replace($src, $dest, $data) + { + if (ADODB_PHPVER >= 0x4050) return str_replace($src,$dest,$data); - $s = reset($src); - $d = reset($dest); - while ($s !== false) { - $data = str_replace($s,$d,$data); - $s = next($src); - $d = next($dest); - } - return $data; - } + $s = reset($src); + $d = reset($dest); + while ($s !== false) { + $data = str_replace($s,$d,$data); + $s = next($src); + $d = next($dest); + } + return $data; + } - function ADODB_Setup() - { - GLOBAL - $ADODB_vers, // database version - $ADODB_COUNTRECS, // count number of records returned - slows down query - $ADODB_CACHE_DIR, // directory to cache recordsets - $ADODB_FETCH_MODE; + function ADODB_Setup() + { + GLOBAL + $ADODB_vers, // database version + $ADODB_COUNTRECS, // count number of records returned - slows down query + $ADODB_CACHE_DIR, // directory to cache recordsets + $ADODB_FETCH_MODE; - $ADODB_FETCH_MODE = ADODB_FETCH_DEFAULT; + $ADODB_FETCH_MODE = ADODB_FETCH_DEFAULT; - if (!isset($ADODB_CACHE_DIR)) { - $ADODB_CACHE_DIR = '/tmp'; //(isset($_ENV['TMP'])) ? $_ENV['TMP'] : '/tmp'; - } else { - // do not accept url based paths, eg. http:/ or ftp:/ - if (strpos($ADODB_CACHE_DIR,'://') !== false) - die("Illegal path http:// or ftp://"); - } + if (!isset($ADODB_CACHE_DIR)) { + $ADODB_CACHE_DIR = '/tmp'; //(isset($_ENV['TMP'])) ? $_ENV['TMP'] : '/tmp'; + } else { + // do not accept url based paths, eg. http:/ or ftp:/ + if (strpos($ADODB_CACHE_DIR,'://') !== false) + die("Illegal path http:// or ftp://"); + } - - // Initialize random number generator for randomizing cache flushes - srand(((double)microtime())*1000000); + + // Initialize random number generator for randomizing cache flushes + srand(((double)microtime())*1000000); - /** - * ADODB version as a string. - */ - $ADODB_vers = 'V4.22 15 Apr 2004 (c) 2000-2004 John Lim (jlim#natsoft.com.my). All rights reserved. Released BSD & LGPL.'; + /** + * ADODB version as a string. + */ + $ADODB_vers = 'V4.22 15 Apr 2004 (c) 2000-2004 John Lim (jlim#natsoft.com.my). All rights reserved. Released BSD & LGPL.'; - /** - * Determines whether recordset->RecordCount() is used. - * Set to false for highest performance -- RecordCount() will always return -1 then - * for databases that provide "virtual" recordcounts... - */ - if (!isset($ADODB_COUNTRECS)) $ADODB_COUNTRECS = true; - } + /** + * Determines whether recordset->RecordCount() is used. + * Set to false for highest performance -- RecordCount() will always return -1 then + * for databases that provide "virtual" recordcounts... + */ + if (!isset($ADODB_COUNTRECS)) $ADODB_COUNTRECS = true; + } - //========================================================================== - // CHANGE NOTHING BELOW UNLESS YOU ARE DESIGNING ADODB - //========================================================================== + //========================================================================== + // CHANGE NOTHING BELOW UNLESS YOU ARE DESIGNING ADODB + //========================================================================== - ADODB_Setup(); + ADODB_Setup(); - //========================================================================== - // CLASS ADOFieldObject - //========================================================================== - /** - * Helper class for FetchFields -- holds info on a column - */ - class ADOFieldObject { - var $name = ''; - var $max_length=0; - var $type=""; + //========================================================================== + // CLASS ADOFieldObject + //========================================================================== + /** + * Helper class for FetchFields -- holds info on a column + */ + class ADOFieldObject { + var $name = ''; + var $max_length=0; + var $type=""; - // additional fields by dannym... (dan...@ya...) - var $not_null = false; - // actually, this has already been built-in in the postgres, fbsql AND mysql module? ^-^ - // so we can as well make not_null standard (leaving it at "false" does not harm anyways) + // additional fields by dannym... (dan...@ya...) + var $not_null = false; + // actually, this has already been built-in in the postgres, fbsql AND mysql module? ^-^ + // so we can as well make not_null standard (leaving it at "false" does not harm anyways) - var $has_default = false; // this one I have done only in mysql and postgres for now ... - // others to come (dannym) - var $default_value; // default, if any, and supported. Check has_default first. - } + var $has_default = false; // this one I have done only in mysql and postgres for now ... + // others to come (dannym) + var $default_value; // default, if any, and supported. Check has_default first. + } - function ADODB_TransMonitor($dbms, $fn, $errno, $errmsg, $p1, $p2, &$thisConnection) - { - //print "Errorno ($fn errno=$errno m=$errmsg) "; - $thisConnection->_transOK = false; - if ($thisConnection->_oldRaiseFn) { - $fn = $thisConnection->_oldRaiseFn; - $fn($dbms, $fn, $errno, $errmsg, $p1, $p2,$thisConnection); - } - } + function ADODB_TransMonitor($dbms, $fn, $errno, $errmsg, $p1, $p2, &$thisConnection) + { + //print "Errorno ($fn errno=$errno m=$errmsg) "; + $thisConnection->_transOK = false; + if ($thisConnection->_oldRaiseFn) { + $fn = $thisConnection->_oldRaiseFn; + $fn($dbms, $fn, $errno, $errmsg, $p1, $p2,$thisConnection); + } + } - //========================================================================== - // CLASS ADOConnection - //========================================================================== + //========================================================================== + // CLASS ADOConnection + //========================================================================== - /** - * Connection object. For connecting to databases, and executing queries. - */ - class ADOConnection { - // - // PUBLIC VARS - // - var $dataProvider = 'native'; - var $databaseType = ''; /// RDBMS currently in use, eg. odbc, mysql, mssql - var $database = ''; /// Name of database to be used. - var $host = ''; /// The hostname of the database server - var $user = ''; /// The username which is used to connect to the database server. - var $password = ''; /// Password for the username. For security, we no longer store it. - var $debug = false; /// if set to true will output sql statements - var $maxblobsize = 256000; /// maximum size of blobs or large text fields -- some databases die otherwise like foxpro - var $concat_operator = '+'; /// default concat operator -- change to || for Oracle/Interbase - var $substr = 'substr'; /// substring operator - var $length = 'length'; /// string length operator - var $random = 'rand()'; /// random function - var $upperCase = false; /// uppercase function - var $fmtDate = "'Y-m-d'"; /// used by DBDate() as the default date format used by the database - var $fmtTimeStamp = "'Y-m-d, h:i:s A'"; /// used by DBTimeStamp as the default timestamp fmt. - var $true = '1'; /// string that represents TRUE for a database - var $false = '0'; /// string that represents FALSE for a database - var $replaceQuote = "\\'"; /// string to use to replace quotes - var $nameQuote = '"'; /// string to use to quote identifiers and names - var $charSet=false; /// character set to use - only for interbase - var $metaDatabasesSQL = ''; - var $metaTablesSQL = ''; - var $uniqueOrderBy = false; /// All order by columns have to be unique - var $emptyDate = ' '; - var $emptyTimeStamp = ' '; - var $lastInsID = false; - //-- - var $hasInsertID = false; /// supports autoincrement ID? - var $hasAffectedRows = false; /// supports affected rows for update/delete? - var $hasTop = false; /// support mssql/access SELECT TOP 10 * FROM TABLE - var $hasLimit = false; /// support pgsql/mysql SELECT * FROM TABLE LIMIT 10 - var $readOnly = false; /// this is a readonly database - used by phpLens - var $hasMoveFirst = false; /// has ability to run MoveFirst(), scrolling backwards - var $hasGenID = false; /// can generate sequences using GenID(); - var $hasTransactions = true; /// has transactions - //-- - var $genID = 0; /// sequence id used by GenID(); - var $raiseErrorFn = false; /// error function to call - var $isoDates = false; /// accepts dates in ISO format - var $cacheSecs = 3600; /// cache for 1 hour - var $sysDate = false; /// name of function that returns the current date - var $sysTimeStamp = false; /// name of function that returns the current timestamp - var $arrayClass = 'ADORecordSet_array'; /// name of class used to generate array recordsets, which are pre-downloaded recordsets + /** + * Connection object. For connecting to databases, and executing queries. + */ + class ADOConnection { + // + // PUBLIC VARS + // + var $dataProvider = 'native'; + var $databaseType = ''; /// RDBMS currently in use, eg. odbc, mysql, mssql + var $database = ''; /// Name of database to be used. + var $host = ''; /// The hostname of the database server + var $user = ''; /// The username which is used to connect to the database server. + var $password = ''; /// Password for the username. For security, we no longer store it. + var $debug = false; /// if set to true will output sql statements + var $maxblobsize = 256000; /// maximum size of blobs or large text fields -- some databases die otherwise like foxpro + var $concat_operator = '+'; /// default concat operator -- change to || for Oracle/Interbase + var $substr = 'substr'; /// substring operator + var $length = 'length'; /// string length operator + var $random = 'rand()'; /// random function + var $upperCase = false; /// uppercase function + var $fmtDate = "'Y-m-d'"; /// used by DBDate() as the default date format used by the database + var $fmtTimeStamp = "'Y-m-d, h:i:s A'"; /// used by DBTimeStamp as the default timestamp fmt. + var $true = '1'; /// string that represents TRUE for a database + var $false = '0'; /// string that represents FALSE for a database + var $replaceQuote = "\\'"; /// string to use to replace quotes + var $nameQuote = '"'; /// string to use to quote identifiers and names + var $charSet=false; /// character set to use - only for interbase + var $metaDatabasesSQL = ''; + var $metaTablesSQL = ''; + var $uniqueOrderBy = false; /// All order by columns have to be unique + var $emptyDate = ' '; + var $emptyTimeStamp = ' '; + var $lastInsID = false; + //-- + var $hasInsertID = false; /// supports autoincrement ID? + var $hasAffectedRows = false; /// supports affected rows for update/delete? + var $hasTop = false; /// support mssql/access SELECT TOP 10 * FROM TABLE + var $hasLimit = false; /// support pgsql/mysql SELECT * FROM TABLE LIMIT 10 + var $readOnly = false; /// this is a readonly database - used by phpLens + var $hasMoveFirst = false; /// has ability to run MoveFirst(), scrolling backwards + var $hasGenID = false; /// can generate sequences using GenID(); + var $hasTransactions = true; /// has transactions + //-- + var $genID = 0; /// sequence id used by GenID(); + var $raiseErrorFn = false; /// error function to call + var $isoDates = false; /// accepts dates in ISO format + var $cacheSecs = 3600; /// cache for 1 hour + var $sysDate = false; /// name of function that returns the current date + var $sysTimeStamp = false; /// name of function that returns the current timestamp + var $arrayClass = 'ADORecordSet_array'; /// name of class used to generate array recordsets, which are pre-downloaded recordsets - var $noNullStrings = false; /// oracle specific stuff - if true ensures that '' is converted to ' ' - var $numCacheHits = 0; - var $numCacheMisses = 0; - var $pageExecuteCountRows = true; - var $uniqueSort = false; /// indicates that all fields in order by must be unique - var $leftOuter = false; /// operator to use for left outer join in WHERE clause - var $rightOuter = false; /// operator to use for right outer join in WHERE clause - var $ansiOuter = false; /// whether ansi outer join syntax supported - var $autoRollback = false; // autoRollback on PConnect(). - var $poorAffectedRows = false; // affectedRows not working or unreliable + var $noNullStrings = false; /// oracle specific stuff - if true ensures that '' is converted to ' ' + var $numCacheHits = 0; + var $numCacheMisses = 0; + var $pageExecuteCountRows = true; + var $uniqueSort = false; /// indicates that all fields in order by must be unique + var $leftOuter = false; /// operator to use for left outer join in WHERE clause + var $rightOuter = false; /// operator to use for right outer join in WHERE clause + var $ansiOuter = false; /// whether ansi outer join syntax supported + var $autoRollback = false; // autoRollback on PConnect(). + var $poorAffectedRows = false; // affectedRows not working or unreliable - var $fnExecute = false; - var $fnCacheExecute = false; - var $blobEncodeType = false; // false=not required, 'I'=encode to integer, 'C'=encode to char - var $rsPrefix = "ADORecordSet_"; + var $fnExecute = false; + var $fnCacheExecute = false; + var $blobEncodeType = false; // false=not required, 'I'=encode to integer, 'C'=encode to char + var $rsPrefix = "ADORecordSet_"; - var $autoCommit = true; /// do not modify this yourself - actually private - var $transOff = 0; /// temporarily disable transactions - var $transCnt = 0; /// count of nested transactions + var $autoCommit = true; /// do not modify this yourself - actually private + var $transOff = 0; /// temporarily disable transactions + var $transCnt = 0; /// count of nested transactions - var $fetchMode=false; - // - // PRIVATE VARS - // - var $_oldRaiseFn = false; - var $_transOK = null; - var $_connectionID = false; /// The returned link identifier whenever a successful database connection is made. - var $_errorMsg = false; /// A variable which was used to keep the returned last error message. The value will - /// then returned by the errorMsg() function - var $_errorCode = false; /// Last error code, not guaranteed to be used - only by oci8 - var $_queryID = false; /// This variable keeps the last created result link identifier + var $fetchMode=false; + // + // PRIVATE VARS + // + var $_oldRaiseFn = false; + var $_transOK = null; + var $_connectionID = false; /// The returned link identifier whenever a successful database connection is made. + var $_errorMsg = false; /// A variable which was used to keep the returned last error message. The value will + /// then returned by the errorMsg() function + var $_errorCode = false; /// Last error code, not guaranteed to be used - only by oci8 + var $_queryID = false; /// This variable keeps the last created result link identifier - var $_isPersistentConnection = false; /// A boolean variable to state whether its a persistent connection or normal connection. */ - var $_bindInputArray = false; /// set to true if ADOConnection.Execute() permits binding of array parameters. - var $_evalAll = false; - var $_affected = false; - var $_logsql = false; + var $_isPersistentConnection = false; /// A boolean variable to state whether its a persistent connection or normal connection. */ + var $_bindInputArray = false; /// set to true if ADOConnection.Execute() permits binding of array parameters. + var $_evalAll = false; + var $_affected = false; + var $_logsql = false; - /** - * Constructor - */ - function ADOConnection() - { - die('Virtual Class -- cannot instantiate'); - } + /** + * Constructor + */ + function ADOConnection() + { + die('Virtual Class -- cannot instantiate'); + } - /** - Get server version info... + /** + Get server version info... - @returns An array with 2 elements: $arr['string'] is the description string, - and $arr[version] is the version (also a string). - */ - function ServerInfo() - { - return array('description' => '', 'version' => ''); - } + @returns An array with 2 elements: $arr['string'] is the description string, + and $arr[version] is the version (also a string). + */ + function ServerInfo() + { + return array('description' => '', 'version' => ''); + } - function _findvers($str) - { - if (preg_match('/([0-9]+\.([0-9\.])+)/',$str, $arr)) return $arr[1]; - else return ''; - } + function _findvers($str) + { + if (preg_match('/([0-9]+\.([0-9\.])+)/',$str, $arr)) return $arr[1]; + else return ''; + } - /** - * All error messages go through this bottleneck function. - * You can define your own handler by defining the function name in ADODB_OUTP. - */ - function outp($msg,$newline=true) - { - global $HTTP_SERVER_VARS,$ADODB_FLUSH,$ADODB_OUTP; + /** + * All error messages go through this bottleneck function. + * You can define your own handler by defining the function name in ADODB_OUTP. + */ + function outp($msg,$newline=true) + { + global $HTTP_SERVER_VARS,$ADODB_FLUSH,$ADODB_OUTP; - if (defined('ADODB_OUTP')) { - $fn = ADODB_OUTP; - $fn($msg,$newline); - return; - } else if (isset($ADODB_OUTP)) { - $fn = $ADODB_OUTP; - $fn($msg,$newline); - return; - } + if (defined('ADODB_OUTP')) { + $fn = ADODB_OUTP; + $fn($msg,$newline); + return; + } else if (isset($ADODB_OUTP)) { + $fn = $ADODB_OUTP; + $fn($msg,$newline); + return; + } - if ($newline) $msg .= "<br>\n"; + if ($newline) $msg .= "<br>\n"; - if (isset($HTTP_SERVER_VARS['HTTP_USER_AGENT'])) echo $msg; - else echo strip_tags($msg); - if (!empty($ADODB_FLUSH) && ob_get_length() !== false) flush(); // dp not flush if output buffering enabled - useless - thx to Jesse Mullan + if (isset($HTTP_SERVER_VARS['HTTP_USER_AGENT'])) echo $msg; + else echo strip_tags($msg); + if (!empty($ADODB_FLUSH) && ob_get_length() !== false) flush(); // dp not flush if output buffering enabled - useless - thx to Jesse Mullan - } + } - function Time() - { - $rs =& $this->Execute("select $this->sysTimeStamp"); - if ($rs && !$rs->EOF) return $this->UnixTimeStamp(reset($rs->fields)); + function Time() + { + $rs =& $this->Execute("select $this->sysTimeStamp"); + if ($rs && !$rs->EOF) return $this->UnixTimeStamp(reset($rs->fields)); - return false; - } + return false; + } - /** - * Connect to database - * - * @param [argHostname] Host to connect to - * @param [argUsername] Userid to login - * @param [argPassword] Associated password - * @param [argDatabaseName] database - * @param [forceNew] force new connection - * - * @return true or false - */ - function Connect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "", $forceNew = false) - { - if ($argHostname != "") $this->host = $argHostname; - if ($argUsername != "") $this->user = $argUsername; - if ($argPassword != "") $this->password = $argPassword; // not stored for security reasons - if ($argDatabaseName != "") $this->database = $argDatabaseName; + /** + * Connect to database + * + * @param [argHostname] Host to connect to + * @param [argUsername] Userid to login + * @param [argPassword] Associated password + * @param [argDatabaseName] database + * @param [forceNew] force new connection + * + * @return true or false + */ + function Connect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "", $forceNew = false) + { + if ($argHostname != "") $this->host = $argHostname; + if ($argUsername != "") $this->user = $argUsername; + if ($argPassword != "") $this->password = $argPassword; // not stored for security reasons + if ($argDatabaseName != "") $this->database = $argDatabaseName; - $this->_isPersistentConnection = false; - if ($fn = $this->raiseErrorFn) { - if ($forceNew) { - if ($this->_nconnect($this->host, $this->user, $this->password, $this->database)) return true; - } else { - if ($this->_connect($this->host, $this->user, $this->password, $this->database)) return true; - } - $err = $this->ErrorMsg(); - if (empty($err)) $err = "Connection error to server '$argHostname' with user '$argUsername'"; - $fn($this->databaseType,'CONNECT',$this->ErrorNo(),$err,$this->host,$this->database,$this); - } else { - if ($forceNew) { - if ($this->_nconnect($this->host, $this->user, $this->password, $this->database)) return true; - } else { - if ($this->_connect($this->host, $this->user, $this->password, $this->database)) return true; - } - } - if ($this->debug) ADOConnection::outp( $this->host.': '.$this->ErrorMsg()); - return false; - } + $this->_isPersistentConnection = false; + if ($fn = $this->raiseErrorFn) { + if ($forceNew) { + if ($this->_nconnect($this->host, $this->user, $this->password, $this->database)) return true; + } else { + if ($this->_connect($this->host, $this->user, $this->password, $this->database)) return true; + } + $err = $this->ErrorMsg(); + if (empty($err)) $err = "Connection error to server '$argHostname' with user '$argUsername'"; + $fn($this->databaseType,'CONNECT',$this->ErrorNo(),$err,$this->host,$this->database,$this); + } else { + if ($forceNew) { + if ($this->_nconnect($this->host, $this->user, $this->password, $this->database)) return true; + } else { + if ($this->_connect($this->host, $this->user, $this->password, $this->database)) return true; + } + } + if ($this->debug) ADOConnection::outp( $this->host.': '.$this->ErrorMsg()); + return false; + } - function _nconnect($argHostname, $argUsername, $argPassword, $argDatabaseName) - { - return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabaseName); - } + function _nconnect($argHostname, $argUsername, $argPassword, $argDatabaseName) + { + return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabaseName); + } - /** - * Always force a new connection to database - currently only works with oracle - * - * @param [argHostname] Host to connect to - * @param [argUsername] Userid to login - * @param [argPassword] Associated password - * @param [argDatabaseName] database - * - * @return true or false - */ - function NConnect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "") - { - return $this->Connect($argHostname, $argUsername, $argPassword, $argDatabaseName, true); - } + /** + * Always force a new connection to database - currently only works with oracle + * + * @param [argHostname] Host to connect to + * @param [argUsername] Userid to login + * @param [argPassword] Associated password + * @param [argDatabaseName] database + * + * @return true or false + */ + function NConnect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "") + { + return $this->Connect($argHostname, $argUsername, $argPassword, $argDatabaseName, true); + } - /** - * Establish persistent connect to database - * - * @param [argHostname] Host to connect to - * @param [argUsername] Userid to login - * @param [argPassword] Associated password - * @param [argDatabaseName] database - * - * @return return true or false - */ - function PConnect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "") - { - if (defined('ADODB_NEVER_PERSIST')) - return $this->Connect($argHostname,$argUsername,$argPassword,$argDatabaseName); + /** + * Establish persistent connect to database + * + * @param [argHostname] Host to connect to + * @param [argUsername] Userid to login + * @param [argPassword] Associated password + * @param [argDatabaseName] database + * + * @return return true or false + */ + function PConnect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "") + { + if (defined('ADODB_NEVER_PERSIST')) + return $this->Connect($argHostname,$argUsername,$argPassword,$argDatabaseName); - if ($argHostname != "") $this->host = $argHostname; - if ($argUsername != "") $this->user = $argUsername; - if ($argPassword != "") $this->password = $argPassword; - if ($argDatabaseName != "") $this->database = $argDatabaseName; - - $this->_isPersistentConnection = true; + if ($argHostname != "") $this->host = $argHostname; + if ($argUsername != "") $this->user = $argUsername; + if ($argPassword != "") $this->password = $argPassword; + if ($argDatabaseName != "") $this->database = $argDatabaseName; + + $this->_isPersistentConnection = true; - if ($fn = $this->raiseErrorFn) { - if ($this->_pconnect($this->host, $this->user, $this->password, $this->database)) return true; - $err = $this->ErrorMsg(); - if (empty($err)) $err = "Connection error to server '$argHostname' with user '$argUsername'"; - $fn($this->databaseType,'PCONNECT',$this->ErrorNo(),$err,$this->host,$this->database,$this); - } else - if ($this->_pconnect($this->host, $this->user, $this->password, $this->database)) return true; + if ($fn = $this->raiseErrorFn) { + if ($this->_pconnect($this->host, $this->user, $this->password, $this->database)) return true; + $err = $this->ErrorMsg(); + if (empty($err)) $err = "Connection error to server '$argHostname' with user '$argUsername'"; + $fn($this->databaseType,'PCONNECT',$this->ErrorNo(),$err,$this->host,$this->database,$this); + } else + if ($this->_pconnect($this->host, $this->user, $this->password, $this->database)) return true; - if ($this->debug) ADOConnection::outp( $this->host.': '.$this->ErrorMsg()); - return false; - } + if ($this->debug) ADOConnection::outp( $this->host.': '.$this->ErrorMsg()); + return false; + } - // Format date column in sql string given an input format that understands Y M D - function SQLDate($fmt, $col=false) - { - if (!$col) $col = $this->sysDate; - return $col; // child class implement - } + // Format date column in sql string given an input format that understands Y M D + function SQLDate($fmt, $col=false) + { + if (!$col) $col = $this->sysDate; + return $col; // child class implement + } - /** - * Should prepare the sql statement and return the stmt resource. - * For databases that do not support this, we return the $sql. To ensure - * compatibility with databases that do not support prepare: - * - * $stmt = $db->Prepare("insert into table (id, name) values (?,?)"); - * $db->Execute($stmt,array(1,'Jill')) or die('insert failed'); - * $db->Execute($stmt,array(2,'Joe')) or die('insert failed'); - * - * @param sql SQL to send to database - * - * @return return FALSE, or the prepared statement, or the original sql if - * if the database does not support prepare. - * - */ - function Prepare($sql) - { - return $sql; - } + /** + * Should prepare the sql statement and return the stmt resource. + * For databases that do not support this, we return the $sql. To ensure + * compatibility with databases that do not support prepare: + * + * $stmt = $db->Prepare("insert into table (id, name) values (?,?)"); + * $db->Execute($stmt,array(1,'Jill')) or die('insert failed'); + * $db->Execute($stmt,array(2,'Joe')) or die('insert failed'); + * + * @param sql SQL to send to database + * + * @return return FALSE, or the prepared statement, or the original sql if + * if the database does not support prepare. + * + */ + function Prepare($sql) + { + return $sql; + } - /** - * Some databases, eg. mssql require a different function for preparing - * stored procedures. So we cannot use Prepare(). - * - * Should prepare the stored procedure and return the stmt resource. - * For databases that do not support this, we return the $sql. To ensure - * compatibility with databases that do not support prepare: - * - * @param sql SQL to send to database - * - * @return return FALSE, or the prepared statement, or the original sql if - * if the database does not support prepare. - * - */ - function PrepareSP($sql,$param=true) - { - return $this->Prepare($sql,$param); - } + /** + * Some databases, eg. mssql require a different function for preparing + * stored procedures. So we cannot use Prepare(). + * + * Should prepare the stored procedure and return the stmt resource. + * For databases that do not support this, we return the $sql. To ensure + * compatibility with databases that do not support prepare: + * + * @param sql SQL to send to database + * + * @return return FALSE, or the prepared statement, or the original sql if + * if the database does not support prepare. + * + */ + function PrepareSP($sql,$param=true) + { + return $this->Prepare($sql,$param); + } - /** - * PEAR DB Compat - */ - function Quote($s) - { - return $this->qstr($s,false); - } + /** + * PEAR DB Compat + */ + function Quote($s) + { + return $this->qstr($s,false); + } - /** - Requested by "Karsten Dambekalns" <k.d...@fi...> - */ - function QMagic($s) - { - return $this->qstr($s,get_magic_quotes_gpc()); - } + /** + Requested by "Karsten Dambekalns" <k.d...@fi...> + */ + function QMagic($s) + { + return $this->qstr($s,get_magic_quotes_gpc()); + } - function q(&$s) - { - $s = $this->qstr($s,false); - } + function q(&$s) + { + $s = $this->qstr($s,false); + } - /** - * PEAR DB Compat - do not use internally. - */ - function ErrorNative() - { - return $this->ErrorNo(); - } + /** + * PEAR DB Compat - do not use internally. + */ + function ErrorNative() + { + return $this->ErrorNo(); + } /** - * PEAR DB Compat - do not use internally. - */ - function nextId($seq_name) - { - return $this->GenID($seq_name); - } + * PEAR DB Compat - do not use internally. + */ + function nextId($seq_name) + { + return $this->GenID($seq_name); + } - /** - * Lock a row, will escalate and lock the table if row locking not supported - * will normally free the lock at the end of the transaction - * - * @param $table name of table to lock - * @param $where where clause to use, eg: "WHERE row=12". If left empty, will escalate to table lock - */ - function RowLock($table,$where) - { - return false; - } + /** + * Lock a row, will escalate and lock the table if row locking not supported + * will normally free the lock at the end of the transaction + * + * @param $table name of table to lock + * @param $where where clause to use, eg: "WHERE row=12". If left empty, will escalate to table lock + */ + function RowLock($table,$where) + { + return false; + } - function CommitLock($table) - { - return $this->CommitTrans(); - } + function CommitLock($table) + { + return $this->CommitTrans(); + } - function RollbackLock($table) - { - return $this->RollbackTrans(); - } + function RollbackLock($table) + { + return $this->RollbackTrans(); + } - /** - * PEAR DB Compat - do not use internally. - * - * The fetch modes for NUMERIC and ASSOC for PEAR DB and ADODB are identical - * for easy porting :-) - * - * @param mode The fetchmode ADODB_FETCH_ASSOC or ADODB_FETCH_NUM - * @returns The previous fetch mode - */ - function SetFetchMode($mode) - { - $old = $this->fetchMode; - $this->fetchMode = $mode; + /** + * PEAR DB Compat - do not use internally. + * + * The fetch modes for NUMERIC and ASSOC for PEAR DB and ADODB are identical + * for easy porting :-) + * + * @param mode The fetchmode ADODB_FETCH_ASSOC or ADODB_FETCH_NUM + * @returns The previous fetch mode + */ + function SetFetchMode($mode) + { + $old = $this->fetchMode; + $this->fetchMode = $mode; - if ($old === false) { - global $ADODB_FETCH_MODE; - return $ADODB_FETCH_MODE; - } - return $old; - } + if ($old === false) { + global $ADODB_FETCH_MODE; + return $ADODB_FETCH_MODE; + } + return $old; + } - /** - * PEAR DB Compat - do not use internally. - */ - function &Query($sql, $inputarr=false) - { - $rs = &$this->Execute($sql, $inputarr); - if (!$rs && defined('ADODB_PEAR')) return ADODB_PEAR_Error(); - return $rs; - } + /** + * PEAR DB Compat - do not use internally. + */ + function &Query($sql, $inputarr=false) + { + $rs = &$this->Execute($sql, $inputarr); + if (!$rs && defined('ADODB_PEAR')) return ADODB_PEAR_Error(); + return $rs; + } - /** - * PEAR DB Compat - do not use internally - */ - function &LimitQuery($sql, $offset, $count, $params=false) - { - $rs = &$this->SelectLimit($sql, $count, $offset, $params); - if (!$rs && defined('ADODB_PEAR')) return ADODB_PEAR_Error(); - return $rs; - } + /** + * PEAR DB Compat - do not use internally + */ + function &LimitQuery($sql, $offset, $count, $params=false) + { + $rs = &$this->SelectLimit($sql, $count, $offset, $params); + if (!$rs && defined('ADODB_PEAR')) return ADODB_PEAR_Error(); + return $rs; + } - /** - * PEAR DB Compat - do not use internally - */ - function Disconnect() - { - return $this->Close(); - } + /** + * PEAR DB Compat - do not use internally + */ + function Disconnect() + { + return $this->Close(); + } - /* - Returns placeholder for parameter, eg. - $DB->Param('a') + /* + Returns placeholder for parameter, eg. + $DB->Param('a') - will return ':a' for Oracle, and '?' for most other databases... + will return ':a' for Oracle, and '?' for most other databases... - For databases that require positioned params, eg $1, $2, $3 for postgresql, - pass in Param(false) before setting the first parameter. - */ - function Param($name) - { - return '?'; - } + For databases that require positioned params, eg $1, $2, $3 for postgresql, + pass in Param(false) before setting the first parameter. + */ + function Param($name) + { + return '?'; + } - /* - InParameter and OutParameter are self-documenting versions of Parameter(). - */ - function InParameter(&$stmt,&$var,$name,$maxLen=4000,$type=false) - { - return $this->Parameter($stmt,$var,$name,false,$maxLen,$type); - } + /* + InParameter and OutParameter are self-documenting versions of Parameter(). + */ + function InParameter(&$stmt,&$var,$name,$maxLen=4000,$type=false) + { + return $this->Parameter($stmt,$var,$name,false,$maxLen,$type); + } - /* - */ - function OutParameter(&$stmt,&$var,$name,$maxLen=4000,$type=false) - { - return $this->Parameter($stmt,$var,$name,true,$maxLen,$type); + /* + */ + function OutParameter(&$stmt,&$var,$name,$maxLen=4000,$type=false) + { + return $this->Parameter($stmt,$var,$name,true,$maxLen,$type); - } + } - /* - Usage in oracle - $stmt = $db->Prepare('select * from table where id =:myid and group=:group'); - $db->Parameter($stmt,$id,'myid'); - $db->Parameter($stmt,$group,'group',64); - $db->Execute(); + /* + Usage in oracle + $stmt = $db->Prepare('select * from table where id =:myid and group=:group'); + $db->Parameter($stmt,$id,'myid'); + $db->Parameter($stmt,$group,'group',64); + $db->Execute(); - @param $stmt Statement returned by Prepare() or PrepareSP(). - @param $var PHP variable to bind to - @param $name Name of stored procedure variable name to bind to. - @param [$isOutput] Indicates direction of parameter 0/false=IN 1=OUT 2= IN/OUT. This is ignored in oci8. - @param [$maxLen] Holds an maximum length of the variable. - @param [$type] The data type of $var. Legal values depend on driver. + @param $stmt Statement returned by Prepare() or PrepareSP(). + @param $var PHP variable to bind to + @param $name Name of stored procedure variable name to bind to. + @param [$isOutput] Indicates direction of parameter 0/false=IN 1=OUT 2= IN/OUT. This is ignored in oci8. + @param [$maxLen] Holds an maximum length of the variable. + @param [$type] The data type of $var. Legal values depend on driver. - */ - function Parameter(&$stmt,&$var,$name,$isOutput=false,$maxLen=4000,$type=false) - { - return false; - } + */ + function Parameter(&$stmt,&$var,$name,$isOutput=false,$maxLen=4000,$type=false) + { + return false; + } - /** - Improved method of initiating a transaction. Used together with CompleteTrans(). - Advantages include: + /** + Improved method of initiating a transaction. Used together with CompleteTrans(). + Advantages include: - a. StartTrans/CompleteTrans is nestable, unlike BeginTrans/CommitTrans/RollbackTrans. - Only the outermost block is treated as a transaction.<br> - b. CompleteTrans auto-detects SQL errors, and will rollback on errors, commit otherwise.<br> - c. All BeginTrans/CommitTrans/RollbackTrans inside a StartTrans/CompleteTrans block - are disabled, making it backward compatible. - */ - function StartTrans($errfn = 'ADODB_TransMonitor') - { - if ($this->transOff > 0) { - $this->transOff += 1; - return; - } + a. StartTrans/CompleteTrans is nestable, unlike BeginTrans/CommitTrans/RollbackTrans. + Only the outermost block is treated as a transaction.<br> + b. CompleteTrans auto-detects SQL errors, and will rollback on errors, commit otherwise.<br> + c. All BeginTrans/CommitTrans/RollbackTrans inside a StartTrans/CompleteTrans block + are disabled, making it backward compatible. + */ + function StartTrans($errfn = 'ADODB_TransMonitor') + { + if ($this->transOff > 0) { + $this->transOff += 1; + return; + } - $this->_oldRaiseFn = $this->raiseErrorFn; - $this->raiseErrorFn = $errfn; - $this->_transOK = true; + $this->_oldRaiseFn = $this->raiseErrorFn; + $this->raiseErrorFn = $errfn; + $this->_transOK = true; - if ($this->debug && $this->transCnt > 0) ADOConnection::outp("Bad Transaction: StartTrans called within BeginTrans"); - $this->BeginTrans(); - $this->transOff = 1; - } + if ($this->debug && $this->transCnt > 0) ADOConnection::outp("Bad Transaction: StartTrans called within BeginTrans"); + $this->BeginTrans(); + $this->transOff = 1; + } - /** - Used together with StartTrans() to end a transaction. Monitors connection - for sql errors, and will commit or rollback as appropriate. + /** + Used together with StartTrans() to end a transaction. Monitors connection + for sql errors, and will commit or rollback as appropriate. - @autoComplete if true, monitor sql errors and commit and rollback as appropriate, - and if set to false force rollback even if no SQL error detected. - @returns true on commit, false on rollback. - */ - function CompleteTrans($autoComplete = true) - { - if ($this->transOff > 1) { - $this->transOff -= 1; - return true; - } - $this->raiseErrorFn = $this->_oldRaiseFn; + @autoComplete if true, monitor sql errors and commit and rollback as appropriate, + and if set to false force rollback even if no SQL error detected. + @returns true on commit, false on rollback. + */ + function CompleteTrans($autoComplete = true) + { + if ($this->transOff > 1) { + $this->transOff -= 1; + return true; + } + $this->raiseErrorFn = $this->_oldRaiseFn; - $this->transOff = 0; - if ($this->_transOK && $autoComplete) { - if (!$this->CommitTrans()) { - $this->_transOK = false; - if ($this->debug) ADOConnection::outp("Smart Commit failed"); - } else - if ($this->debug) ADOConnection::outp("Smart Commit occurred"); - } else { - $this->RollbackTrans(); - if ($this->debug) ADOCOnnection::outp("Smart Rollback occurred"); - } + $this->transOff = 0; + if ($this->_transOK && $autoComplete) { + if (!$this->CommitTrans()) { + $this->_transOK = false; + if ($this->debug) ADOConnection::outp("Smart Commit failed"); + } else + if ($this->debug) ADOConnection::outp("Smart Commit occurred"); + } else { + $this->RollbackTrans(); + if ($this->debug) ADOCOnnection::outp("Smart Rollback occurred"); + } - return $this->_transOK; - } + return $this->_transOK; + } - /* - At the end of a StartTrans/CompleteTrans block, perform a rollback. - */ - function FailTrans() - { - if ($this->debug) - if ($this->transOff == 0) { - ADOConnection::outp("FailTrans outside StartTrans/CompleteTrans"); - } else { - ADOConnection::outp("FailTrans was called"); - adodb_backtrace(); - } - $this->_transOK = false; - } + /* + At the end of a StartTrans/CompleteTrans block, perform a rollback. + */ + function FailTrans() + { + if ($this->debug) + if ($this->transOff == 0) { + ADOConnection::outp("FailTrans outside StartTrans/CompleteTrans"); + } else { + ADOConnection::outp("FailTrans was called"); + adodb_backtrace(); + } + $this->_transOK = false; + } - /** - Check if transaction has failed, only for Smart Transactions. - */ - function HasFailedTrans() - { - if ($this->transOff > 0) return $this->_transOK == false; - return false; - } + /** + Check if transaction has failed, only for Smart Transactions. + */ + function HasFailedTrans() + { + if ($this->transOff > 0) return $this->_transOK == false; + return false; + } - /** - * Execute SQL - * - * @param sql SQL statement to execute, or possibly an array holding prepared statement ($sql[0] will hold sql text) - * @param [inputarr] holds the input data to bind to. Null elements will be set to null. - * @return RecordSet or false - */ - function &Execute($sql,$inputarr=false) - { - if ($this->fnExecute) { - $fn = $this->fnExecute; - $ret =& $fn($this,$sql,$inputarr); - if (isset($ret)) return $ret; - } - if ($inputarr && is_array($inputarr)) { - $element0 = reset($inputarr); - # is_object check is because oci8 descriptors can be passed in - $array_2d = is_array($element0) && !is_object(reset($element0)); - - if (!is_array($sql) && !$this->_bindInputArray) { - $sqlarr = explode('?',$sql); - - if (!$array_2d) $inputarr = array($inputarr); - foreach($inputarr as $arr) { - $sql = ''; $i = 0; - foreach($arr as $v) { - $sql .= $sqlarr[$i]; - // from Ron Baldwin <ron...@so...> - // Only quote string types - if (gettype($v) == 'string') - $sql .= $this->qstr($v); - else if ($v === null) - $sql .= 'NULL'; - else - $sql .= $v; - $i += 1; - } - $sql .= $sqlarr[$i]; - - if ($i+1 != sizeof($sqlarr)) - ADOConnection::outp( "Input Array does not match ?: ".htmlspecialchars($sql)); + /** + * Execute SQL + * + * @param sql SQL statement to execute, or possibly an array holding prepared statement ($sql[0] will hold sql text) + * @param [inputarr] holds the input data to bind to. Null elements will be set to null. + * @return RecordSet or false + */ + function &Execute($sql,$inputarr=false) + { + if ($this->fnExecute) { + $fn = $this->fnExecute; + $ret =& $fn($this,$sql,$inputarr); + if (isset($ret)) return $ret; + } + if ($inputarr && is_array($inputarr)) { + $element0 = reset($inputarr); + # is_object check is because oci8 descriptors can be passed in + $array_2d = is_array($element0) && !is_object(reset($element0)); + + if (!is_array($sql) && !$this->_bindInputArray) { + $sqlarr = explode('?',$sql); + + if (!$array_2d) $inputarr = array($inputarr); + foreach($inputarr as $arr) { + $sql = ''; $i = 0; + foreach($arr as $v) { + $sql .= $sqlarr[$i]; + // from Ron Baldwin <ron...@so...> + // Only quote string types + if (gettype($v) == 'string') + $sql .= $this->qstr($v); + else if ($v === null) + $sql .= 'NULL'; + else + $sql .= $v; + $i += 1; + } + $sql .= $sqlarr[$i]; + + if ($i+1 != sizeof($sqlarr)) + ADOConnection::outp( "Input Array does not match ?: ".htmlspecialchars($sql)); - $ret =& $this->_Execute($sql,false); - if (!$ret) return $ret; - } - } else { - if ($array_2d) { - $stmt = $this->Prepare($sql); - foreach($inputarr as $arr) { - $ret =& $this->_Execute($stmt,$arr); - if (!$ret) return $ret; - } - } else - $ret =& $this->_Execute($sql,$inputarr); - } - } else { - $ret =& $this->_Execute($sql,false); - } + $ret =& $this->_Execute($sql,false); + if (!$ret) return $ret; + } + } else { + if ($array_2d) { + $stmt = $this->Prepare($sql); + foreach($inputarr as $arr) { + $ret =& $this->_Execute($stmt,$arr); + if (!$ret) return $ret; + } + } else + $ret =& $this->_Execute($sql,$inputarr); + } + } else { + $ret =& $this->_Execute($sql,false); + } - return $ret; - } + return $ret; + } - function& _Execute($sql,$inputarr=false) - { + function& _Execute($sql,$inputarr=false) + { - if ($this->debug) { - global $HTTP_SERVER_VARS; + if ($this->debug) { + global $HTTP_SERVER_VARS; - $ss = ''; - if ($inputarr) { - foreach($inputarr as $kk=>$vv) { - if (is_string($vv) && strlen($vv)>64) $vv = substr($vv,0,64).'...'; - $ss .= "($kk=>'$vv') "; - } - $ss = "[ $ss ]"; - } - $sqlTxt = str_replace(',',', ',is_array($sql) ?$sql[0] : $sql); - - // check if running from browser or command-line - $inBrowser = isset($HTTP_SERVER_VARS['HTTP_USER_AGENT']); - - if ($inBrowser) { - if ($this->debug === -1) - ADOConnection::outp( "<br>\n($this->databaseType): ".htmlspecialchars($sqlTxt)." <code>$ss</code>\n<br>\n",false); - else - ADOConnection::outp( "<hr>\n($this->databaseType): ".htmlspecialchars($sqlTxt)." <code>$ss</code>\n<hr>\n",false); - } else { - ADOConnection::outp("-----\n($this->databaseType): ".($sqlTxt)." \n-----\n",false); - } - $this->_queryID = $this->_query($sql,$inputarr); - /* - Alexios Fakios notes that ErrorMsg() must be called before ErrorNo() for mssql - because ErrorNo() calls Execute('SELECT @ERROR'), causing recursion - */ - if ($this->databaseType == 'mssql') { - // ErrorNo is a slow function call in mssql, and not reliable in PHP 4.0.6 - if($emsg = $this->ErrorMsg()) { - if ($err = $this->ErrorNo()) ADOConnection::outp($err.': '.$emsg); - } - } else if (!$this->_queryID) { - ADOConnection::outp($this->ErrorNo() .': '. $this->ErrorMsg()); - } - } else { - //**************************** - // non-debug version of query - //**************************** - - $this->_queryID =@$this->_query($sql,$inputarr); - } + $ss = ''; + if ($inputarr) { + foreach($inputarr as $kk=>$vv) { + if (is_string($vv) && strlen($vv)>64) $vv = substr($vv,0,64).'...'; + $ss .= "($kk=>'$vv') "; + } + $ss = "[ $ss ]"; + } + $sqlTxt = str_replace(',',', ',is_array($sql) ?$sql[0] : $sql); + + // check if running from browser or command-line + $inBrowser = isset($HTTP_SERVER_VARS['HTTP_USER_AGENT']); + + if ($inBrowser) { + if ($this->debug === -1) + ADOConnection::outp( "<br>\n($this->databaseType): ".htmlspecialchars($sqlTxt)." <code>$ss</code>\n<br>\n",false); + else + ADOConnection::outp( "<hr>\n($this->databaseType): ".htmlspecialchars($sqlTxt)." <code>$ss</code>\n<hr>\n",false); + } else { + ADOConnection::outp("-----\n($this->databaseType): ".($sqlTxt)." \n-----\n",false); + } + $this->_queryID = $this->_query($sql,$inputarr); + /* + Alexios Fakios notes that ErrorMsg() must be called before ErrorNo() for mssql + because ErrorNo() calls Execute('SELECT @ERROR'), causing recursion + */ + if ($this->databaseType == 'mssql') { + // ErrorNo is a slow function call in mssql, and not reliable in PHP 4.0.6 + if($emsg = $this->ErrorMsg()) { + if ($err = $this->ErrorNo()) ADOConnection::outp($err.': '.$emsg); + } + } else if (!$this->_queryID) { + ADOConnection::outp($this->ErrorNo() .': '. $this->ErrorMsg()); + } + } else { + //*********... [truncated message content] |
From: <var...@us...> - 2010-08-11 13:00:55
|
Revision: 7641 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7641&view=rev Author: vargenau Date: 2010-08-11 13:00:46 +0000 (Wed, 11 Aug 2010) Log Message: ----------- Harmonize header Modified Paths: -------------- trunk/lib/DbSession/ADODB.php trunk/lib/HtmlParser.php trunk/lib/PageType.php trunk/lib/RssParser.php trunk/lib/SemanticWeb.php trunk/lib/WikiDB/backend/ADODB.php trunk/lib/WikiDB/backend/PDO.php trunk/lib/WikiDB/backend/PDO_mysql.php trunk/lib/WikiDB/backend/PDO_oci8.php trunk/lib/WikiDB/backend/PDO_pgsql.php trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php trunk/lib/WikiDB/backend/file.php trunk/lib/WikiDB/backend/flatfile.php trunk/lib/WikiDB/file.php trunk/lib/WikiDB/flatfile.php trunk/lib/XmlParser.php trunk/lib/install.php trunk/lib/loadsave.php trunk/lib/wikilens/PageListColumns.php trunk/lib/wikilens/Utils.php Modified: trunk/lib/DbSession/ADODB.php =================================================================== --- trunk/lib/DbSession/ADODB.php 2010-08-11 12:33:25 UTC (rev 7640) +++ trunk/lib/DbSession/ADODB.php 2010-08-11 13:00:46 UTC (rev 7641) @@ -1,25 +1,25 @@ <?php // rcs_id('$Id$'); /* - Copyright 2005 $ThePhpWikiProgrammingTeam + * Copyright 2005 $ThePhpWikiProgrammingTeam + * + * This file is part of PhpWiki. + * + * PhpWiki is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * 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 + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with PhpWiki; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ - This file is part of PhpWiki. - - PhpWiki is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - 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 - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with PhpWiki; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -/** +/** * ADODB db sessions, based on pear DB Sessions. * * @author: Reini Urban @@ -52,13 +52,13 @@ if (!$dbh or !is_resource($dbh->_connectionID)) { if (!$parsed) $parsed = parseDSN($request->_dbi->getParam('dsn')); $this->_dbh =& ADONewConnection($parsed['phptype']); // Probably only MySql works just now - $this->_dbh->Connect($parsed['hostspec'],$parsed['username'], + $this->_dbh->Connect($parsed['hostspec'],$parsed['username'], $parsed['password'], $parsed['database']); - $dbh = &$this->_dbh; + $dbh = &$this->_dbh; } return $dbh; } - + function query($sql) { return $this->_dbh->Execute($sql); } @@ -78,7 +78,7 @@ * Actually this function is a fake for session_set_save_handle. * @param string $save_path a path to stored files * @param string $session_name a name of the concrete file - * @return boolean true just a variable to notify PHP that everything + * @return boolean true just a variable to notify PHP that everything * is good. * @access private */ @@ -92,7 +92,7 @@ * * This function is called just after <i>write</i> call. * - * @return boolean true just a variable to notify PHP that everything + * @return boolean true just a variable to notify PHP that everything * is good. * @access private */ @@ -129,11 +129,11 @@ } return $res; } - + /** * Saves the session data into DB. * - * Just a comment: The "write" handler is not + * Just a comment: The "write" handler is not * executed until after the output stream is closed. Thus, * output from debugging statements in the "write" handler * will never be seen in the browser. If debugging output @@ -147,8 +147,8 @@ * @access private */ function write ($id, $sess_data) { - if (defined("WIKI_XMLRPC") or defined("WIKI_SOAP")) return; - + if (defined("WIKI_XMLRPC") or defined("WIKI_SOAP")) return; + $dbh = $this->_connect(); $table = $this->_table; $qid = $dbh->qstr($id); @@ -181,7 +181,7 @@ } } $result = ! $rs->EOF; - if ($result) $rs->free(); + if ($result) $rs->free(); $this->_disconnect(); return $result; } @@ -192,7 +192,7 @@ * Removes a session from the table. * * @param string $id - * @return boolean true + * @return boolean true * @access private */ function destroy ($id) { @@ -203,7 +203,7 @@ $dbh->Execute("DELETE FROM $table WHERE sess_id=$qid"); $this->_disconnect(); - return true; + return true; } /** @@ -224,7 +224,7 @@ return true; } - // WhoIsOnline support. + // WhoIsOnline support. // TODO: ip-accesstime dynamic blocking API function currentSessions() { $sessions = array(); Modified: trunk/lib/HtmlParser.php =================================================================== --- trunk/lib/HtmlParser.php 2010-08-11 12:33:25 UTC (rev 7640) +++ trunk/lib/HtmlParser.php 2010-08-11 13:00:46 UTC (rev 7641) @@ -6,23 +6,23 @@ */ /* - Copyright (C) 2004 Reini Urban - - This file is part of PhpWiki. - - PhpWiki is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - 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 - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with PhpWiki; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Copyright (C) 2004 Reini Urban + * + * This file is part of PhpWiki. + * + * PhpWiki is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * 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 + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with PhpWiki; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /** Modified: trunk/lib/PageType.php =================================================================== --- trunk/lib/PageType.php 2010-08-11 12:33:25 UTC (rev 7640) +++ trunk/lib/PageType.php 2010-08-11 13:00:46 UTC (rev 7641) @@ -1,23 +1,23 @@ <?php // -*-php-*- // rcs_id('$Id$'); /* - Copyright 1999,2000,2001,2002,2003,2004,2005,2006 $ThePhpWikiProgrammingTeam - - This file is part of PhpWiki. - - PhpWiki is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - 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 - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with PhpWiki; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Copyright 1999,2000,2001,2002,2003,2004,2005,2006 $ThePhpWikiProgrammingTeam + * + * This file is part of PhpWiki. + * + * PhpWiki is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * 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 + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with PhpWiki; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ require_once('lib/CachedMarkup.php'); @@ -57,7 +57,7 @@ * Currently the only information encapsulated is how to format * the specific page type. In the future or capabilities may be * added, e.g. the abilities to edit different page types (differently.) - * e.g. Support for the javascript htmlarea editor, which can only edit + * e.g. Support for the javascript htmlarea editor, which can only edit * pure HTML. * * IMPORTANT NOTE: Since the whole PageType class gets stored (serialized) @@ -142,7 +142,7 @@ trigger_error(_("WARNING: InterWikiMap page is unlocked, so not using those links.")); $intermap = false; } - else + else $intermap = false; } else { $intermap = $this->_getMapFromWikiText($pagetext); @@ -171,7 +171,7 @@ function link ($link, $linktext = false) { global $WikiTheme; list ($moniker, $page) = explode (":", $link, 2); - + if (!isset($this->_map[$moniker])) { return HTML::span(array('class' => 'bad-interwiki'), $linktext ? $linktext : $link); @@ -198,7 +198,7 @@ $link_prefix = NormalizeWebFileName(substr($url, strlen($wikiroot))); } } - + // Urlencode page only if it's a query arg. // FIXME: this is a somewhat broken heuristic. if ($moniker == 'Upload') { @@ -223,7 +223,7 @@ $link->pushContent(PossiblyGlueIconToText('interwiki', $linktext)); $link->setAttr('class', 'named-interwiki'); } - + return $link; } @@ -240,13 +240,13 @@ // Add virtual monikers: "Upload:" "Talk:" "User:", ":" // and expand special variables %u, %b, %d - // Upload: Should be expanded later to user-specific upload dirs. + // Upload: Should be expanded later to user-specific upload dirs. // In the Upload plugin, not here: Upload:ReiniUrban/uploaded-file.png if (empty($map['Upload'])) { $map['Upload'] = getUploadDataPath(); } // User:ReiniUrban => ReiniUrban or Users/ReiniUrban - // Can be easily overriden by a customized InterWikiMap: + // Can be easily overriden by a customized InterWikiMap: // User Users/%s if (empty($map["User"])) { $map["User"] = "%s"; @@ -270,15 +270,15 @@ // %s is expanded later to the pagename if (strstr($map[$special], '%u')) $map[$special] = str_replace($map[$special], - '%u', + '%u', $GLOBALS['request']->_user->_userid); if (strstr($map[$special], '%b')) $map[$special] = str_replace($map[$special], - '%b', + '%b', PHPWIKI_BASE_URL); if (strstr($map[$special], '%d')) $map[$special] = str_replace($map[$special], - '%d', + '%d', // such as 2003-01-11T14:03:02+00:00 Iso8601DateTime()); } @@ -295,7 +295,7 @@ function _getMapFromFile ($filename) { if (defined('WARN_NONPUBLIC_INTERWIKIMAP') and WARN_NONPUBLIC_INTERWIKIMAP) { - $error_html = sprintf(_("Loading InterWikiMap from external file %s."), + $error_html = sprintf(_("Loading InterWikiMap from external file %s."), $filename); trigger_error( $error_html, E_USER_NOTICE ); } @@ -313,7 +313,7 @@ function _getRegexp () { if (!$this->_map) return '(?:(?!a)a)'; // Never matches. - + foreach (array_keys($this->_map) as $moniker) $qkeys[] = preg_quote($moniker, '/'); return "(?:" . join("|", $qkeys) . ")"; @@ -335,7 +335,7 @@ if (!empty($meta['markup'])) $this->_markup = $meta['markup']; else - $this->_markup = 2; // dump used old-markup as empty. + $this->_markup = 2; // dump used old-markup as empty. // FIXME: To be able to restore old plain-backups we should keep markup 1 as default. // New policy: default = new markup (old crashes quite often) } @@ -355,7 +355,7 @@ } } -class PageFormatter_wikitext extends PageFormatter +class PageFormatter_wikitext extends PageFormatter { function format(&$text) { return HTML::div(array('class' => 'wikitext'), @@ -379,12 +379,12 @@ function _getFooter($text) { return preg_replace('@.*?(</verbatim>|\Z)@s', '', $text, 1); } - + function _getMap($pagetext) { $map = getInterwikiMap($pagetext, 'force'); return $map->_map; } - + function _formatMap($pagetext) { $map = $this->_getMap($pagetext); if (!$map) @@ -392,14 +392,14 @@ $mon_attr = array('class' => 'interwiki-moniker'); $url_attr = array('class' => 'interwiki-url'); - + $thead = HTML::thead(HTML::tr(HTML::th($mon_attr, _("Moniker")), HTML::th($url_attr, _("InterWiki Address")))); foreach ($map as $moniker => $interurl) { $rows[] = HTML::tr(HTML::td($mon_attr, new Cached_WikiLinkIfKnown($moniker)), HTML::td($url_attr, HTML::tt($interurl))); } - + return HTML::table(array('class' => 'interwiki-map'), $thead, HTML::tbody(false, $rows)); @@ -422,7 +422,7 @@ class PageFormatter_attach extends PageFormatter { var $type, $prefix; - + // Display templated contents for wikiblog, comment and wikiforum function format($text) { if (empty($this->type)) @@ -439,7 +439,7 @@ $meta = $this->_meta[$this->type]; foreach(array('ctime', 'creator', 'creator_id') as $key) $tokens[$this->prefix . "_" . strtoupper($key)] = $meta[$key]; - + return new Template($this->type, $request, $tokens); } } @@ -454,12 +454,12 @@ var $type = 'wikiforum', $prefix = "FORUM"; } -/** wikiabuse for htmlarea editing. not yet used. +/** wikiabuse for htmlarea editing. not yet used. * * Warning! Once a page is edited with a htmlarea like control it is * stored in HTML and cannot be converted back to WikiText as long as - * we have no HTML => WikiText or any other interim format (WikiExchangeFormat e.g. XML) - * converter. See lib/HtmlParser.php for ongoing work on that. + * we have no HTML => WikiText or any other interim format (WikiExchangeFormat e.g. XML) + * converter. See lib/HtmlParser.php for ongoing work on that. * So it has a viral effect and certain plugins will not work anymore. * But a lot of wikiusers seem to like it. */ @@ -497,7 +497,7 @@ // We can make use of several pdf extensions. This one - fpdf // - is pure php and very easy, but looks quite ugly and has a - // terrible interface, as terrible as most of the othes. + // terrible interface, as terrible as most of the othes. // The closest to HTML is htmldoc which needs an external cgi // binary. // We use a custom HTML->PDF class converter from PHPWebthings Modified: trunk/lib/RssParser.php =================================================================== --- trunk/lib/RssParser.php 2010-08-11 12:33:25 UTC (rev 7640) +++ trunk/lib/RssParser.php 2010-08-11 13:00:46 UTC (rev 7641) @@ -12,21 +12,21 @@ */ /* - This file is part of PhpWiki. - - PhpWiki is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - 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 - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with PhpWiki; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * This file is part of PhpWiki. + * + * PhpWiki is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * 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 + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with PhpWiki; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /** Modified: trunk/lib/SemanticWeb.php =================================================================== --- trunk/lib/SemanticWeb.php 2010-08-11 12:33:25 UTC (rev 7640) +++ trunk/lib/SemanticWeb.php 2010-08-11 13:00:46 UTC (rev 7641) @@ -84,23 +84,23 @@ */ /*============================================================================*/ /* - Copyright 2004,2007 Reini Urban - - This file is part of PhpWiki. - - PhpWiki is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - 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 - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with PhpWiki; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Copyright 2004,2007 Reini Urban + * + * This file is part of PhpWiki. + * + * PhpWiki is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * 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 + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with PhpWiki; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ require_once('lib/RssWriter.php'); @@ -403,5 +403,5 @@ // c-basic-offset: 4 // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil -// End: +// End: ?> Modified: trunk/lib/WikiDB/backend/ADODB.php =================================================================== --- trunk/lib/WikiDB/backend/ADODB.php 2010-08-11 12:33:25 UTC (rev 7640) +++ trunk/lib/WikiDB/backend/ADODB.php 2010-08-11 13:00:46 UTC (rev 7641) @@ -2,26 +2,25 @@ // rcs_id('$Id$'); /* - Copyright 2002,2004,2005,2006 $ThePhpWikiProgrammingTeam + * Copyright 2002,2004,2005,2006 $ThePhpWikiProgrammingTeam + * + * This file is part of PhpWiki. + * + * PhpWiki is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * 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 + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with PhpWiki; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ - This file is part of PhpWiki. - - PhpWiki is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - 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 - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with PhpWiki; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - /** * Based on PearDB.php. * @author: Lawrence Akka, Reini Urban @@ -162,7 +161,7 @@ $dbh->qstr($pagename))); return $row ? $row[0] : false; } - + function get_all_pagenames() { $dbh = &$this->_dbh; extract($this->_table_names); @@ -230,13 +229,13 @@ $where = sprintf("pagename=%s", $dbh->qstr($pagename)); $dbh->BeginTrans( ); $dbh->RowLock($page_tbl,$where); - + $data = $this->get_pagedata($pagename); if (!$data) { $data = array(); $this->_get_pageid($pagename, true); // Creates page record } - + $hits = (empty($data['hits'])) ? 0 : (int)$data['hits']; unset($data['hits']); @@ -353,7 +352,7 @@ 1); return $rs->fields ? (int)$rs->fields[0] : false; } - + /** * Get version data. * @@ -366,10 +365,10 @@ $dbh = &$this->_dbh; extract($this->_table_names); extract($this->_expressions); - + assert(is_string($pagename) and $pagename != ''); assert($version > 0); - + // FIXME: optimization: sometimes don't get page data? if ($want_content) { $fields = $this->page_tbl_fields . ", $page_tbl.pagedata AS pagedata" @@ -437,10 +436,10 @@ function set_versiondata($pagename, $version, $data) { $dbh = &$this->_dbh; $version_tbl = $this->_table_names['version_tbl']; - + $minor_edit = (int) !empty($data['is_minor_edit']); unset($data['is_minor_edit']); - + $mtime = (int)$data['mtime']; unset($data['mtime']); assert(!empty($mtime)); @@ -448,7 +447,7 @@ @$content = (string) $data['%content']; unset($data['%content']); unset($data['%pagedata']); - + $this->lock(array('page','recent','version','nonempty')); $dbh->BeginTrans( ); $dbh->CommitLock($version_tbl); @@ -468,7 +467,7 @@ else $dbh->RollbackTrans( ); $this->unlock(array('page','recent','version','nonempty')); } - + /** * Delete an old revision of a page. */ @@ -542,7 +541,7 @@ function purge_page($pagename) { $dbh = &$this->_dbh; extract($this->_table_names); - + $this->lock(array('version','recent','nonempty','page','link')); if ( ($id = $this->_get_pageid($pagename, false)) ) { $dbh->Execute("DELETE FROM $nonempty_tbl WHERE id=$id"); @@ -615,7 +614,7 @@ if ($relation) { $dbh->Execute("INSERT INTO $link_tbl (linkfrom, linkto, relation)" . " VALUES ($pageid, $linkid, $relation)"); - } else { + } else { $dbh->Execute("INSERT INTO $link_tbl (linkfrom, linkto)" . " VALUES ($pageid, $linkid)"); } @@ -702,7 +701,7 @@ if ($relation) { $dbh->Execute("INSERT INTO $link_tbl (linkfrom, linkto, relation)" . " VALUES ($pageid, $linkid, $relation)"); - } else { + } else { $dbh->Execute("INSERT INTO $link_tbl (linkfrom, linkto)" . " VALUES ($pageid, $linkid)"); } @@ -736,7 +735,7 @@ $this->unlock(array('link')); return true; } - + /** * Find pages which link to or are linked from a page. * @@ -785,7 +784,7 @@ echo "SELECT linkee.id AS id, linkee.pagename AS pagename, related.pagename as linkrelation FROM link, page linkee, page linker JOIN page related ON (link.relation=related.id) WHERE linkfrom=linker.id AND linkto=linkee.id AND linker.pagename='SanDiego'" | mysql phpwiki id pagename linkrelation 2268 California located_in -*/ +*/ if ($limit) { // extract from,count from limit list($offset,$count) = $this->limit($limit); @@ -883,7 +882,7 @@ //$dbh->SetFetchMode(ADODB_FETCH_NUM); return new WikiDB_backend_ADODB_iter($this, $result, $this->page_tbl_field_list); } - + /** * Title and fulltext search. */ @@ -894,13 +893,13 @@ extract($this->_table_names); $orderby = $this->sortby($sortby, 'db'); if ($orderby) $orderby = ' ORDER BY ' . $orderby; - + $table = "$nonempty_tbl, $page_tbl"; $join_clause = "$nonempty_tbl.id=$page_tbl.id"; $fields = $this->page_tbl_fields; $field_list = $this->page_tbl_field_list; $searchobj = new WikiDB_backend_ADODB_search($search, $dbh); - + if ($fullsearch) { $table .= ", $recent_tbl"; $join_clause .= " AND $page_tbl.id=$recent_tbl.id"; @@ -915,7 +914,7 @@ } else { $callback = new WikiMethodCb($searchobj, "_pagename_match_clause"); } - + $search_clause = $search->makeSqlClauseObj($callback); $sql = "SELECT $fields FROM $table" . " WHERE $join_clause" @@ -1000,7 +999,7 @@ $pick = array(); if ($since) $pick[] = "mtime >= $since"; - + if ($include_all_revisions) { // Include all revisions of each page. $table = "$page_tbl, $version_tbl"; @@ -1020,7 +1019,7 @@ $join_clause = "$page_tbl.id=$recent_tbl.id"; $table .= ", $version_tbl"; $join_clause .= " AND $version_tbl.id=$page_tbl.id"; - + if ($exclude_major_revisions) { // Include only most recent minor revision $pick[] = 'version=latestminor'; @@ -1068,7 +1067,7 @@ extract($this->_table_names); if ($orderby = $this->sortby($sortby, 'db', array('pagename','wantedfrom'))) $orderby = 'ORDER BY ' . $orderby; - + if ($exclude_from) // array of pagenames $exclude_from = " AND pp.pagename NOT IN ".$this->_sql_set($exclude_from); if ($exclude) // array of pagenames @@ -1107,7 +1106,7 @@ function rename_page($pagename, $to) { $dbh = &$this->_dbh; extract($this->_table_names); - + $this->lock(array('page','version','recent','nonempty','link')); if ( ($id = $this->_get_pageid($pagename, false)) ) { if ($new = $this->_get_pageid($to, false)) { @@ -1204,7 +1203,7 @@ function _lock_tables($tables, $write_lock) { return $this->_current_lock; } - + /** * Release a write lock on the tables in the SQL database. * @@ -1269,7 +1268,7 @@ function listOfTables() { return $this->_dbh->MetaTables(); } - + // other database needs another connection and other privileges. function listOfFields($database, $table) { $field_list = array(); @@ -1315,7 +1314,7 @@ $this->_fields = $field_list; } - + function count() { if (!$this->_result) { return false; @@ -1568,5 +1567,5 @@ // c-basic-offset: 4 // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil -// End: +// End: ?> Modified: trunk/lib/WikiDB/backend/PDO.php =================================================================== --- trunk/lib/WikiDB/backend/PDO.php 2010-08-11 12:33:25 UTC (rev 7640) +++ trunk/lib/WikiDB/backend/PDO.php 2010-08-11 13:00:46 UTC (rev 7641) @@ -2,25 +2,25 @@ // rcs_id('$Id$'); /* - Copyright 2005 $ThePhpWikiProgrammingTeam + * Copyright 2005 $ThePhpWikiProgrammingTeam + * + * This file is part of PhpWiki. + * + * PhpWiki is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * 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 + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with PhpWiki; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ - This file is part of PhpWiki. - - PhpWiki is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - 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 - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with PhpWiki; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ - /** * @author: Reini Urban */ @@ -220,7 +220,7 @@ else return false; } - + function get_all_pagenames() { $dbh = &$this->_dbh; extract($this->_table_names); @@ -292,7 +292,7 @@ $data = array(); $this->_get_pageid($pagename, true); // Creates page record } - + $hits = (empty($data['hits'])) ? 0 : (int)$data['hits']; unset($data['hits']); @@ -354,7 +354,7 @@ // attributes play this game. if ($pagename === '') return 0; - + $dbh = &$this->_dbh; $page_tbl = $this->_table_names['page_tbl']; $sth = $dbh->prepare("SELECT id FROM $page_tbl WHERE pagename=? LIMIT 1"); @@ -422,7 +422,7 @@ $sth->execute(); return $sth->fetchSingle(); } - + /** * Get version data. * @@ -435,10 +435,10 @@ $dbh = &$this->_dbh; extract($this->_table_names); extract($this->_expressions); - + assert(is_string($pagename) and $pagename != ''); assert($version > 0); - + // FIXME: optimization: sometimes don't get page data? if ($want_content) { $fields = $this->page_tbl_fields . ", $page_tbl.pagedata AS pagedata" @@ -508,10 +508,10 @@ function set_versiondata($pagename, $version, $data) { $dbh = &$this->_dbh; $version_tbl = $this->_table_names['version_tbl']; - + $minor_edit = (int) !empty($data['is_minor_edit']); unset($data['is_minor_edit']); - + $mtime = (int)$data['mtime']; unset($data['mtime']); assert(!empty($mtime)); @@ -519,7 +519,7 @@ @$content = (string) $data['%content']; unset($data['%content']); unset($data['%pagedata']); - + $this->lock(array('page','recent','version','nonempty')); $this->beginTransaction(); $id = $this->_get_pageid($pagename, true); @@ -559,7 +559,7 @@ else $this->rollBack( ); $this->unlock(array('page','recent','version','nonempty')); } - + /** * Delete an old revision of a page. */ @@ -638,7 +638,7 @@ function purge_page($pagename) { $dbh = &$this->_dbh; extract($this->_table_names); - + $this->lock(array('version','recent','nonempty','page','link')); if ( ($id = $this->_get_pageid($pagename, false)) ) { $dbh->query("DELETE FROM $version_tbl WHERE id=$id"); @@ -716,7 +716,7 @@ $this->unlock(array('link')); return true; } - + /** * Find pages which link to or are linked from a page. * @@ -832,7 +832,7 @@ $result = $sth->fetch(PDO_FETCH_BOTH); return new WikiDB_backend_PDO_iter($this, $result, $this->page_tbl_field_list); } - + /** * Title search. */ @@ -848,7 +848,7 @@ $fields = $this->page_tbl_fields; $field_list = $this->page_tbl_field_list; $searchobj = new WikiDB_backend_PDO_search($search, $dbh); - + if ($fullsearch) { $table .= ", $recent_tbl"; $join_clause .= " AND $page_tbl.id=$recent_tbl.id"; @@ -862,7 +862,7 @@ } else { $callback = new WikiMethodCb($searchobj, "_pagename_match_clause"); } - + $search_clause = $search->makeSqlClauseObj($callback); $sth = $dbh->prepare("SELECT $fields FROM $table" . " WHERE $join_clause" @@ -942,7 +942,7 @@ $pick = array(); if ($since) $pick[] = "mtime >= $since"; - + if ($include_all_revisions) { // Include all revisions of each page. $table = "$page_tbl, $version_tbl"; @@ -962,7 +962,7 @@ $join_clause = "$page_tbl.id=$recent_tbl.id"; $table .= ", $version_tbl"; $join_clause .= " AND $version_tbl.id=$page_tbl.id"; - + if ($exclude_major_revisions) { // Include only most recent minor revision $pick[] = 'version=latestminor'; @@ -1008,7 +1008,7 @@ extract($this->_table_names); if ($orderby = $this->sortby($sortby, 'db', array('pagename','wantedfrom'))) $orderby = 'ORDER BY ' . $orderby; - + if ($exclude_from) // array of pagenames $exclude_from = " AND linked.pagename NOT IN ".$this->_sql_set($exclude_from); if ($exclude) // array of pagenames @@ -1047,7 +1047,7 @@ function rename_page($pagename, $to) { $dbh = &$this->_dbh; extract($this->_table_names); - + $this->lock(array('page','version','recent','nonempty','link')); if ( ($id = $this->_get_pageid($pagename, false)) ) { if ($new = $this->_get_pageid($to, false)) { @@ -1153,7 +1153,7 @@ } $this->_dbh->query("LOCK TABLES " . join(",", $locks)); } - + /** * Release a write lock on the tables in the SQL database. * @@ -1286,7 +1286,7 @@ $this->_result = $query_result; //$this->_fields = $field_list; } - + function count() { if (!is_object($this->_result)) { return false; @@ -1497,5 +1497,5 @@ // c-basic-offset: 4 // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil -// End: +// End: ?> Modified: trunk/lib/WikiDB/backend/PDO_mysql.php =================================================================== --- trunk/lib/WikiDB/backend/PDO_mysql.php 2010-08-11 12:33:25 UTC (rev 7640) +++ trunk/lib/WikiDB/backend/PDO_mysql.php 2010-08-11 13:00:46 UTC (rev 7641) @@ -2,25 +2,25 @@ // rcs_id('$Id$'); /* - Copyright 2005 $ThePhpWikiProgrammingTeam + * Copyright 2005 $ThePhpWikiProgrammingTeam + * + * This file is part of PhpWiki. + * + * PhpWiki is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * 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 + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with PhpWiki; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ - This file is part of PhpWiki. - - PhpWiki is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - 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 - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with PhpWiki; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ - /** * @author: Reini Urban */ @@ -156,5 +156,5 @@ // c-basic-offset: 4 // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil -// End: +// End: ?> Modified: trunk/lib/WikiDB/backend/PDO_oci8.php =================================================================== --- trunk/lib/WikiDB/backend/PDO_oci8.php 2010-08-11 12:33:25 UTC (rev 7640) +++ trunk/lib/WikiDB/backend/PDO_oci8.php 2010-08-11 13:00:46 UTC (rev 7641) @@ -2,25 +2,25 @@ // rcs_id('$Id$'); /* - Copyright 2007 $ThePhpWikiProgrammingTeam + * Copyright 2007 $ThePhpWikiProgrammingTeam + * + * This file is part of PhpWiki. + * + * PhpWiki is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * 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 + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with PhpWiki; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ - This file is part of PhpWiki. - - PhpWiki is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - 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 - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with PhpWiki; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ - /** * @author: Reini Urban */ @@ -41,7 +41,7 @@ */ function _lock_tables($write_lock=true) { $dbh = &$this->_dbh; - + // Not sure if we really need to lock tables here, the Oracle row // locking mechanism should be more than enough // For the time being, lets stay on the safe side and lock... @@ -93,5 +93,5 @@ // c-basic-offset: 4 // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil -// End: +// End: ?> Modified: trunk/lib/WikiDB/backend/PDO_pgsql.php =================================================================== --- trunk/lib/WikiDB/backend/PDO_pgsql.php 2010-08-11 12:33:25 UTC (rev 7640) +++ trunk/lib/WikiDB/backend/PDO_pgsql.php 2010-08-11 13:00:46 UTC (rev 7641) @@ -2,25 +2,25 @@ // rcs_id('$Id$'); /* - Copyright 2005 $ThePhpWikiProgrammingTeam + * Copyright 2005 $ThePhpWikiProgrammingTeam + * + * This file is part of PhpWiki. + * + * PhpWiki is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * 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 + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with PhpWiki; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ - This file is part of PhpWiki. - - PhpWiki is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - 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 - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with PhpWiki; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ - /** * @author: Reini Urban */ @@ -56,5 +56,5 @@ // c-basic-offset: 4 // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil -// End: +// End: ?> Modified: trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php =================================================================== --- trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php 2010-08-11 12:33:25 UTC (rev 7640) +++ trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php 2010-08-11 13:00:46 UTC (rev 7641) @@ -1,23 +1,23 @@ <?php // -*-php-*- // rcs_id('$Id$'); /* - Copyright 2007 Reini Urban - - This file is part of PhpWiki. - - PhpWiki is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - 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 - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with PhpWiki; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Copyright 2007 Reini Urban + * + * This file is part of PhpWiki. + * + * PhpWiki is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * 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 + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with PhpWiki; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /** Modified: trunk/lib/WikiDB/backend/file.php =================================================================== --- trunk/lib/WikiDB/backend/file.php 2010-08-11 12:33:25 UTC (rev 7640) +++ trunk/lib/WikiDB/backend/file.php 2010-08-11 13:00:46 UTC (rev 7641) @@ -2,23 +2,23 @@ // rcs_id('$Id$'); /** - Copyright 1999, 2000, 2001, 2002, 2003 $ThePhpWikiProgrammingTeam - - This file is part of PhpWiki. - - PhpWiki is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - 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 - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with PhpWiki; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Copyright 1999, 2000, 2001, 2002, 2003 $ThePhpWikiProgrammingTeam + * + * This file is part of PhpWiki. + * + * PhpWiki is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * 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 + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with PhpWiki; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /** @@ -311,7 +311,7 @@ $this->_savePageData($pagename, $newdata); // create a new pagedata-file return; } - + foreach ($newdata as $key => $val) { if (empty($val)) unset($data[$key]); @@ -320,8 +320,8 @@ } $this->_savePageData($pagename, $data); // write new pagedata-file } - + /** * Get the current version number for a page. * @@ -332,7 +332,7 @@ function get_latest_version($pagename) { return $this->_getLatestVersion($pagename); } - + /** * Get preceding version number. * @@ -350,7 +350,7 @@ } return $prev; } - + /** * Get revision meta-data and content. * @@ -426,7 +426,7 @@ // remove page from latest_version... $this->_setLatestVersion($pagename, 0); } - + /** * Delete an old revision of a page. * @@ -453,7 +453,7 @@ } } $this->_removePage('ver_data', $pagename, $version); - } + } /** * Create a new page revision. @@ -497,7 +497,7 @@ } $this->set_versiondata($pagename, $version, $data); } - + /** * Set links for page. * @@ -508,7 +508,7 @@ function set_links($pagename, $links) { $this->_savePageLinks($pagename, $links); } - + /** * Find pages which link to or are linked from a page. * @@ -552,7 +552,7 @@ return new WikiDB_backend_dumb_AllRevisionsIter($this, $pagename); } */ - + /** * Get all pages in the database. * @@ -678,7 +678,7 @@ $search = strtolower(trim($search)); if (!$search) return array(array(),array()); - + $words = preg_split('/\s+/', $search); $exclude = array(); foreach ($words as $key => $word) { @@ -690,7 +690,7 @@ } return array($words, $exclude); } - + }; class WikiDB_backend_file_iter extends WikiDB_backend_iterator @@ -703,7 +703,7 @@ if (count($this->_result) > 0) reset($this->_result); } - + function next() { if (!$this->_result) return false; @@ -714,7 +714,7 @@ if ($e == false) { return false; } - + $pn = $e[1]; if (is_array($pn) and isset($pn['linkto'])) { // support relation link iterator $pn = $pn['linkto']; Modified: trunk/lib/WikiDB/backend/flatfile.php =================================================================== --- trunk/lib/WikiDB/backend/flatfile.php 2010-08-11 12:33:25 UTC (rev 7640) +++ trunk/lib/WikiDB/backend/flatfile.php 2010-08-11 13:00:46 UTC (rev 7641) @@ -2,23 +2,23 @@ // rcs_id('$Id$'); /** - Copyright 1999,2005,2006 $ThePhpWikiProgrammingTeam - - This file is part of PhpWiki. - - PhpWiki is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - 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 - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with PhpWiki; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Copyright 1999,2005,2006 $ThePhpWikiProgrammingTeam + * + * This file is part of PhpWiki. + * + * PhpWiki is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * 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 + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with PhpWiki; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /** @@ -51,7 +51,7 @@ return $this->_dir_names[$type].'/'.FilenameForPage($pagename); else return $this->_dir_names[$type].'/'.FilenameForPage($pagename).'--'.$version; -*/ +*/ } // Load/Save Page-Data @@ -62,7 +62,7 @@ } } //$pd = $this->_loadPage('page_data', $pagename, 0); - + $filename = $this->_pagename2filename('page_data', $pagename, 0); if (!file_exists($filename)) return NULL; if (!filesize($filename)) return array(); @@ -85,7 +85,7 @@ } fclose($fd); } - + if ($pd != NULL) $this->_page_data = $pd; if ($this->_page_data != NULL) { @@ -95,7 +95,7 @@ } return array(); // no values found } - + /** Store latest version as full page_data flatfile, * earlier versions as file backend ver_data. * _cached_html will not be stored. @@ -114,7 +114,7 @@ $this->_savePage('ver_data', $pagename, $version, $data); } } - + // This is different to file and not yet finished. // TODO: fields not being saved as page_data should be saved to ver_data // Store as full page_data flatfile @@ -176,7 +176,7 @@ $pagedata .= sprintf("Mime-Version: 1.0 (Produced by PhpWiki %s)\r\n", PHPWIKI_VERSION); $pagedata .= MimeifyPageRevision($page, $current); - + if ($fd = fopen($filename, 'a+b')) { $locked = flock($fd, 2); // Exclusive blocking lock if (!$locked) { Modified: trunk/lib/WikiDB/file.php =================================================================== --- trunk/lib/WikiDB/file.php 2010-08-11 12:33:25 UTC (rev 7640) +++ trunk/lib/WikiDB/file.php 2010-08-11 13:00:46 UTC (rev 7641) @@ -3,23 +3,23 @@ // rcs_id( '$Id$' ); /** - Copyright 1999, 2000, 2001, 2002, 2003 $ThePhpWikiProgrammingTeam - - This file is part of PhpWiki. - - PhpWiki is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - 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 - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with PhpWiki; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Copyright 1999, 2000, 2001, 2002, 2003 $ThePhpWikiProgrammingTeam + * + * This file is part of PhpWiki. + * + * PhpWiki is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * 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 + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with PhpWiki; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -55,6 +55,6 @@ // c-basic-offset: 4 // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil -// End: +// End: ?> Modified: trunk/lib/WikiDB/flatfile.php =================================================================== --- trunk/lib/WikiDB/flatfile.php 2010-08-11 12:33:25 UTC (rev 7640) +++ trunk/lib/WikiDB/flatfile.php 2010-08-11 13:00:46 UTC (rev 7641) @@ -1,28 +1,26 @@ <?php - // rcs_id( '$Id$' ); /** - Copyright 1999, 2005 $ThePhpWikiProgrammingTeam - - This file is part of PhpWiki. - - PhpWiki is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - 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 - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with PhpWiki; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Copyright 1999, 2005 $ThePhpWikiProgrammingTeam + * + * This file is part of PhpWiki. + * + * PhpWiki is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * 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 + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with PhpWiki; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - require_once( 'lib/WikiDB.php' ); require_once( 'lib/WikiDB/backend/flatfile.php' ); @@ -55,6 +53,5 @@ // c-basic-offset: 4 // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil -// End: - +// End: ?> Modified: trunk/lib/XmlParser.php =================================================================== --- trunk/lib/XmlParser.php 2010-08-11 12:33:25 UTC (rev 7640) +++ trunk/lib/XmlParser.php 2010-08-11 13:00:46 UTC (rev 7641) @@ -21,21 +21,21 @@ */ /* - This file is part of PhpWiki. - - PhpWiki is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - 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 - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with PhpWiki; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * This file is part of PhpWiki. + * + * PhpWiki is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * 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 + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with PhpWiki; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /** @@ -79,7 +79,7 @@ if (!empty($this->_parser)) xml_parser_free($this->_parser); unset($this->_parser); - + if (isset($xml_parser_root)) { $xml_parser_root->_destruct(); unset($xml_parser_root); // nested parsing forbidden! Modified: trunk/lib/install.php =================================================================== --- trunk/lib/install.php 2010-08-11 12:33:25 UTC (rev 7640) +++ trunk/lib/install.php 2010-08-11 13:00:46 UTC (rev 7641) @@ -2,23 +2,23 @@ // rcs_id('$Id$'); /* - Copyright 2004 $ThePhpWikiProgrammingTeam - - This file is part of PhpWiki. - - PhpWiki is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any late... [truncated message content] |
From: <var...@us...> - 2010-12-20 12:37:31
|
Revision: 7787 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7787&view=rev Author: vargenau Date: 2010-12-20 12:37:25 +0000 (Mon, 20 Dec 2010) Log Message: ----------- Spelling Modified Paths: -------------- trunk/lib/WikiUserNew.php trunk/lib/plugin/Transclude.php Modified: trunk/lib/WikiUserNew.php =================================================================== --- trunk/lib/WikiUserNew.php 2010-12-20 09:32:36 UTC (rev 7786) +++ trunk/lib/WikiUserNew.php 2010-12-20 12:37:25 UTC (rev 7787) @@ -1759,7 +1759,7 @@ if ($ok) { return $value; } else { - trigger_error("E-Mail Validation Error: ".$msg, E_USER_WARNING); + trigger_error("E-mail Validation Error: ".$msg, E_USER_WARNING); return $this->default_value; } } @@ -1839,11 +1839,11 @@ if (!preg_match($rfc822re, $email)) { $result[0] = false; - $result[1] = sprintf(_("E-Mail address '%s' is not properly formatted"), $email); + $result[1] = sprintf(_("E-mail address '%s' is not properly formatted"), $email); return $result; } if ($noconnect) - return array(true, sprintf(_("E-Mail address '%s' is properly formatted"), $email)); + return array(true, sprintf(_("E-mail address '%s' is properly formatted"), $email)); list ( $Username, $Domain ) = explode("@", $email); //Todo: getmxrr workaround on windows or manual input field to verify it manually @@ -1883,11 +1883,11 @@ } } else { $result[0]=false; - $result[1]="Can not connect E-Mail server."; + $result[1]="Cannot connect e-mail server."; return $result; } $result[0]=true; - $result[1]="E-Mail address '$email' appears to be valid."; + $result[1]="E-mail address '$email' appears to be valid."; return $result; } // end of function Modified: trunk/lib/plugin/Transclude.php =================================================================== --- trunk/lib/plugin/Transclude.php 2010-12-20 09:32:36 UTC (rev 7786) +++ trunk/lib/plugin/Transclude.php 2010-12-20 12:37:25 UTC (rev 7787) @@ -143,7 +143,7 @@ frame.height = content.height + 2 * frame.marginHeight; } catch (e) { - // Can not get content.height unless transcluded doc + // Cannot get content.height unless transcluded doc // is from the same server... return; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2010-12-21 13:23:51
|
Revision: 7797 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7797&view=rev Author: vargenau Date: 2010-12-21 13:23:45 +0000 (Tue, 21 Dec 2010) Log Message: ----------- Fix: Cannot call a template with double quotes - ID: 2094827 Modified Paths: -------------- trunk/lib/BlockParser.php trunk/lib/InlineParser.php trunk/lib/config.php trunk/lib/plugin/Template.php Modified: trunk/lib/BlockParser.php =================================================================== --- trunk/lib/BlockParser.php 2010-12-20 16:02:14 UTC (rev 7796) +++ trunk/lib/BlockParser.php 2010-12-21 13:23:45 UTC (rev 7797) @@ -1,7 +1,7 @@ <?php // rcs_id('$Id$'); /* Copyright (C) 2002 Geoffrey T. Dairiki <da...@da...> * Copyright (C) 2004,2005 Reini Urban - * Copyright (C) 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent + * Copyright (C) 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent * * This file is part of PhpWiki. * @@ -1174,6 +1174,11 @@ } $pi = str_replace("\n", "", $pi); + + // The argument value might contain a double quote (") + // We have to encode that. + $pi = htmlspecialchars($pi); + $vars = ''; if (preg_match('/^(\S+?)\|(.*)$/', $pi, $_m)) { Modified: trunk/lib/InlineParser.php =================================================================== --- trunk/lib/InlineParser.php 2010-12-20 16:02:14 UTC (rev 7796) +++ trunk/lib/InlineParser.php 2010-12-21 13:23:45 UTC (rev 7797) @@ -1084,6 +1084,11 @@ } $page = str_replace("\n", "", $page); + + // The argument value might contain a double quote (") + // We have to encode that. + $page = htmlspecialchars($page); + $vars = ''; if (preg_match('/^(\S+?)\|(.*)$/', $page, $_m)) { Modified: trunk/lib/config.php =================================================================== --- trunk/lib/config.php 2010-12-20 16:02:14 UTC (rev 7796) +++ trunk/lib/config.php 2010-12-21 13:23:45 UTC (rev 7797) @@ -335,6 +335,15 @@ } } +// htmlspecialchars_decode exists for PHP >= 5.1 +if (!function_exists('htmlspecialchars_decode')) { + + function htmlspecialchars_decode($text) { + return strtr($text, array_flip(get_html_translation_table(HTML_SPECIALCHARS))); + } + +} + /** * safe php4 definition for clone. * php5 copies objects by reference, but we need to clone "deep copy" in some places. Modified: trunk/lib/plugin/Template.php =================================================================== --- trunk/lib/plugin/Template.php 2010-12-20 16:02:14 UTC (rev 7796) +++ trunk/lib/plugin/Template.php 2010-12-21 13:23:45 UTC (rev 7797) @@ -2,7 +2,7 @@ // rcs_id('$Id$'); /* * Copyright 2005,2007 $ThePhpWikiProgrammingTeam - * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent + * Copyright 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent * * This file is part of PhpWiki. * @@ -253,8 +253,9 @@ $var['BASE_URL'] = PHPWIKI_BASE_URL; foreach ($var as $key => $val) { - //$content = preg_replace("/%%".preg_quote($key,"/")."%%/", $val, $content); - $content = str_replace("%%".$key."%%", $val, $content); + // We have to decode the double quotes that have been encoded + // in inline or block parser. + $content = str_replace("%%".$key."%%", htmlspecialchars_decode($val), $content); } } return $content; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2011-01-07 10:05:03
|
Revision: 7819 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7819&view=rev Author: vargenau Date: 2011-01-07 10:04:56 +0000 (Fri, 07 Jan 2011) Log Message: ----------- Move compute_tablecell to Wikicreoletable plugin Modified Paths: -------------- trunk/lib/plugin/WikicreoleTable.php trunk/lib/stdlib.php Modified: trunk/lib/plugin/WikicreoleTable.php =================================================================== --- trunk/lib/plugin/WikicreoleTable.php 2011-01-07 09:58:36 UTC (rev 7818) +++ trunk/lib/plugin/WikicreoleTable.php 2011-01-07 10:04:56 UTC (rev 7819) @@ -106,7 +106,7 @@ if (!isset($table[$i][$j])) { $table[$i][$j] = ''; } else if (preg_match('/@@/', $table[$i][$j])) { - $table[$i][$j] = compute_tablecell($table, $i, $j, $nbrows, $nbcols); + $table[$i][$j] = $this->_compute_tablecell($table, $i, $j, $nbrows, $nbcols); } } } @@ -147,6 +147,156 @@ return $row; } + /** + * Compute cell in spreadsheet table + * $table: two-dimensional table + * $i and $j: indexes of cell to compute + * $imax and $jmax: table dimensions + */ + function _compute_tablecell ($table, $i, $j, $imax, $jmax) { + + // What is implemented: + // @@=SUM(R)@@ : sum of cells in current row + // @@=SUM(C)@@ : sum of cells in current column + // @@=AVERAGE(R)@@ : average of cells in current row + // @@=AVERAGE(C)@@ : average of cells in current column + // @@=MAX(R)@@ : maximum value of cells in current row + // @@=MAX(C)@@ : maximum value of cells in current column + // @@=MIN(R)@@ : minimum value of cells in current row + // @@=MIN(C)@@ : minimum value of cells in current column + // @@=COUNT(R)@@ : number of cells in current row + // (numeric or not, excluding headers and current cell) + // @@=COUNT(C)@@ : number of cells in current column + // (numeric or not, excluding headers and current cell) + + $result=0; + $counter=0; + $found=false; + + if (strpos($table[$i][$j], "@@=SUM(C)@@") !== false) { + for ($index=0; $index<$imax; $index++) { + if (is_numeric($table[$index][$j])) { + $result += $table[$index][$j]; + } + } + return str_replace("@@=SUM(C)@@", $result, $table[$i][$j]); + + } else if (strpos($table[$i][$j], "@@=SUM(R)@@") !== false) { + for ($index=0; $index<$jmax; $index++) { + if (is_numeric($table[$i][$index])) { + $result += $table[$i][$index]; + } + } + return str_replace("@@=SUM(R)@@", $result, $table[$i][$j]); + + } else if (strpos($table[$i][$j], "@@=AVERAGE(C)@@") !== false) { + for ($index=0; $index<$imax; $index++) { + if (is_numeric($table[$index][$j])) { + $result += $table[$index][$j]; + $counter++; + } + } + $result=$result/$counter; + return str_replace("@@=AVERAGE(C)@@", $result, $table[$i][$j]); + + } else if (strpos($table[$i][$j], "@@=AVERAGE(R)@@") !== false) { + for ($index=0; $index<$jmax; $index++) { + if (is_numeric($table[$i][$index])) { + $result += $table[$i][$index]; + $counter++; + } + } + $result=$result/$counter; + return str_replace("@@=AVERAGE(R)@@", $result, $table[$i][$j]); + + } else if (strpos($table[$i][$j], "@@=MAX(C)@@") !== false) { + for ($index=0; $index<$imax; $index++) { + if (is_numeric($table[$index][$j])) { + if (!$found) { + $found=true; + $result=$table[$index][$j]; + } else { + $result = max($result, $table[$index][$j]); + } + } + } + if (!$found) { + $result=""; + } + return str_replace("@@=MAX(C)@@", $result, $table[$i][$j]); + + } else if (strpos($table[$i][$j], "@@=MAX(R)@@") !== false) { + for ($index=0; $index<$jmax; $index++) { + if (is_numeric($table[$i][$index])) { + if (!$found) { + $found=true; + $result=$table[$i][$index]; + } else { + $result = max($result, $table[$i][$index]); + } + } + } + if (!$found) { + $result=""; + } + return str_replace("@@=MAX(R)@@", $result, $table[$i][$j]); + + } else if (strpos($table[$i][$j], "@@=MIN(C)@@") !== false) { + for ($index=0; $index<$imax; $index++) { + if (is_numeric($table[$index][$j])) { + if (!$found) { + $found=true; + $result=$table[$index][$j]; + } else { + $result = min($result, $table[$index][$j]); + } + } + } + if (!$found) { + $result=""; + } + return str_replace("@@=MIN(C)@@", $result, $table[$i][$j]); + + } else if (strpos($table[$i][$j], "@@=MIN(R)@@") !== false) { + for ($index=0; $index<$jmax; $index++) { + if (is_numeric($table[$i][$index])) { + if (!$found) { + $found=true; + $result=$table[$i][$index]; + } else { + $result = min($result, $table[$i][$index]); + } + } + } + if (!$found) { + $result=""; + } + return str_replace("@@=MIN(R)@@", $result, $table[$i][$j]); + + } else if (strpos($table[$i][$j], "@@=COUNT(C)@@") !== false) { + for ($index=0; $index<$imax; $index++) { + // exclude header + if (!string_starts_with(trim($table[$index][$j]), "=")) { + $counter++; + } + } + $result = $counter-1; // exclude self + return str_replace("@@=COUNT(C)@@", $result, $table[$i][$j]); + + } else if (strpos($table[$i][$j], "@@=COUNT(R)@@") !== false) { + for ($index=0; $index<$jmax; $index++) { + // exclude header + if (!string_starts_with(trim($table[$i][$index]), "=")) { + $counter++; + } + } + $result = $counter-1; // exclude self + return str_replace("@@=COUNT(R)@@", $result, $table[$i][$j]); + } + + return $table[$i][$j]; + } + } // Local Variables: Modified: trunk/lib/stdlib.php =================================================================== --- trunk/lib/stdlib.php 2011-01-07 09:58:36 UTC (rev 7818) +++ trunk/lib/stdlib.php 2011-01-07 10:04:56 UTC (rev 7819) @@ -100,7 +100,6 @@ parse_attributes($line) is_image ($filename) is_video ($filename) - compute_tablecell ($table, $i, $j, $imax, $jmax) function: linkExistingWikiWord($wikiword, $linktext, $version) moved to: lib/WikiTheme.php @@ -2484,154 +2483,6 @@ } /** - * Compute cell in spreadsheet table - * $table: two-dimensional table - * $i and $j: indexes of cell to compute - * $imax and $jmax: table dimensions - */ -function compute_tablecell ($table, $i, $j, $imax, $jmax) { - - // What is implemented: - // @@=SUM(R)@@ : sum of cells in current row - // @@=SUM(C)@@ : sum of cells in current column - // @@=AVERAGE(R)@@ : average of cells in current row - // @@=AVERAGE(C)@@ : average of cells in current column - // @@=MAX(R)@@ : maximum value of cells in current row - // @@=MAX(C)@@ : maximum value of cells in current column - // @@=MIN(R)@@ : minimum value of cells in current row - // @@=MIN(C)@@ : minimum value of cells in current column - // @@=COUNT(R)@@ : number of cells in current row - // (numeric or not, excluding headers and current cell) - // @@=COUNT(C)@@ : number of cells in current column - // (numeric or not, excluding headers and current cell) - - $result=0; - $counter=0; - $found=false; - - if (strpos($table[$i][$j], "@@=SUM(C)@@") !== false) { - for ($index=0; $index<$imax; $index++) { - if (is_numeric($table[$index][$j])) { - $result += $table[$index][$j]; - } - } - return str_replace("@@=SUM(C)@@", $result, $table[$i][$j]); - - } else if (strpos($table[$i][$j], "@@=SUM(R)@@") !== false) { - for ($index=0; $index<$jmax; $index++) { - if (is_numeric($table[$i][$index])) { - $result += $table[$i][$index]; - } - } - return str_replace("@@=SUM(R)@@", $result, $table[$i][$j]); - - } else if (strpos($table[$i][$j], "@@=AVERAGE(C)@@") !== false) { - for ($index=0; $index<$imax; $index++) { - if (is_numeric($table[$index][$j])) { - $result += $table[$index][$j]; - $counter++; - } - } - $result=$result/$counter; - return str_replace("@@=AVERAGE(C)@@", $result, $table[$i][$j]); - - } else if (strpos($table[$i][$j], "@@=AVERAGE(R)@@") !== false) { - for ($index=0; $index<$jmax; $index++) { - if (is_numeric($table[$i][$index])) { - $result += $table[$i][$index]; - $counter++; - } - } - $result=$result/$counter; - return str_replace("@@=AVERAGE(R)@@", $result, $table[$i][$j]); - - } else if (strpos($table[$i][$j], "@@=MAX(C)@@") !== false) { - for ($index=0; $index<$imax; $index++) { - if (is_numeric($table[$index][$j])) { - if (!$found) { - $found=true; - $result=$table[$index][$j]; - } else { - $result = max($result, $table[$index][$j]); - } - } - } - if (!$found) { - $result=""; - } - return str_replace("@@=MAX(C)@@", $result, $table[$i][$j]); - - } else if (strpos($table[$i][$j], "@@=MAX(R)@@") !== false) { - for ($index=0; $index<$jmax; $index++) { - if (is_numeric($table[$i][$index])) { - if (!$found) { - $found=true; - $result=$table[$i][$index]; - } else { - $result = max($result, $table[$i][$index]); - } - } - } - if (!$found) { - $result=""; - } - return str_replace("@@=MAX(R)@@", $result, $table[$i][$j]); - - } else if (strpos($table[$i][$j], "@@=MIN(C)@@") !== false) { - for ($index=0; $index<$imax; $index++) { - if (is_numeric($table[$index][$j])) { - if (!$found) { - $found=true; - $result=$table[$index][$j]; - } else { - $result = min($result, $table[$index][$j]); - } - } - } - if (!$found) { - $result=""; - } - return str_replace("@@=MIN(C)@@", $result, $table[$i][$j]); - - } else if (strpos($table[$i][$j], "@@=MIN(R)@@") !== false) { - for ($index=0; $index<$jmax; $index++) { - if (is_numeric($table[$i][$index])) { - if (!$found) { - $found=true; - $result=$table[$i][$index]; - } else { - $result = min($result, $table[$i][$index]); - } - } - } - if (!$found) { - $result=""; - } - return str_replace("@@=MIN(R)@@", $result, $table[$i][$j]); - - } else if (strpos($table[$i][$j], "@@=COUNT(C)@@") !== false) { - for ($index=0; $index<$imax; $index++) { - if (!string_starts_with(trim($table[$index][$j]), "=")) { // exclude header - $counter++; - } - } - $result = $counter-1; // exclude self - return str_replace("@@=COUNT(C)@@", $result, $table[$i][$j]); - - } else if (strpos($table[$i][$j], "@@=COUNT(R)@@") !== false) { - for ($index=0; $index<$jmax; $index++) { - if (!string_starts_with(trim($table[$i][$index]), "=")) { // exclude header - $counter++; - } - } - $result = $counter-1; // exclude self - return str_replace("@@=COUNT(R)@@", $result, $table[$i][$j]); - } - - return $table[$i][$j]; -} - -/** * Remove accents from given text. */ function strip_accents($text) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2011-01-21 13:28:54
|
Revision: 7853 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7853&view=rev Author: vargenau Date: 2011-01-21 13:28:47 +0000 (Fri, 21 Jan 2011) Log Message: ----------- Use CSS class "error" instead of "errors" Modified Paths: -------------- trunk/lib/WikiPlugin.php trunk/lib/plugin/PageDump.php trunk/lib/plugin/UserPreferences.php trunk/lib/plugin/WatchPage.php Modified: trunk/lib/WikiPlugin.php =================================================================== --- trunk/lib/WikiPlugin.php 2011-01-21 13:21:14 UTC (rev 7852) +++ trunk/lib/WikiPlugin.php 2011-01-21 13:28:47 UTC (rev 7853) @@ -353,7 +353,7 @@ } function error ($message) { - return HTML::span(array('class' => 'errors'), + return HTML::span(array('class' => 'error'), HTML::strong(fmt("Plugin %s failed.", $this->getName())), ' ', $message); } Modified: trunk/lib/plugin/PageDump.php =================================================================== --- trunk/lib/plugin/PageDump.php 2011-01-21 13:21:14 UTC (rev 7852) +++ trunk/lib/plugin/PageDump.php 2011-01-21 13:28:47 UTC (rev 7853) @@ -219,7 +219,7 @@ return HTML($h2, HTML::em($desc), HTML::pre($mailified), $altpreviewbuttons, - HTML::div(array('class' => 'errors'), + HTML::div(array('class' => 'error'), HTML::strong(_("Warning:")), " ", $warning), $dl, $Sep, $dlall, $Sep, $dlsvn Modified: trunk/lib/plugin/UserPreferences.php =================================================================== --- trunk/lib/plugin/UserPreferences.php 2011-01-21 13:21:14 UTC (rev 7852) +++ trunk/lib/plugin/UserPreferences.php 2011-01-21 13:28:47 UTC (rev 7853) @@ -70,7 +70,7 @@ return ''; if (defined('FUSIONFORGE') and FUSIONFORGE) { if (!($user->isAuthenticated())) { - return HTML::div(array('class' => 'errors'), + return HTML::p(array('class' => 'error'), _("Error: You are not logged in, cannot display UserPreferences.")); } } @@ -81,7 +81,7 @@ or (isa($user,'_ForbiddenUser'))) { $no_args = $this->getDefaultArguments(); - $no_args['errmsg'] = HTML::div(array('class' => 'errors'), + $no_args['errmsg'] = HTML::p(array('class' => 'error'), _("Error: The user HomePage must be a valid WikiWord. Sorry, UserPreferences cannot be saved.")); $no_args['isForm'] = false; return Template('userprefs', $no_args); Modified: trunk/lib/plugin/WatchPage.php =================================================================== --- trunk/lib/plugin/WatchPage.php 2011-01-21 13:21:14 UTC (rev 7852) +++ trunk/lib/plugin/WatchPage.php 2011-01-21 13:28:47 UTC (rev 7853) @@ -116,8 +116,8 @@ if (!defined('FUSIONFORGE') or !FUSIONFORGE) { $email = $pref->get("email"); if (empty($email)) { - return HTML::div( - array('class' => 'errors'), + return HTML::p( + array('class' => 'error'), _("ERROR: No email defined! You need to do this in your "), WikiLink(_("UserPreferences"))); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2011-03-03 16:21:57
|
Revision: 7953 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7953&view=rev Author: vargenau Date: 2011-03-03 16:21:48 +0000 (Thu, 03 Mar 2011) Log Message: ----------- Remove rcs_id Modified Paths: -------------- trunk/lib/AccessLog.php trunk/lib/ArchiveCleaner.php trunk/lib/BlockParser.php trunk/lib/CachedMarkup.php trunk/lib/Captcha.php trunk/lib/DbSession.php trunk/lib/DbaDatabase.php trunk/lib/DbaListSet.php trunk/lib/DbaPartition.php trunk/lib/EditToolbar.php trunk/lib/ErrorManager.php trunk/lib/ExternalReferrer.php trunk/lib/FileFinder.php trunk/lib/HtmlElement.php trunk/lib/HtmlElement5.php trunk/lib/HtmlParser.php trunk/lib/HttpClient.php trunk/lib/IniConfig.php trunk/lib/InlineParser.php trunk/lib/MailNotify.php trunk/lib/PageList.php trunk/lib/PagePerm.php trunk/lib/PageType.php trunk/lib/RSSWriter091.php trunk/lib/Request.php trunk/lib/RssParser.php trunk/lib/RssWriter.php trunk/lib/RssWriter2.php trunk/lib/SemanticWeb.php trunk/lib/SpamBlocklist.php trunk/lib/Template.php trunk/lib/TextSearchQuery.php trunk/lib/Units.php trunk/lib/WikiCallback.php trunk/lib/WikiDB.php trunk/lib/WikiPlugin.php trunk/lib/WikiPluginCached.php trunk/lib/WikiTheme.php trunk/lib/WikiUser.php trunk/lib/WikiUserNew.php trunk/lib/WysiwygEdit.php trunk/lib/XmlElement.php trunk/lib/XmlParser.php trunk/lib/config.php trunk/lib/diff.php trunk/lib/diff3.php trunk/lib/difflib.php trunk/lib/display.php trunk/lib/editpage.php trunk/lib/fortune.php trunk/lib/imagecache.php trunk/lib/imdb.php trunk/lib/install.php trunk/lib/loadsave.php trunk/lib/main.php trunk/lib/pdf.php trunk/lib/prepend.php trunk/lib/purgepage.php trunk/lib/removepage.php trunk/lib/spam_babycart.php trunk/lib/stdlib.php trunk/lib/upgrade.php trunk/lib/ziplib.php Modified: trunk/lib/AccessLog.php =================================================================== --- trunk/lib/AccessLog.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/AccessLog.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,5 +1,5 @@ <?php -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2005, 2007 Reini Urban * Modified: trunk/lib/ArchiveCleaner.php =================================================================== --- trunk/lib/ArchiveCleaner.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/ArchiveCleaner.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,5 +1,5 @@ <?php -// rcs_id('$Id$'); +// $Id$ /* Copyright (C) 2002 Geoffrey T. Dairiki <da...@da...> * * This file is part of PhpWiki. Modified: trunk/lib/BlockParser.php =================================================================== --- trunk/lib/BlockParser.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/BlockParser.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,4 +1,4 @@ -<?php // rcs_id('$Id$'); +<?php // $Id$ /* Copyright (C) 2002 Geoffrey T. Dairiki <da...@da...> * Copyright (C) 2004,2005 Reini Urban * Copyright (C) 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent Modified: trunk/lib/CachedMarkup.php =================================================================== --- trunk/lib/CachedMarkup.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/CachedMarkup.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,5 +1,5 @@ <?php -// rcs_id('$Id$'); +// $Id$ /* Copyright (C) 2002 Geoffrey T. Dairiki <da...@da...> * Copyright (C) 2004-2010 $ThePhpWikiProgrammingTeam * Copyright (C) 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent Modified: trunk/lib/Captcha.php =================================================================== --- trunk/lib/Captcha.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/Captcha.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,5 +1,5 @@ <?php -// rcs_id('$Id$'); +// $Id$ /** * Session Captcha v1.0 * by Gavin M. Roy <gm...@bt...> Modified: trunk/lib/DbSession.php =================================================================== --- trunk/lib/DbSession.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/DbSession.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,4 +1,4 @@ -<?php // rcs_id('$Id$'); +<?php // $Id$ /** * Store sessions data in Pear DB / ADODB / dba / PDO, .... Modified: trunk/lib/DbaDatabase.php =================================================================== --- trunk/lib/DbaDatabase.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/DbaDatabase.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,4 +1,4 @@ -<?php // rcs_id('$Id$'); +<?php // $Id$ require_once('lib/ErrorManager.php'); Modified: trunk/lib/DbaListSet.php =================================================================== --- trunk/lib/DbaListSet.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/DbaListSet.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,4 +1,4 @@ -<?php // rcs_id('$Id$'); +<?php // $Id$ class DbaListSet { Modified: trunk/lib/DbaPartition.php =================================================================== --- trunk/lib/DbaPartition.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/DbaPartition.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,4 +1,4 @@ -<?php // rcs_id('$Id$'); +<?php // $Id$ class DbaPartition { Modified: trunk/lib/EditToolbar.php =================================================================== --- trunk/lib/EditToolbar.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/EditToolbar.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,5 +1,5 @@ <?php -// rcs_id('$Id$'); +// $Id$ /* Copyright 2004-2010 $ThePhpWikiProgrammingTeam * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent * Modified: trunk/lib/ErrorManager.php =================================================================== --- trunk/lib/ErrorManager.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/ErrorManager.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,4 +1,4 @@ -<?php // rcs_id('$Id$'); +<?php // $Id$ if (isset($GLOBALS['ErrorManager'])) return; Modified: trunk/lib/ExternalReferrer.php =================================================================== --- trunk/lib/ExternalReferrer.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/ExternalReferrer.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,5 +1,5 @@ <?php -// rcs_id('$Id$'); +// $Id$ /** * Detect external referrers Modified: trunk/lib/FileFinder.php =================================================================== --- trunk/lib/FileFinder.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/FileFinder.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,4 +1,4 @@ -<?php // rcs_id('$Id$'); +<?php // $Id$ require_once(dirname(__FILE__).'/stdlib.php'); Modified: trunk/lib/HtmlElement.php =================================================================== --- trunk/lib/HtmlElement.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/HtmlElement.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,4 +1,4 @@ -<?php // rcs_id('$Id$'); +<?php // $Id$ /** * Code for writing the HTML subset of XML. * @author: Jeff Dairiki Modified: trunk/lib/HtmlElement5.php =================================================================== --- trunk/lib/HtmlElement5.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/HtmlElement5.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,4 +1,4 @@ -<?php // rcs_id('$Id$'); +<?php // $Id$ /** * Code for writing the HTML subset of XML. * @author: Jeff Dairiki Modified: trunk/lib/HtmlParser.php =================================================================== --- trunk/lib/HtmlParser.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/HtmlParser.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * HtmlParser Class: Conversion HTML => wikimarkup * Requires XmlParser, XmlElement and the expat (or now the libxml) library. This is all in core. Modified: trunk/lib/HttpClient.php =================================================================== --- trunk/lib/HttpClient.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/HttpClient.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** Version 0.9, 6th April 2003 - Simon Willison ( http://simon.incutio.com/ ) Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/IniConfig.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,5 +1,5 @@ <?php -// rcs_id('$Id$'); +// $Id$ /** * A configurator intended to read its config from a PHP-style INI file, * instead of a PHP file. Modified: trunk/lib/InlineParser.php =================================================================== --- trunk/lib/InlineParser.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/InlineParser.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,5 +1,5 @@ <?php -// rcs_id('$Id$'); +// $Id$ /* Copyright (C) 2002 Geoffrey T. Dairiki <da...@da...> * Copyright (C) 2004-2010 Reini Urban * Copyright (C) 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent Modified: trunk/lib/MailNotify.php =================================================================== --- trunk/lib/MailNotify.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/MailNotify.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,5 +1,5 @@ <?php -// rcs_id('$Id$'); +// $Id$ /* Copyright (C) 2006-2007,2009 Reini Urban * Copyright (C) 2009 Marc-Etienne Vargenau, Alcatel-Lucent * Modified: trunk/lib/PageList.php =================================================================== --- trunk/lib/PageList.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/PageList.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,5 +1,5 @@ <?php -//rcs_id('$Id$'); +//$Id$ /* Copyright (C) 2004-2010 $ThePhpWikiProgrammingTeam * Copyright (C) 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent * Modified: trunk/lib/PagePerm.php =================================================================== --- trunk/lib/PagePerm.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/PagePerm.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2004,2007 $ThePhpWikiProgrammingTeam * Copyright 2009-2010 Marc-Etienne Vargenau, Alcatel-Lucent Modified: trunk/lib/PageType.php =================================================================== --- trunk/lib/PageType.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/PageType.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 1999,2000,2001,2002,2003,2004,2005,2006 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/RSSWriter091.php =================================================================== --- trunk/lib/RSSWriter091.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/RSSWriter091.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -21,7 +21,7 @@ // for outputting RecentChanges in RSS 0.91 format // ---------------------------------------------------------------------- -// rcs_id('$Id$'); +// $Id$ include_once("lib/RssWriter.php"); class RSSWriter091 extends RSSWriter Modified: trunk/lib/Request.php =================================================================== --- trunk/lib/Request.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/Request.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright (C) 2002,2004,2005,2006,2009 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/RssParser.php =================================================================== --- trunk/lib/RssParser.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/RssParser.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Simple RSSParser Class * Based on Duncan Gough RSSParser class Modified: trunk/lib/RssWriter.php =================================================================== --- trunk/lib/RssWriter.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/RssWriter.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,4 +1,4 @@ -<?php // rcs_id('$Id$'); +<?php // $Id$ /* * Code for creating RSS 1.0. */ Modified: trunk/lib/RssWriter2.php =================================================================== --- trunk/lib/RssWriter2.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/RssWriter2.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,4 +1,4 @@ -<?php // rcs_id('$Id$'); +<?php // $Id$ /* * Code for creating RSS 2.0 * Author: Reini Urban for PhpWiki Modified: trunk/lib/SemanticWeb.php =================================================================== --- trunk/lib/SemanticWeb.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/SemanticWeb.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,4 +1,4 @@ -<?php // rcs_id('$Id$'); +<?php // $Id$ /** * What to do on ?format=rdf What to do on ?format=owl * Modified: trunk/lib/SpamBlocklist.php =================================================================== --- trunk/lib/SpamBlocklist.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/SpamBlocklist.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,5 +1,5 @@ <?php -// rcs_id('$Id$'); +// $Id$ /* Copyright (C) 2005 Reini Urban * * This file is part of PhpWiki. Modified: trunk/lib/Template.php =================================================================== --- trunk/lib/Template.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/Template.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,5 +1,5 @@ <?php //-*-php-*- -// rcs_id('$Id$'); +// $Id$ require_once("lib/ErrorManager.php"); Modified: trunk/lib/TextSearchQuery.php =================================================================== --- trunk/lib/TextSearchQuery.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/TextSearchQuery.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,4 +1,4 @@ -<?php // rcs_id('$Id$'); +<?php // $Id$ /** * A text search query, converting queries to PCRE and SQL matchers. * Modified: trunk/lib/Units.php =================================================================== --- trunk/lib/Units.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/Units.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,4 +1,4 @@ -<?php // rcs_id('$Id$'); +<?php // $Id$ /** * * Interface to man units(1), /usr/share/units.dat Modified: trunk/lib/WikiCallback.php =================================================================== --- trunk/lib/WikiCallback.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/WikiCallback.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,5 +1,5 @@ <?php //-*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * A callback Modified: trunk/lib/WikiDB.php =================================================================== --- trunk/lib/WikiDB.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/WikiDB.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,4 +1,4 @@ -<?php //rcs_id('$Id$'); +<?php //$Id$ require_once('lib/PageType.php'); /** Modified: trunk/lib/WikiPlugin.php =================================================================== --- trunk/lib/WikiPlugin.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/WikiPlugin.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,5 +1,5 @@ <?php //-*-php-*- -// rcs_id('$Id$'); +// $Id$ class WikiPlugin { Modified: trunk/lib/WikiPluginCached.php =================================================================== --- trunk/lib/WikiPluginCached.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/WikiPluginCached.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,4 +1,4 @@ -<?php // rcs_id('$Id$'); +<?php // $Id$ /* * Copyright (C) 2002 Johannes Große * Copyright (C) 2004,2007 Reini Urban Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/WikiTheme.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,4 +1,4 @@ -<?php // rcs_id('$Id$'); +<?php // $Id$ /* Copyright (C) 2002,2004,2005,2006,2008,2009,2010 $ThePhpWikiProgrammingTeam * * This file is part of PhpWiki. Modified: trunk/lib/WikiUser.php =================================================================== --- trunk/lib/WikiUser.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/WikiUser.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,5 +1,5 @@ <?php //-*-php-*- -// rcs_id('$Id$'); +// $Id$ // It is anticipated that when userid support is added to phpwiki, // this object will hold much more information (e-mail, Modified: trunk/lib/WikiUserNew.php =================================================================== --- trunk/lib/WikiUserNew.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/WikiUserNew.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,5 +1,5 @@ <?php //-*-php-*- -//rcs_id('$Id$'); +//$Id$ /* Copyright (C) 2004,2005,2006,2007,2009,2010 $ThePhpWikiProgrammingTeam * Copyright (C) 2009-2010 Marc-Etienne Vargenau, Alcatel-Lucent * Copyright (C) 2009-2010 Roger Guignard, Alcatel-Lucent Modified: trunk/lib/WysiwygEdit.php =================================================================== --- trunk/lib/WysiwygEdit.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/WysiwygEdit.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,5 +1,5 @@ <?php -// rcs_id('$Id$'); +// $Id$ /** * Baseclass for WysiwygEdit/* * Modified: trunk/lib/XmlElement.php =================================================================== --- trunk/lib/XmlElement.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/XmlElement.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,4 +1,4 @@ -<?php // rcs_id('$Id$'); +<?php // $Id$ /** * Code for writing XML. * @package Markup Modified: trunk/lib/XmlParser.php =================================================================== --- trunk/lib/XmlParser.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/XmlParser.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Base XmlParser Class. * Requires the expat.so/.dll, usually enabled by default. Modified: trunk/lib/config.php =================================================================== --- trunk/lib/config.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/config.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,5 +1,5 @@ <?php -// rcs_id('$Id$'); +// $Id$ /* * NOTE: The settings here should probably not need to be changed. * The user-configurable settings have been moved to IniConfig.php Modified: trunk/lib/diff.php =================================================================== --- trunk/lib/diff.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/diff.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ // diff.php // // PhpWiki diff output code. Modified: trunk/lib/diff3.php =================================================================== --- trunk/lib/diff3.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/diff3.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,5 +1,5 @@ <?php -// rcs_id('$Id$'); +// $Id$ // diff3.php // // A class for computing three way diffs Modified: trunk/lib/difflib.php =================================================================== --- trunk/lib/difflib.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/difflib.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,5 +1,5 @@ <?php -// rcs_id('$Id$'); +// $Id$ // difflib.php // Modified: trunk/lib/display.php =================================================================== --- trunk/lib/display.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/display.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,6 +1,6 @@ <?php // display.php: fetch page or get default content -// rcs_id('$Id$'); +// $Id$ require_once('lib/Template.php'); Modified: trunk/lib/editpage.php =================================================================== --- trunk/lib/editpage.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/editpage.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,5 +1,5 @@ <?php -// rcs_id('$Id$'); +// $Id$ require_once('lib/Template.php'); Modified: trunk/lib/fortune.php =================================================================== --- trunk/lib/fortune.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/fortune.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,6 +1,6 @@ <?php -// rcs_id('PHP Fortune - Made by he...@aa.... HP: http://www.aasted.org'); -// rcs_id('$Id$'); +// PHP Fortune - Made by he...@aa.... HP: http://www.aasted.org +// $Id$ /* Main methods to use: quoteFromDir($dir): Modified: trunk/lib/imagecache.php =================================================================== --- trunk/lib/imagecache.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/imagecache.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,4 +1,4 @@ -<?php // rcs_id('$Id$'); +<?php // $Id$ /* * Copyright (C) 2002 Johannes Große * Modified: trunk/lib/imdb.php =================================================================== --- trunk/lib/imdb.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/imdb.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,4 +1,4 @@ -<?php // rcs_id('$Id$'); +<?php // $Id$ /** * Copyright 2004 Reini Urban * Modified: trunk/lib/install.php =================================================================== --- trunk/lib/install.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/install.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,5 +1,5 @@ <?php //-*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2004 $ThePhpWikiProgrammingTeam Modified: trunk/lib/loadsave.php =================================================================== --- trunk/lib/loadsave.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/loadsave.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,5 +1,5 @@ <?php //-*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 1999,2000,2001,2002,2004,2005,2006,2007 $ThePhpWikiProgrammingTeam Modified: trunk/lib/main.php =================================================================== --- trunk/lib/main.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/main.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,5 +1,5 @@ <?php //-*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 1999-2008 $ThePhpWikiProgrammingTeam * Copyright (C) 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent Modified: trunk/lib/pdf.php =================================================================== --- trunk/lib/pdf.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/pdf.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright (C) 2003 Olivier PLATHEY * Copyright (C) 200? Don Sebà Modified: trunk/lib/prepend.php =================================================================== --- trunk/lib/prepend.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/prepend.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -3,7 +3,7 @@ * * Things which must be done and defined before anything else. */ -// rcs_id('$Id$'); +// $Id$ // see lib/stdlib.php: phpwiki_version() define('PHPWIKI_VERSION', '1.4.0RC1'); Modified: trunk/lib/purgepage.php =================================================================== --- trunk/lib/purgepage.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/purgepage.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,5 +1,5 @@ <?php -// rcs_id('$Id$'); +// $Id$ require_once('lib/Template.php'); function PurgePage (&$request) { Modified: trunk/lib/removepage.php =================================================================== --- trunk/lib/removepage.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/removepage.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,5 +1,5 @@ <?php -// rcs_id('$Id$'); +// $Id$ require_once('lib/Template.php'); function RemovePage (&$request) { Modified: trunk/lib/spam_babycart.php =================================================================== --- trunk/lib/spam_babycart.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/spam_babycart.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,5 +1,5 @@ <?php -// rcs_id('$Id$'); +// $Id$ /* * $Id$ * Author: Bob Apthorpe <apt...@cy...> Modified: trunk/lib/stdlib.php =================================================================== --- trunk/lib/stdlib.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/stdlib.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,4 +1,4 @@ -<?php // rcs_id('$Id$'); +<?php // $Id$ /* * Copyright 1999-2008 $ThePhpWikiProgrammingTeam * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent Modified: trunk/lib/upgrade.php =================================================================== --- trunk/lib/upgrade.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/upgrade.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,5 +1,5 @@ <?php //-*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2004,2005,2006,2007 $ThePhpWikiProgrammingTeam * Copyright 2008 Marc-Etienne Vargenau, Alcatel-Lucent Modified: trunk/lib/ziplib.php =================================================================== --- trunk/lib/ziplib.php 2011-03-03 15:50:28 UTC (rev 7952) +++ trunk/lib/ziplib.php 2011-03-03 16:21:48 UTC (rev 7953) @@ -1,4 +1,4 @@ -<?php // rcs_id('$Id$'); +<?php // $Id$ /** * GZIP stuff. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2011-04-08 12:54:48
|
Revision: 8025 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8025&view=rev Author: vargenau Date: 2011-04-08 12:54:42 +0000 (Fri, 08 Apr 2011) Log Message: ----------- Avoid warnings Modified Paths: -------------- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php trunk/lib/plugin/Template.php Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php =================================================================== --- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2011-04-08 12:53:56 UTC (rev 8024) +++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2011-04-08 12:54:42 UTC (rev 8025) @@ -110,8 +110,12 @@ $this->_get_pageid($pagename, true); // Creates page record } - @$hits = (int)$data['hits']; - unset($data['hits']); + if (isset($data['hits'])) { + $hits = (int)$data['hits']; + unset($data['hits']); + } else { + $hits = 0; + } foreach ($newdata as $key => $val) { if ($key == 'hits') Modified: trunk/lib/plugin/Template.php =================================================================== --- trunk/lib/plugin/Template.php 2011-04-08 12:53:56 UTC (rev 8024) +++ trunk/lib/plugin/Template.php 2011-04-08 12:54:42 UTC (rev 8025) @@ -83,7 +83,7 @@ // TODO: check if page can really be pulled from the args, or if it is just the basepage. function getWikiPageLinks($argstr, $basepage) { $args = $this->getArgs($argstr); - $page = @$args['page']; + $page = isset($args['page'])? $args['page']: ''; if ($page) { // Expand relative page names. $page = new WikiPageName($page, $basepage); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2011-05-04 10:27:50
|
Revision: 8065 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8065&view=rev Author: vargenau Date: 2011-05-04 10:27:44 +0000 (Wed, 04 May 2011) Log Message: ----------- Use <p> instaed of <div> for feedback Modified Paths: -------------- trunk/lib/purgepage.php trunk/lib/removepage.php Modified: trunk/lib/purgepage.php =================================================================== --- trunk/lib/purgepage.php 2011-05-04 10:23:50 UTC (rev 8064) +++ trunk/lib/purgepage.php 2011-05-04 10:27:44 UTC (rev 8065) @@ -50,7 +50,7 @@ $dbi = $request->getDbh(); $dbi->purgePage($pagename); $dbi->touch(); - $html = HTML::div(array('class' => 'feedback'), fmt("Purged page '%s' successfully.", $pagename)); + $html = HTML::p(array('class' => 'feedback'), fmt("Purged page '%s' successfully.", $pagename)); } GeneratePage($html, _("Purge Page")); Modified: trunk/lib/removepage.php =================================================================== --- trunk/lib/removepage.php 2011-05-04 10:23:50 UTC (rev 8064) +++ trunk/lib/removepage.php 2011-05-04 10:27:44 UTC (rev 8065) @@ -50,7 +50,7 @@ $dbi = $request->getDbh(); $dbi->deletePage($pagename); $dbi->touch(); - $html = HTML::div(array('class' => 'feedback'), fmt("Removed page '%s' successfully.", $pagename)); + $html = HTML::p(array('class' => 'feedback'), fmt("Removed page '%s' successfully.", $pagename)); } GeneratePage($html, _("Remove Page")); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2011-05-18 16:11:00
|
Revision: 8075 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8075&view=rev Author: vargenau Date: 2011-05-18 16:10:53 +0000 (Wed, 18 May 2011) Log Message: ----------- New FSF address Modified Paths: -------------- trunk/lib/nusoap/README.txt trunk/lib/pear/DB/Pager.php trunk/lib/pear/DB/ldap.php Modified: trunk/lib/nusoap/README.txt =================================================================== --- trunk/lib/nusoap/README.txt 2011-05-18 16:07:24 UTC (rev 8074) +++ trunk/lib/nusoap/README.txt 2011-05-18 16:10:53 UTC (rev 8075) @@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA If you have any questions or comments, please email or visit the website: Modified: trunk/lib/pear/DB/Pager.php =================================================================== --- trunk/lib/pear/DB/Pager.php 2011-05-18 16:07:24 UTC (rev 8074) +++ trunk/lib/pear/DB/Pager.php 2011-05-18 16:10:53 UTC (rev 8075) @@ -17,7 +17,7 @@ // // You should have received a copy of the GNU Lesser General Public // License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA // // // $Id$ Modified: trunk/lib/pear/DB/ldap.php =================================================================== --- trunk/lib/pear/DB/ldap.php 2011-05-18 16:07:24 UTC (rev 8074) +++ trunk/lib/pear/DB/ldap.php 2011-05-18 16:10:53 UTC (rev 8075) @@ -17,7 +17,7 @@ // // You should have received a copy of the GNU Lesser General Public // License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA // // Contributors // - Piotr Roszatycki <Pio...@ne...> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2011-10-03 12:42:34
|
Revision: 8160 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8160&view=rev Author: vargenau Date: 2011-10-03 12:42:28 +0000 (Mon, 03 Oct 2011) Log Message: ----------- E-mail Modified Paths: -------------- trunk/lib/MailNotify.php trunk/lib/WikiUserNew.php trunk/lib/plugin/WikiAdminUtils.php Modified: trunk/lib/MailNotify.php =================================================================== --- trunk/lib/MailNotify.php 2011-10-03 12:41:45 UTC (rev 8159) +++ trunk/lib/MailNotify.php 2011-10-03 12:42:28 UTC (rev 8160) @@ -376,7 +376,7 @@ while(!empty($data[$id])) { // id collision $id = rand_ascii_readable(16); } - $subject = _("E-Mail address confirmation"); + $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 Modified: trunk/lib/WikiUserNew.php =================================================================== --- trunk/lib/WikiUserNew.php 2011-10-03 12:41:45 UTC (rev 8159) +++ trunk/lib/WikiUserNew.php 2011-10-03 12:42:28 UTC (rev 8160) @@ -1779,7 +1779,7 @@ return; if (!empty($value) and !$verified) { list($ok,$msg) = ValidateMail($value); - if ($ok and mail($value,"[".WIKI_NAME ."] "._("Email Verification"), + if ($ok and mail($value,"[".WIKI_NAME ."] "._("E-mail address confirmation"), sprintf(_("Welcome to %s!\nYour email account is verified and\nwill be used to send page change notifications.\nSee %s"), WIKI_NAME, WikiURL($GLOBALS['request']->getArg('pagename'),'',true)))) { $this->set('emailVerified',1); Modified: trunk/lib/plugin/WikiAdminUtils.php =================================================================== --- trunk/lib/plugin/WikiAdminUtils.php 2011-10-03 12:41:45 UTC (rev 8159) +++ trunk/lib/plugin/WikiAdminUtils.php 2011-10-03 12:42:28 UTC (rev 8160) @@ -110,7 +110,7 @@ 'purge-bad-pagenames' => _("Purge all Pages With Invalid Names"), 'purge-empty-pages' => _("Purge all empty, unreferenced Pages"), 'access-restrictions' => _("Access Restrictions"), - 'email-verification' => _("Email Verification"), + 'email-verification' => _("E-mail address confirmation"), 'convert-cached-html' => _("Convert cached_html"), 'db-check' => _("DB Check"), 'db-rebuild' => _("Db Rebuild") @@ -229,7 +229,7 @@ $dbi = $request->getDbh(); $pagelist = new PageList('pagename',0,$args); //$args['return_url'] = 'action=email-verification-verified'; - $email = new _PageList_Column_email('email',_("E-Mail"),'left'); + $email = new _PageList_Column_email('email',_("E-mail"),'left'); $emailVerified = new _PageList_Column_emailVerified('emailVerified', _("Verification Status"),'center'); $pagelist->_columns[0]->_heading = _("Username"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2011-11-04 10:10:03
|
Revision: 8176 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8176&view=rev Author: vargenau Date: 2011-11-04 10:09:56 +0000 (Fri, 04 Nov 2011) Log Message: ----------- Warning message if action cancelled Modified Paths: -------------- trunk/lib/purgepage.php trunk/lib/removepage.php Modified: trunk/lib/purgepage.php =================================================================== --- trunk/lib/purgepage.php 2011-11-04 10:04:45 UTC (rev 8175) +++ trunk/lib/purgepage.php 2011-11-04 10:09:56 UTC (rev 8176) @@ -9,7 +9,9 @@ $pagelink = WikiLink($page); if ($request->getArg('cancel')) { - $request->redirect(WikiURL($page)); // noreturn + $request->redirect(WikiURL($page, + array('warningmsg' => _('Purge cancelled')))); + // noreturn } $current = $page->getCurrentRevision(); Modified: trunk/lib/removepage.php =================================================================== --- trunk/lib/removepage.php 2011-11-04 10:04:45 UTC (rev 8175) +++ trunk/lib/removepage.php 2011-11-04 10:09:56 UTC (rev 8176) @@ -9,7 +9,9 @@ $pagelink = WikiLink($page); if ($request->getArg('cancel')) { - $request->redirect(WikiURL($page)); // noreturn + $request->redirect(WikiURL($page, + array('warningmsg' => _('Remove cancelled')))); + // noreturn } $current = $page->getCurrentRevision(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |