Menu
▾
▴
[phpwiki-checkins] CVS: phpwiki/lib Google.php,1.2,1.3 PageList.php,1.60,1.61 WikiDB.php,1.36,1.37 config.php,1.86,1.87 main.php,1.120,1.121
|
From: Reini U. <ru...@us...> - 2004-03-01 13:59:48
|
Update of /cvsroot/phpwiki/phpwiki/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6635 Modified Files: Google.php PageList.php WikiDB.php config.php main.php Log Message: rename fix p[] consistency fix Index: Google.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/Google.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -2 -b -p -d -r1.2 -r1.3 --- Google.php 29 Feb 2004 01:43:06 -0000 1.2 +++ Google.php 1 Mar 2004 13:48:45 -0000 1.3 @@ -1,3 +1,3 @@ -<? +<?php // -*- php -*- /** * Google API @@ -167,4 +167,5 @@ class Google { if ($maxResults < 1) $maxResults = 1; $this->maxResults = $maxResults; + return $this; } @@ -245,5 +246,5 @@ class Google { */ function doGetCachedPage($url) { - // This class gets created automatically!! (some eval'ed code from the soap request) + // This method gets created automatically!! (some eval'ed code from the soap request) $result = $this->proxy->doGetCachedPage(GOOGLE_LICENSE_KEY, $url); @@ -258,5 +259,5 @@ class Google { */ function doSpellingSuggestion($phrase) { - // This class gets created automatically!! (some eval'ed code from the soap request) + // This method gets created automatically!! (some eval'ed code from the soap request) return $this->proxy->doSpellingSuggestion(GOOGLE_LICENSE_KEY, $phrase); Index: PageList.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/PageList.php,v retrieving revision 1.60 retrieving revision 1.61 diff -u -2 -b -p -d -r1.60 -r1.61 --- PageList.php 1 Mar 2004 09:36:02 -0000 1.60 +++ PageList.php 1 Mar 2004 13:48:45 -0000 1.61 @@ -124,8 +124,6 @@ class _PageList_Column_base { 'class' => 'gridbutton', 'title' => sprintf(_("Click to sort by %s"),$this->_field)), - HTML::span(array('align'=>'left'), - $this->_heading), + $this->_heading, HTML::raw(' '), - HTML::span(array('align'=>'right'), $src ? HTML::img(array('src' => $src, 'width' => '7', @@ -135,5 +133,5 @@ class _PageList_Column_base { 'width' => '7', 'height' => '7', - 'alt' => _("Click to sort"))))); + 'alt' => _("Click to sort")))); } else { $s = $this->_heading; @@ -211,10 +209,10 @@ class _PageList_Column_checkbox extends return HTML::input(array('type' => 'checkbox', 'name' => $this->_name . "[$pagename]", - 'value' => $pagename, + 'value' => 1, 'checked' => 'CHECKED')); } else { return HTML::input(array('type' => 'checkbox', 'name' => $this->_name . "[$pagename]", - 'value' => $pagename)); + 'value' => 1)); } } @@ -263,7 +261,13 @@ class _PageList_Column_renamed_pagename $post_args = $GLOBALS['request']->getArg('admin_rename'); $value = str_replace($post_args['from'], $post_args['to'],$page_handle->getName()); - return HTML::div(" => ",HTML::input(array('type' => 'text', + $div = HTML::div(" => ",HTML::input(array('type' => 'text', 'name' => 'rename[]', 'value' => $value))); + $new_page = $GLOBALS['request']->getPage($value); + if ($new_page->exists()) { + $div->setAttr('class','error'); + $div->setAttr('title',_("This page already exists")); + } + return $div; } }; Index: WikiDB.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiDB.php,v retrieving revision 1.36 retrieving revision 1.37 diff -u -2 -b -p -d -r1.36 -r1.37 --- WikiDB.php 22 Feb 2004 23:20:31 -0000 1.36 +++ WikiDB.php 1 Mar 2004 13:48:45 -0000 1.37 @@ -306,6 +306,6 @@ class WikiDB { * pages. */ - function mostPopular($limit = 20) { - $result = $this->_backend->most_popular($limit); + function mostPopular($limit = 20, $sortby = '') { + $result = $this->_backend->most_popular($limit, $sortby); return new WikiDB_PageIterator($this, $result); } @@ -372,8 +372,5 @@ class WikiDB { /** - * Call the appropriate backend method - * - * A {@link WikiDB} consists of the (infinite) set of all possible pages, - * therefore this method never fails. + * Call the appropriate backend method. * * @access public @@ -389,5 +386,6 @@ class WikiDB { if (method_exists($this->_backend,'rename_page')) { $oldpage = $this->getPage($from); - if ($oldpage->exists()) { + $newpage = $this->getPage($to); + if ($oldpage->exists() and ! $newpage->exists()) { if ($result = $this->_backend->rename_page($from, $to)) { //update all WikiLinks in existing pages @@ -395,5 +393,5 @@ class WikiDB { //trigger_error(_("WikiDB::renamePage(..,..,updateWikiLinks) not yet implemented"),E_USER_WARNING); require_once('lib/plugin/WikiAdminSearchReplace.php'); - $links = $page->getLinks(); + $links = $oldpage->getLinks(); while ($linked_page = $links->next()) { WikiPlugin_WikiAdminSearchReplace::replaceHelper($this,$linked_page->getName(),$from,$to); Index: config.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/config.php,v retrieving revision 1.86 retrieving revision 1.87 diff -u -2 -b -p -d -r1.86 -r1.87 --- config.php 28 Feb 2004 21:14:08 -0000 1.86 +++ config.php 1 Mar 2004 13:48:45 -0000 1.87 @@ -388,5 +388,4 @@ if (!defined('HOME_PAGE')) define('HOME_PAGE', _("HomePage")); - // FIXME: delete // Access log Index: main.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/main.php,v retrieving revision 1.120 retrieving revision 1.121 diff -u -2 -b -p -d -r1.120 -r1.121 --- main.php 1 Mar 2004 10:22:41 -0000 1.120 +++ main.php 1 Mar 2004 13:48:45 -0000 1.121 @@ -807,5 +807,4 @@ if (defined('WIKI_XMLRPC') and WIKI_XMLR if (defined('WIKI_SOAP') and WIKI_SOAP) return; - $validators = array('wikiname' => WIKI_NAME, 'args' => hash($request->getArgs()), @@ -840,4 +839,8 @@ main(); // $Log$ +// Revision 1.121 2004/03/01 13:48:45 rurban +// rename fix +// p[] consistency fix +// // Revision 1.120 2004/03/01 10:22:41 rurban // initializeTheme optimize |