dépôts / lhc / web / wiklou.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4f4dd54)
Enhances special page links; allow some parameters to be passed via wikilinks to...
authorBrion Vibber <brion@users.mediawiki.org>
Wed, 2 Jul 2003 06:22:03 +0000 (06:22 +0000)
committerBrion Vibber <brion@users.mediawiki.org>
Wed, 2 Jul 2003 06:22:03 +0000 (06:22 +0000)
includes/GlobalFunctions.php patch | blob | history
includes/OutputPage.php patch | blob | history
includes/SpecialAllpages.php patch | blob | history
includes/SpecialContributions.php patch | blob | history
includes/SpecialMaintenance.php patch | blob | history
includes/SpecialRecentchanges.php patch | blob | history
includes/SpecialRecentchangeslinked.php patch | blob | history
includes/SpecialWhatlinkshere.php patch | blob | history
includes/Title.php patch | blob | history

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 2a76633..19efb75 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -185,7 +185,8 @@ function wfMsg( $key )
        }
 
        if ( "" == $ret ) {
-               user_error( "Couldn't find text for message \"{$key}\"." );
+               # Let's at least _try_ to be graceful about this.
+               return "&lt;$key&gt;";
        }
        return $ret;
 }
@@ -254,6 +255,7 @@ function wfSpecialPage()
 {
        global $wgUser, $wgOut, $wgTitle, $wgLang;
 
+       /* FIXME: this list probably shouldn't be language-specific, per se */
        $validSP = $wgLang->getValidSpecialPages();
        $sysopSP = $wgLang->getSysopSpecialPages();
        $devSP = $wgLang->getDeveloperSpecialPages();
@@ -261,16 +263,21 @@ function wfSpecialPage()
        $wgOut->setArticleFlag( false );
        $wgOut->setRobotpolicy( "noindex,follow" );
 
-       $t = $wgTitle->getDBkey();
+       $par = NULL;
+       list($t, $par) = split( "/", $wgTitle->getDBkey(), 2 );
+       
        if ( array_key_exists( $t, $validSP ) ||
          ( $wgUser->isSysop() && array_key_exists( $t, $sysopSP ) ) ||
          ( $wgUser->isDeveloper() && array_key_exists( $t, $devSP ) ) ) {
+               if($par !== NULL)
+                       $wgTitle = Title::makeTitle( Namespace::getSpecial(), $t );
+
                $wgOut->setPageTitle( wfMsg( strtolower( $wgTitle->getText() ) ) );
 
                $inc = "Special" . $t . ".php";
                include_once( $inc );
                $call = "wfSpecial" . $t;
-               $call();
+               $call( $par );
        } else if ( array_key_exists( $t, $sysopSP ) ) {
                $wgOut->sysopRequired();
        } else if ( array_key_exists( $t, $devSP ) ) {
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index a4c8e3a..50748e4 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -1359,7 +1359,7 @@ class OutputPage {
        {
                global $wgDocType, $wgDTD, $wgUser, $wgLanguageCode, $wgOutputEncoding;
 
-               $ret = "<!DOCTYPE HTML PUBLIC \"$wgDocType\" \"$wgDTD\">\n";
+               $ret = "<!DOCTYPE HTML PUBLIC \"$wgDocType\"\n        \"$wgDTD\">\n";
 
                if ( "" == $this->mHTMLtitle ) {
                        $this->mHTMLtitle = $this->mPagetitle;
diff --git a/includes/SpecialAllpages.php b/includes/SpecialAllpages.php
index bbd5fdc..8ba8225 100644 (file)
--- a/includes/SpecialAllpages.php
+++ b/includes/SpecialAllpages.php
@@ -1,11 +1,13 @@
 <?
 
-function wfSpecialAllpages()
+function wfSpecialAllpages( $par=NULL )
 {
        global $from, $indexMaxperpage;
        $indexMaxperpage = 480;
 
-       if( isset( $from ) ) {
+       if( $par ) {
+               indexShowChunk( $par );
+       } elseif( isset( $from ) ) {
                indexShowChunk( $from );
        } else {
                indexShowToplevel();
diff --git a/includes/SpecialContributions.php b/includes/SpecialContributions.php
index 1b5fdbb..fc88af8 100644 (file)
--- a/includes/SpecialContributions.php
+++ b/includes/SpecialContributions.php
@@ -1,18 +1,22 @@
 <?
 
-function wfSpecialContributions()
+function wfSpecialContributions( $par = "" )
 {
        global $wgUser, $wgOut, $wgLang, $target, $hideminor;
        $fname = "wfSpecialContributions";
        $sysop = $wgUser->isSysop();
 
+       if( $par )
+               $target = $par;
+       else
+               $target = wfCleanQueryVar( $target );
+
        if ( "" == $target ) {
                $wgOut->errorpage( "notargettitle", "notargettext" );
                return;
        }
        list( $limit, $offset ) = wfCheckLimits( 50, "" );
 
-       $target = wfCleanQueryVar( $target );
        $nt = Title::newFromURL( $target );
        $nt->setNamespace( Namespace::getUser() );
 
diff --git a/includes/SpecialMaintenance.php b/includes/SpecialMaintenance.php
index fefc96b..481c9d4 100644 (file)
--- a/includes/SpecialMaintenance.php
+++ b/includes/SpecialMaintenance.php
@@ -1,20 +1,25 @@
 <?
 
 function sns()
-       {
+{
        global $wgLang ;
        $ns = $wgLang->getNamespaces() ;
        return $ns[-1] ;
-       }
+}
 
-function wfSpecialMaintenance ()
-       {
+function wfSpecialMaintenance( $par=NULL )
+{
        global $wgUser, $wgOut, $wgLang, $wgTitle, $subfunction, $wgLanguageCode, $submitmll;
        global $wgMiserMode;
        if ( $wgMiserMode ) {
                $wgOut->addWikiText( wfMsg( "perfdisabled" ) );
                return;
        }
+       
+       if( $par )
+               $subfunction = $par;
+       else
+               $subfunction = $_REQUEST['subfunction'];
 
        if ( $subfunction == "disambiguations" ) return wfSpecialDisambiguations() ;
        if ( $subfunction == "doubleredirects" ) return wfSpecialDoubleRedirects() ;
@@ -56,17 +61,17 @@ function wfSpecialMaintenance ()
 
        $r .= "</UL>\n" ;
        $wgOut->addHTML ( $r ) ;
-       }
+}
 
 function getMPL ( $x )
-       {
+{
        global $wgUser , $wgLang;
        $sk = $wgUser->getSkin() ;
        return $sk->makeKnownLink(sns().":Maintenance",wfMsg($x),"subfunction={$x}") ;
-       }
+}
 
 function getMaintenancePageBacklink()
-       {
+{
        global $wgUser , $wgLang , $subfunction ;
        $sk = $wgUser->getSkin() ;
        $ns = $wgLang->getNamespaces() ;
@@ -79,7 +84,7 @@ function getMaintenancePageBacklink()
        $s .= "<h2>{$t}</h2></td><td align=right>";
        $s .= "{$r}</td></tr></table>\n" ;
        return $s ;
-       }
+}
 
 
 function wfSpecialDisambiguations()
diff --git a/includes/SpecialRecentchanges.php b/includes/SpecialRecentchanges.php
index e97c6e9..bdc75ad 100644 (file)
--- a/includes/SpecialRecentchanges.php
+++ b/includes/SpecialRecentchanges.php
@@ -1,11 +1,19 @@
 <?
 
-function wfSpecialRecentchanges()
+function wfSpecialRecentchanges( $par )
 {
        global $wgUser, $wgOut, $wgLang, $wgTitle;
        global $days, $hideminor, $from, $hidebots; # From query string
        $fname = "wfSpecialRecentchanges";
 
+       if( $par ) {
+               $bits = preg_split( '/\s*,\s*/', trim( $par ) );
+               if( in_array( "hidebots", $bits ) ) $hidebots = 1;
+               if( in_array( "bots", $bits ) ) $hidebots = 0;
+               if( in_array( "hideminor", $bits ) ) $hideminor = 1;
+               if( in_array( "minor", $bits ) ) $hideminor = 0;
+       }
+       
        $sql = "SELECT MAX(rc_timestamp) AS lastmod FROM recentchanges";
        $res = wfQuery( $sql, $fname );
        $s = wfFetchObject( $res );
diff --git a/includes/SpecialRecentchangeslinked.php b/includes/SpecialRecentchangeslinked.php
index 0f221b5..cb5f69e 100644 (file)
--- a/includes/SpecialRecentchangeslinked.php
+++ b/includes/SpecialRecentchangeslinked.php
@@ -2,7 +2,7 @@
 global $IP;
 include_once( "$IP/SpecialRecentchanges.php" );
 
-function wfSpecialRecentchangeslinked()
+function wfSpecialRecentchangeslinked( $par = NULL )
 {
        global $wgUser, $wgOut, $wgLang, $wgTitle;
        global $days, $target, $hideminor; # From query string
@@ -11,6 +11,9 @@ function wfSpecialRecentchangeslinked()
        $wgOut->setPagetitle( wfMsg( "recentchanges" ) );
        $sk = $wgUser->getSkin();
 
+       if( $par ) {
+               $target = $par;
+       }
        if ( "" == $target ) {
                $wgOut->errorpage( "notargettitle", "notargettext" );
                return;
diff --git a/includes/SpecialWhatlinkshere.php b/includes/SpecialWhatlinkshere.php
index f9d2a26..9eaaadf 100644 (file)
--- a/includes/SpecialWhatlinkshere.php
+++ b/includes/SpecialWhatlinkshere.php
@@ -1,15 +1,20 @@
 <?
 
-function wfSpecialWhatlinkshere()
+function wfSpecialWhatlinkshere($par = NULL)
 {
        global $wgUser, $wgOut, $target;
        $fname = "wfSpecialWhatlinkshere";
 
+       if($par) {
+               $target = $par;
+       } else {
+               $target = wfCleanQueryVar( $_REQUEST['target'] );
+       }
        if ( "" == $target ) {
                $wgOut->errorpage( "notargettitle", "notargettext" );
                return;
        }
-       $nt = Title::newFromURL( wfCleanQueryVar( $target ) );
+       $nt = Title::newFromURL( $target );
        $wgOut->setPagetitle( $nt->getPrefixedText() );
        $wgOut->setSubtitle( wfMsg( "linklistsub" ) );
 
diff --git a/includes/Title.php b/includes/Title.php
index e171eb5..f870526 100644 (file)
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -128,6 +128,14 @@ class Title {
                if ( "" == $n ) { return $title; }
                else { return "{$n}:{$title}"; }
        }
+       
+       /* static */ function makeTitle( $ns, $title )
+       {
+               $t = new Title();
+               $t->mDbkeyform = Title::makeName( $ns, $title );
+               $t->secureAndSplit();
+               return $t;
+       }
 
        function getPrefixedDBkey()
        {
Wiklou, le Wiki du Wiklou