From 9636a88e1cbbbc6c5c43aaa88160a593f1da1f30 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Fri, 18 Feb 2005 11:47:36 +0000 Subject: [PATCH] Clean up experiments for special:data, special:validate, special:geo. Moving these things to extensions if they are needed in the future. --- includes/Article.php | 21 -------- includes/DefaultSettings.php | 7 --- includes/Parser.php | 55 --------------------- includes/Setup.php | 5 -- includes/SpecialContributions.php | 9 ---- includes/SpecialGeo.php | 80 ------------------------------- includes/SpecialPage.php | 7 --- index.php | 1 - 8 files changed, 185 deletions(-) delete mode 100644 includes/SpecialGeo.php diff --git a/includes/Article.php b/includes/Article.php index 49f7843b00..d2723722cf 100644 --- a/includes/Article.php +++ b/includes/Article.php @@ -1085,27 +1085,6 @@ class Article { $wgEnotif->NotifyOnPageChange( $wgUser->getID(), $this->mTitle->getDBkey(), $this->mTitle->getNamespace(),$now, $summary, $me2, $oldid ); } - /** - * Validate article - * @todo document this function a bit more - */ - function validate () { - global $wgOut, $wgUseValidation; - if( $wgUseValidation ) { - require_once ( 'SpecialValidate.php' ) ; - $wgOut->setPagetitle( wfMsg( 'validate' ) . ': ' . $this->mTitle->getPrefixedText() ); - $wgOut->setRobotpolicy( 'noindex,follow' ); - if( $this->mTitle->getNamespace() != 0 ) { - $wgOut->addHTML( wfMsg( 'val_validate_article_namespace_only' ) ); - return; - } - $v = new Validation; - $v->validate_form( $this->mTitle->getDBkey() ); - } else { - $wgOut->errorpage( 'nosuchaction', 'nosuchactiontext' ); - } - } - /** * Mark this particular edit as patrolled */ diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 26a282c652..36387f0f28 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -393,7 +393,6 @@ $wgExtraSubtitle = ''; $wgSiteSupportPage = ''; # A page where you users can receive donations $wgReadOnlyFile = "{$wgUploadDirectory}/lock_yBgMBwiR"; -$wgUseData = false ; /** * The debug log file should be not be publicly accessible if it is used, as it @@ -942,12 +941,6 @@ $wgAllowPageInfo = false; /** Maximum indent level of toc. */ $wgMaxTocLevel = 999; -/** Recognise longitude/latitude coordinates */ -$wgUseGeoMode = false; - -/** Validation for print or other production versions */ -$wgUseValidation = false; - /** Use external C++ diff engine (module wikidiff from the extensions package) */ $wgUseExternalDiffEngine = false; diff --git a/includes/Parser.php b/includes/Parser.php index 50777f4d56..8b883d2841 100644 --- a/includes/Parser.php +++ b/includes/Parser.php @@ -679,11 +679,7 @@ class Parser * @access private */ function &doMagicLinks( &$text ) { - global $wgUseGeoMode; $text = $this->magicISBN( $text ); - if ( isset( $wgUseGeoMode ) && $wgUseGeoMode ) { - $text = $this->magicGEO( $text ); - } $text = $this->magicRFC( $text, 'RFC ', 'rfcurl' ); $text = $this->magicRFC( $text, 'PMID ', 'pubmedurl' ); return $text; @@ -2488,57 +2484,6 @@ class Parser return $text; } - /** - * Return an HTML link for the "GEO ..." text - * @access private - */ - function magicGEO( $text ) { - global $wgLang, $wgUseGeoMode; - $fname = 'Parser::magicGEO'; - wfProfileIn( $fname ); - - # These next five lines are only for the ~35000 U.S. Census Rambot pages... - $directions = array ( 'N' => 'North' , 'S' => 'South' , 'E' => 'East' , 'W' => 'West' ) ; - $text = preg_replace ( "/(\d+)°(\d+)'(\d+)\" {$directions['N']}, (\d+)°(\d+)'(\d+)\" {$directions['W']}/" , "(GEO +\$1.\$2.\$3:-\$4.\$5.\$6)" , $text ) ; - $text = preg_replace ( "/(\d+)°(\d+)'(\d+)\" {$directions['N']}, (\d+)°(\d+)'(\d+)\" {$directions['E']}/" , "(GEO +\$1.\$2.\$3:+\$4.\$5.\$6)" , $text ) ; - $text = preg_replace ( "/(\d+)°(\d+)'(\d+)\" {$directions['S']}, (\d+)°(\d+)'(\d+)\" {$directions['W']}/" , "(GEO +\$1.\$2.\$3:-\$4.\$5.\$6)" , $text ) ; - $text = preg_replace ( "/(\d+)°(\d+)'(\d+)\" {$directions['S']}, (\d+)°(\d+)'(\d+)\" {$directions['E']}/" , "(GEO +\$1.\$2.\$3:+\$4.\$5.\$6)" , $text ) ; - - $a = split( 'GEO ', ' '.$text ); - if ( count ( $a ) < 2 ) { - wfProfileOut( $fname ); - return $text; - } - $text = substr( array_shift( $a ), 1); - $valid = '0123456789.+-:'; - - foreach ( $a as $x ) { - $geo = $blank = '' ; - while ( ' ' == $x{0} ) { - $blank .= ' '; - $x = substr( $x, 1 ); - } - while ( strstr( $valid, $x{0} ) != false ) { - $geo .= $x{0}; - $x = substr( $x, 1 ); - } - $num = str_replace( '+', '', $geo ); - $num = str_replace( ' ', '', $num ); - - if ( '' == $num || count ( explode ( ':' , $num , 3 ) ) < 2 ) { - $text .= "GEO $blank$x"; - } else { - $titleObj = Title::makeTitle( NS_SPECIAL, 'Geo' ); - $text .= 'GEO $geo"; - $text .= $x; - } - } - wfProfileOut( $fname ); - return $text; - } - /** * Return an HTML link for the "RFC 1234" text * @access private diff --git a/includes/Setup.php b/includes/Setup.php index f8f961d020..b4531309de 100644 --- a/includes/Setup.php +++ b/includes/Setup.php @@ -48,11 +48,6 @@ if( $wgUseSquid && isset( $_SERVER['HTTP_X_FORWARDED_FOR'] ) ) { $wgIP = '127.0.0.1'; } -if ( $wgUseData ) { - $wgExtraNamespaces[20] = 'Data' ; - $wgExtraNamespaces[21] = 'Data_talk' ; -} - $fname = 'Setup.php'; wfProfileIn( $fname ); global $wgUseDynamicDates; diff --git a/includes/SpecialContributions.php b/includes/SpecialContributions.php index c55c3545df..6834568136 100644 --- a/includes/SpecialContributions.php +++ b/includes/SpecialContributions.php @@ -142,15 +142,6 @@ function wfSpecialContributions( $par = '' ) { } $wgOut->addHTML( "\n" ); - # Validations - global $wgUseValidation; - if( $wgUseValidation ) { - require_once( 'SpecialValidate.php' ); - $val = new Validation ; - $val = $val->countUserValidations ( $id ) ; - $wgOut->addHTML( wfMsg ( 'val_user_validations', $val ) ); - } - $wgOut->addHTML( "
{$sl} ($shm)\n"); } diff --git a/includes/SpecialGeo.php b/includes/SpecialGeo.php deleted file mode 100644 index c4af429b87..0000000000 --- a/includes/SpecialGeo.php +++ /dev/null @@ -1,80 +0,0 @@ - -# http://www.mediawiki.org/ -# -# This program 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. -# -# This program 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 this program; if not, write to the Free Software Foundation, Inc., -# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# http://www.gnu.org/copyleft/gpl.html - -/** - * - * @package MediaWiki - * @subpackage SpecialPage - */ - -/** - * - */ -function wfSpecialGeo( $page = '' ) { - global $wgOut, $wgLang, $wgRequest; - $coordinates = htmlspecialchars( $wgRequest->getText( 'coordinates' ) ); - $coordinates = explode ( ":" , $coordinates ) ; - $ns = array_shift ( $coordinates ) ; - $ew = array_shift ( $coordinates ) ; - if ( 0 < count ( $coordinates ) ) $zoom = length ( array_shift ( $coordinates ) ) ; - else $zoom = 6 ; - - $ns = explode ( "." , $ns ) ; - $ew = explode ( "." , $ew ) ; - while ( count ( $ns ) < 3 ) $ns[] = "0" ; - while ( count ( $ew ) < 3 ) $ew[] = "0" ; - - $mapquest = "http://www.mapquest.com/maps/map.adp?latlongtype=decimal&latitude={$ns[0]}.{$ns[1]}&longitude={$ew[0]}.{$ew[1]}&zoom={$zoom}" ; - $mapquest = "Mapquest" ; - - - $wgOut->addHTML( "{$mapquest}" ) ; -/* - if( $wgRequest->getVal( 'action' ) == 'submit') { - $page = $wgRequest->getText( 'pages' ); - $curonly = $wgRequest->getCheck( 'curonly' ); - } else { - # Pre-check the 'current version only' box in the UI - $curonly = true; - } - - if( $page != "" ) { - header( "Content-type: application/xml; charset=utf-8" ); - $pages = explode( "\n", $page ); - $xml = pages2xml( $pages, $curonly ); - echo $xml; - wfAbruptExit(); - } - - $wgOut->addWikiText( wfMsg( "exporttext" ) ); - $titleObj = Title::makeTitle( NS_SPECIAL, "Export" ); - $action = $titleObj->escapeLocalURL(); - $wgOut->addHTML( " -
- -
-
- -
-" ); -*/ -} - -?> diff --git a/includes/SpecialPage.php b/includes/SpecialPage.php index 24682af2e8..17f24a3751 100644 --- a/includes/SpecialPage.php +++ b/includes/SpecialPage.php @@ -56,11 +56,6 @@ if( !$wgDisableCounters ) { $wgSpecialPages['Popularpages'] = new SpecialPage( 'Popularpages' ); } -global $wgUseData ; -if ( $wgUseData ) { - $wgSpecialPages['Data'] = new SpecialPage( 'Data' ); -} - global $wgDisableInternalSearch; if( !$wgDisableInternalSearch ) { $wgSpecialPages['Search'] = new UnlistedSpecialPage( 'Search' ); @@ -83,8 +78,6 @@ $wgSpecialPages = array_merge($wgSpecialPages, array ( 'Recentchangeslinked' => new UnlistedSpecialPage( 'Recentchangeslinked' ), 'Movepage' => new UnlistedSpecialPage( 'Movepage' ), 'Blockme' => new UnlistedSpecialPage( 'Blockme' ), - 'Geo' => new UnlistedSpecialPage( 'Geo' ), - 'Validate' => new UnlistedSpecialPage( 'Validate' ), 'Booksources' => new SpecialPage( 'Booksources' ), 'Categories' => new SpecialPage( 'Categories' ), 'Export' => new SpecialPage( 'Export' ), diff --git a/index.php b/index.php index 5bd53c0ebb..2c21a5a978 100644 --- a/index.php +++ b/index.php @@ -123,7 +123,6 @@ if( !$wgDisableInternalSearch && !is_null( $search ) && $search !== '' ) { case 'rollback': case 'protect': case 'unprotect': - case 'validate': case 'info': case 'markpatrolled': $wgArticle->$action(); -- 2.20.1