Index: trunk/phase3/maintenance/language/messages.inc
===================================================================
--- trunk/phase3/maintenance/language/messages.inc (revision 40829)
+++ trunk/phase3/maintenance/language/messages.inc (revision 40830)
@@ -1377,6 +1377,15 @@
'special-categories-sort-count',
'special-categories-sort-abc',
),
+ 'linksearch' => array(
+ 'linksearch',
+ 'linksearch-pat',
+ 'linksearch-ns',
+ 'linksearch-ok',
+ 'linksearch-text',
+ 'linksearch-line',
+ 'linksearch-error',
+ ),
'listusers' => array(
'listusersfrom',
'listusers-submit',
@@ -2805,6 +2814,7 @@
'logpages' => 'Special:Log',
'allpages' => 'Special:AllPages',
'categories' => 'Special:Categories',
+ 'linksearch' => 'Special:LinkSearch',
'listusers' => 'Special:ListUsers',
'newuserlog' => 'Special:Log/newusers',
'listgrouprights' => 'Special:ListGroupRights',
Index: trunk/phase3/includes/AutoLoader.php
===================================================================
--- trunk/phase3/includes/AutoLoader.php (revision 40829)
+++ trunk/phase3/includes/AutoLoader.php (revision 40830)
@@ -8,7 +8,7 @@
# Extension classes are specified with $wgAutoloadClasses
# This array is a global instead of a static member of AutoLoader to work around a bug in APC
global $wgAutoloadLocalClasses;
-$wgAutoloadLocalClasses = array(
+$wgAutoloadLocalClasses = array(
# Includes
'AjaxDispatcher' => 'includes/AjaxDispatcher.php',
'AjaxResponse' => 'includes/AjaxResponse.php',
@@ -356,7 +356,7 @@
'WhiteSpaceNode' => 'includes/diff/Nodes.php',
'WikiDiff3' => 'includes/diff/Diff.php',
'WordLevelDiff' => 'includes/diff/DifferenceEngine.php',
-
+
# includes/filerepo
'ArchivedFile' => 'includes/filerepo/ArchivedFile.php',
'File' => 'includes/filerepo/File.php',
@@ -446,6 +446,7 @@
'ImportReporter' => 'includes/specials/SpecialImport.php',
'ImportStreamSource' => 'includes/specials/SpecialImport.php',
'ImportStringSource' => 'includes/specials/SpecialImport.php',
+ 'LinkSearchPage' => 'includes/specials/SpecialLinkSearch.php',
'ListredirectsPage' => 'includes/specials/SpecialListredirects.php',
'LoginForm' => 'includes/specials/SpecialUserlogin.php',
'LonelyPagesPage' => 'includes/specials/SpecialLonelypages.php',
@@ -517,11 +518,11 @@
class AutoLoader {
/**
* autoload - take a class name and attempt to load it
- *
+ *
* @param string $className Name of class we're looking for.
* @return bool Returning false is important on failure as
* it allows Zend to try and look in other registered autoloaders
- * as well.
+ * as well.
*/
static function autoload( $className ) {
global $wgAutoloadClasses, $wgAutoloadLocalClasses;
@@ -580,4 +581,3 @@
AutoLoader::autoload( $class );
}
}
-
Index: trunk/phase3/includes/DefaultSettings.php
===================================================================
--- trunk/phase3/includes/DefaultSettings.php (revision 40829)
+++ trunk/phase3/includes/DefaultSettings.php (revision 40830)
@@ -2828,6 +2828,7 @@
'Mytalk' => 'redirects',
'Mycontributions' => 'redirects',
'Search' => 'redirects',
+ 'LinkSearch' => 'redirects',
'Movepage' => 'pagetools',
'MergeHistory' => 'pagetools',
Index: trunk/phase3/includes/specials/SpecialLinkSearch.php
===================================================================
--- trunk/phase3/includes/specials/SpecialLinkSearch.php (revision 0)
+++ trunk/phase3/includes/specials/SpecialLinkSearch.php (revision 40830)
@@ -0,0 +1,182 @@
+<?php
+/**
+ * @file
+ * @ingroup SpecialPage
+ *
+ * @author Brion Vibber
+ * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later
+ */
+
+/**
+ * Special:LinkSearch to search the external-links table.
+ * @ingroup SpecialPage
+ */
+
+function wfSpecialLinkSearch( $par ) {
+
+ list( $limit, $offset ) = wfCheckLimits();
+ global $wgOut, $wgRequest, $wgUrlProtocols, $wgMiserMode;
+ $target = $GLOBALS['wgRequest']->getVal( 'target', $par );
+ $namespace = $GLOBALS['wgRequest']->getIntorNull( 'namespace', null );
+
+ $protocols_list[] = '';
+ foreach( $wgUrlProtocols as $prot ) {
+ $protocols_list[] = $prot;
+ }
+
+ $target2 = $target;
+ $protocol = '';
+ $pr_sl = strpos($target2, '//' );
+ $pr_cl = strpos($target2, ':' );
+ if ( $pr_sl ) {
+ // For protocols with '//'
+ $protocol = substr( $target2, 0 , $pr_sl+2 );
+ $target2 = substr( $target2, $pr_sl+2 );
+ } elseif ( !$pr_sl && $pr_cl ) {
+ // For protocols without '//' like 'mailto:'
+ $protocol = substr( $target2, 0 , $pr_cl+1 );
+ $target2 = substr( $target2, $pr_cl+1 );
+ } elseif ( $protocol == '' && $target2 != '' ) {
+ // default
+ $protocol = 'http://';
+ }
+ if ( !in_array( $protocol, $protocols_list ) ) {
+ // unsupported protocol, show original search request
+ $target2 = $target;
+ $protocol = '';
+ }
+
+ $self = Title::makeTitle( NS_SPECIAL, 'Linksearch' );
+
+ $wgOut->addWikiText( wfMsg( 'linksearch-text', '<nowiki>' . implode( ', ', $wgUrlProtocols) . '</nowiki>' ) );
+ $s = Xml::openElement( 'form', array( 'id' => 'mw-linksearch-form', 'method' => 'get', 'action' => $GLOBALS['wgScript'] ) ) .
+ Xml::hidden( 'title', $self->getPrefixedDbKey() ) .
+ '<fieldset>' .
+ Xml::element( 'legend', array(), wfMsg( 'linksearch' ) ) .
+ Xml::inputLabel( wfMsg( 'linksearch-pat' ), 'target', 'target', 50, $target ) . ' ';
+ if ( !$wgMiserMode ) {
+ $s .= Xml::label( wfMsg( 'linksearch-ns' ), 'namespace' ) . ' ' .
+ XML::namespaceSelector( $namespace, '' );
+ }
+ $s .= Xml::submitButton( wfMsg( 'linksearch-ok' ) ) .
+ '</fieldset>' .
+ Xml::closeElement( 'form' );
+ $wgOut->addHtml( $s );
+
+ if( $target != '' ) {
+ $searcher = new LinkSearchPage( $target2, $namespace, $protocol );
+ $searcher->doQuery( $offset, $limit );
+ }
+}
+
+class LinkSearchPage extends QueryPage {
+
+ function __construct( $query, $ns, $prot ) {
+ $this->mQuery = $query;
+ $this->mNs = $ns;
+ $this->mProt = $prot;
+ }
+
+ function getName() {
+ return 'LinkSearch';
+ }
+
+ /**
+ * Disable RSS/Atom feeds
+ */
+ function isSyndicated() {
+ return false;
+ }
+
+ /**
+ * Return an appropriately formatted LIKE query and the clause
+ */
+ static function mungeQuery( $query , $prot ) {
+ $field = 'el_index';
+ $rv = LinkFilter::makeLike( $query , $prot );
+ if ($rv === false) {
+ //makeLike doesn't handle wildcard in IP, so we'll have to munge here.
+ if (preg_match('/^(:?[0-9]{1,3}\.)+\*\s*$|^(:?[0-9]{1,3}\.){3}[0-9]{1,3}:[0-9]*\*\s*$/', $query)) {
+ $rv = $prot . rtrim($query, " \t*") . '%';
+ $field = 'el_to';
+ }
+ }
+ return array( $rv, $field );
+ }
+
+ function linkParameters() {
+ global $wgMiserMode;
+ $params = array();
+ $params['target'] = $this->mProt . $this->mQuery;
+ if( isset( $this->mNs ) && !$wgMiserMode ) {
+ $params['namespace'] = $this->mNs;
+ }
+ return $params;
+ }
+
+ function getSQL() {
+ global $wgMiserMode;
+ $dbr = wfGetDB( DB_SLAVE );
+ $page = $dbr->tableName( 'page' );
+ $externallinks = $dbr->tableName( 'externallinks' );
+
+ /* strip everything past first wildcard, so that index-based-only lookup would be done */
+ list( $munged, $clause ) = self::mungeQuery( $this->mQuery, $this->mProt );
+ $stripped = substr($munged,0,strpos($munged,'%')+1);
+ $encSearch = $dbr->addQuotes( $stripped );
+
+ $encSQL = '';
+ if ( isset ($this->mNs) && !$wgMiserMode )
+ $encSQL = 'AND page_namespace=' . $dbr->addQuotes( $this->mNs );
+
+ $use_index = $dbr->useIndexClause( $clause );
+ return
+ "SELECT
+ page_namespace AS namespace,
+ page_title AS title,
+ el_index AS value,
+ el_to AS url
+ FROM
+ $page,
+ $externallinks $use_index
+ WHERE
+ page_id=el_from
+ AND $clause LIKE $encSearch
+ $encSQL";
+ }
+
+ function formatResult( $skin, $result ) {
+ $title = Title::makeTitle( $result->namespace, $result->title );
+ $url = $result->url;
+ $pageLink = $skin->makeKnownLinkObj( $title );
+ $urlLink = $skin->makeExternalLink( $url, $url );
+
+ return wfMsgHtml( 'linksearch-line', $urlLink, $pageLink );
+ }
+
+ /**
+ * Override to check query validity.
+ */
+ function doQuery( $offset, $limit, $shownavigation=true ) {
+ global $wgOut;
+ list( $this->mMungedQuery, $clause ) = LinkSearchPage::mungeQuery( $this->mQuery, $this->mProt );
+ if( $this->mMungedQuery === false ) {
+ $wgOut->addWikiText( wfMsg( 'linksearch-error' ) );
+ } else {
+ // For debugging
+ // Generates invalid xhtml with patterns that contain --
+ //$wgOut->addHtml( "\n<!-- " . htmlspecialchars( $this->mMungedQuery ) . " -->\n" );
+ parent::doQuery( $offset, $limit, $shownavigation );
+ }
+ }
+
+ /**
+ * Override to squash the ORDER BY.
+ * We do a truncated index search, so the optimizer won't trust
+ * it as good enough for optimizing sort. The implicit ordering
+ * from the scan will usually do well enough for our needs.
+ */
+ function getOrder() {
+ return '';
+ }
+}
Property changes on: trunk/phase3/includes/specials/SpecialLinkSearch.php
___________________________________________________________________
Name: svn:mergeinfo
+
Name: svn:eol-style
+ native
Index: trunk/phase3/includes/QueryPage.php
===================================================================
--- trunk/phase3/includes/QueryPage.php (revision 40829)
+++ trunk/phase3/includes/QueryPage.php (revision 40830)
@@ -21,6 +21,7 @@
array( 'DeadendPagesPage', 'Deadendpages' ),
array( 'DisambiguationsPage', 'Disambiguations' ),
array( 'DoubleRedirectsPage', 'DoubleRedirects' ),
+ array( 'LinkSearchPage', 'LinkSearch' ),
array( 'ListredirectsPage', 'Listredirects' ),
array( 'LonelyPagesPage', 'Lonelypages' ),
array( 'LongPagesPage', 'Longpages' ),
Index: trunk/phase3/includes/SpecialPage.php
===================================================================
--- trunk/phase3/includes/SpecialPage.php (revision 40829)
+++ trunk/phase3/includes/SpecialPage.php (revision 40830)
@@ -129,6 +129,7 @@
'Contributions' => array( 'SpecialPage', 'Contributions' ),
'Emailuser' => array( 'UnlistedSpecialPage', 'Emailuser' ),
'Whatlinkshere' => array( 'SpecialPage', 'Whatlinkshere' ),
+ 'LinkSearch' => array( 'SpecialPage', 'LinkSearch' ),
'Recentchangeslinked' => 'SpecialRecentchangeslinked',
'Movepage' => array( 'UnlistedSpecialPage', 'Movepage' ),
'Blockme' => array( 'UnlistedSpecialPage', 'Blockme' ),
Index: trunk/phase3/languages/messages/MessagesEn.php
===================================================================
--- trunk/phase3/languages/messages/MessagesEn.php (revision 40829)
+++ trunk/phase3/languages/messages/MessagesEn.php (revision 40830)
@@ -2104,6 +2104,16 @@
'special-categories-sort-count' => 'sort by count',
'special-categories-sort-abc' => 'sort alphabetically',
+# Special:LinkSearch
+'linksearch' => 'Search web links',
+'linksearch-pat' => 'Search pattern:',
+'linksearch-ns' => 'Namespace:',
+'linksearch-ok' => 'Search',
+'linksearch-text' => 'Wildcards such as "*.wikipedia.org" may be used.<br />
+Supported protocols: <tt>$1</tt>',
+'linksearch-line' => '$1 linked from $2',
+'linksearch-error' => 'Wildcards may appear only at the start of the hostname.',
+
# Special:ListUsers
'listusersfrom' => 'Display users starting at:',
'listusers-submit' => 'Show',
Index: trunk/phase3/RELEASE-NOTES
===================================================================
--- trunk/phase3/RELEASE-NOTES (revision 40829)
+++ trunk/phase3/RELEASE-NOTES (revision 40830)
@@ -126,6 +126,9 @@
* Added Wantedfiles special pages, allowing users to find image links with no image.
* (bug 12650) It is now possible to set different expiration times for different
restriction types on the protection form.
+* Special:Log/newusers recording new users.was added (was extension Newuserlog)
+* Special:LinkSearch to search for external links was added (was extension
+ LinkSearch)
=== Bug fixes in 1.14 ===
