Merge "Misc fixes in RevisionDelete.php."

[lhc/web/wiklou.git] / includes / ExternalEdit.php

diff --git a/includes/ExternalEdit.php b/includes/ExternalEdit.php
index 2c26d94..3468325 100644 (file)
--- a/includes/ExternalEdit.php
+++ b/includes/ExternalEdit.php
@@ -18,72 +18,114 @@
  * and save the modified data back to the server.
  *
  */
-class ExternalEdit {
+class ExternalEdit extends ContextSource {
+
        /**
-        * Title to perform the edit on
-        * @var Title
+        * Array of URLs to link to
+        * @var Array
         */
-       private $title;
+       private $urls;
 
        /**
-        * Mode of editing
-        * @var String
+        * Constructor
+        * @param $context IContextSource context to use
+        * @param $urls array
         */
-       private $mode;
+       public function __construct( IContextSource $context, array $urls = array() ) {
+               $this->setContext( $context );
+               $this->urls = $urls;
+       }
 
        /**
-        * Constructor
-        * @param $title Title object we're performing the edit on
-        * @param $mode String What mode we're using. Only 'file' has any effect
+        * Check whether external edit or diff should be used.
+        *
+        * @param $context IContextSource context to use
+        * @param $type String can be either 'edit' or 'diff'
+        * @return Bool
         */
-       public function __construct( $title, $mode ) {
-               $this->title = $article->getTitle();
-               $this->mode = $mode;
+       public static function useExternalEngine( IContextSource $context, $type ) {
+               global $wgUseExternalEditor;
+
+               if ( !$wgUseExternalEditor ) {
+                       return false;
+               }
+
+               $pref = $type == 'diff' ? 'externaldiff' : 'externaleditor';
+               $request = $context->getRequest();
+
+               return !$request->getVal( 'internaledit' ) &&
+                       ( $context->getUser()->getOption( $pref ) || $request->getVal( 'externaledit' ) );
        }
 
        /**
         * Output the information for the external editor
         */
-       public function edit() {
-               global $wgOut, $wgScript, $wgScriptPath, $wgServer, $wgLang;
-               $wgOut->disable();
-               header( 'Content-type: application/x-external-editor; charset=utf-8' );
-               header( 'Cache-control: no-cache' );
+       public function execute() {
+               global $wgContLang, $wgScript, $wgScriptPath, $wgCanonicalServer;
+
+               $this->getOutput()->disable();
+
+               $response = $this->getRequest()->response();
+               $response->header( 'Content-type: application/x-external-editor; charset=utf-8' );
+               $response->header( 'Cache-control: no-cache' );
+
+               $special = $wgContLang->getNsText( NS_SPECIAL );
 
                # $type can be "Edit text", "Edit file" or "Diff text" at the moment
                # See the protocol specifications at [[m:Help:External editors/Tech]] for
                # details.
-               if( $this->mode == "file" ) {
+               if ( count( $this->urls ) ) {
+                       $urls = $this->urls;
+                       $type = "Diff text";
+               } elseif ( $this->getRequest()->getVal( 'mode' ) == 'file' ) {
                        $type = "Edit file";
-                       $image = wfLocalFile( $this->title );
-                       $url = $image->getFullURL();
-                       $extension = $image->getExtension();
+                       $image = wfLocalFile( $this->getTitle() );
+                       if ( $image ) {
+                               $urls = array(
+                                       'File' => array(
+                                               'Extension' => $image->getExtension(),
+                                               'URL' => $image->getCanonicalURL()
+                                       )
+                               );
+                       } else{
+                               $urls = array();
+                       }
                } else {
                        $type = "Edit text";
-                       $url = $this->title->getFullURL(
-                               array( 'action' => 'edit', 'internaledit' => 'true' ) );
                        # *.wiki file extension is used by some editors for syntax
                        # highlighting, so we follow that convention
-                       $extension = "wiki";
+                       $urls = array( 'File' => array(
+                               'Extension' => 'wiki',
+                               'URL' => $this->getTitle()->getCanonicalURL(
+                                       array( 'action' => 'edit', 'internaledit' => 'true' ) )
+                       ) );
+               }
+
+               $files = '';
+               foreach( $urls as $key => $vars ) {
+                       $files .= "\n[$key]\n";
+                       foreach( $vars as $varname => $varval ) {
+                               $files .= "$varname=$varval\n";
+                       }
                }
-               $special = $wgLang->getNsText( NS_SPECIAL );
+
+               $url = $this->getTitle()->getFullURL(
+                       $this->getRequest()->appendQueryValue( 'internaledit', 1, true ) );
+
                $control = <<<CONTROL
-; You're seeing this file because you're using Mediawiki's External Editor
-; feature. This is probably because you selected use external editor
-; in your preferences. To edit normally, either disable that preference
-; or go to the URL $url .
+; You're seeing this file because you're using Mediawiki's External Editor feature.
+; This is probably because you selected use external editor in your preferences.
+; To edit normally, either disable that preference or go to the URL:
+; $url
 ; See http://www.mediawiki.org/wiki/Manual:External_editors for details.
 [Process]
 Type=$type
 Engine=MediaWiki
-Script={$wgServer}{$wgScript}
-Server={$wgServer}
+Script={$wgCanonicalServer}{$wgScript}
+Server={$wgCanonicalServer}
 Path={$wgScriptPath}
 Special namespace=$special
-
-[File]
-Extension=$extension
-URL=$url
+$files
 CONTROL;
                echo $control;
        }