MediaWiki 1.16.4

[autoinstalls/mediawiki.git] / includes / FileDeleteForm.php

diff --git a/includes/FileDeleteForm.php b/includes/FileDeleteForm.php
index 5177d35fe71ac356041d62c083212e68aa45473c..dad19524c3b39d2dc71586d72909883a0c885a46 100644 (file)
--- a/includes/FileDeleteForm.php
+++ b/includes/FileDeleteForm.php
@@ -17,7 +17,7 @@ class FileDeleteForm {
        /**
         * Constructor
         *
-        * @param File $file File we're deleting
+        * @param $file File object we're deleting
         */
        public function __construct( $file ) {
                $this->title = $file->getTitle();
@@ -90,7 +90,17 @@ class FileDeleteForm {
                $this->showLogEntries();
        }
 
+       /**
+        * Really delete the file
+        *
+        * @param $title Title object
+        * @param $file File object
+        * @param $oldimage String: archive name
+        * @param $reason String: reason of the deletion
+        * @param $suppress Boolean: whether to mark all deleted versions as restricted
+        */
        public static function doDelete( &$title, &$file, &$oldimage, $reason, $suppress ) {
+               global $wgUser;
                $article = null;
                if( $oldimage ) {
                        $status = $file->deleteOld( $oldimage, $reason, $suppress );
@@ -99,7 +109,7 @@ class FileDeleteForm {
                                $log = new LogPage( 'delete' );
                                $logComment = wfMsgForContent( 'deletedrevision', $oldimage );
                                if( trim( $reason ) != '' )
-                                       $logComment .= ": {$reason}";
+                                       $logComment .= wfMsgForContent( 'colon-separator' ) . $reason;
                                        $log->addEntry( 'delete', $title, $logComment );
                        }
                } else {
@@ -112,7 +122,7 @@ class FileDeleteForm {
                                if( wfRunHooks('ArticleDelete', array(&$article, &$wgUser, &$reason, &$error)) ) {
                                        if( $article->doDeleteArticle( $reason, $suppress, $id ) ) {
                                                global $wgRequest;
-                                               if( $wgRequest->getCheck( 'wpWatch' ) ) {
+                                               if( $wgRequest->getCheck( 'wpWatch' ) && $wgUser->isLoggedIn() ) {
                                                        $article->doWatch();
                                                } elseif( $title->userIsWatching() ) {
                                                        $article->doUnwatch();
@@ -137,10 +147,10 @@ class FileDeleteForm {
                if( $wgUser->isAllowed( 'suppressrevision' ) ) {
                        $suppress = "<tr id=\"wpDeleteSuppressRow\">
                                        <td></td>
-                                       <td class='mw-input'>" .
+                                       <td class='mw-input'><strong>" .
                                                Xml::checkLabel( wfMsg( 'revdelete-suppress' ),
                                                        'wpSuppress', 'wpSuppress', false, array( 'tabindex' => '3' ) ) .
-                                       "</td>
+                                       "</strong></td>
                                </tr>";
                } else {
                        $suppress = '';
@@ -173,14 +183,18 @@ class FileDeleteForm {
                                                array( 'type' => 'text', 'maxlength' => '255', 'tabindex' => '2', 'id' => 'wpReason' ) ) .
                                "</td>
                        </tr>
-                       {$suppress}
+                       {$suppress}";
+               if( $wgUser->isLoggedIn() ) {   
+                       $form .= "
                        <tr>
                                <td></td>
                                <td class='mw-input'>" .
                                        Xml::checkLabel( wfMsg( 'watchthis' ),
                                                'wpWatch', 'wpWatch', $checkWatch, array( 'tabindex' => '3' ) ) .
                                "</td>
-                       </tr>
+                       </tr>";
+               }
+               $form .= "
                        <tr>
                                <td></td>
                                <td class='mw-submit'>" .
@@ -194,7 +208,13 @@ class FileDeleteForm {
 
                        if ( $wgUser->isAllowed( 'editinterface' ) ) {
                                $skin = $wgUser->getSkin();
-                               $link = $skin->makeLink ( 'MediaWiki:Filedelete-reason-dropdown', wfMsgHtml( 'filedelete-edit-reasonlist' ) );
+                               $title = Title::makeTitle( NS_MEDIAWIKI, 'Filedelete-reason-dropdown' );
+                               $link = $skin->link(
+                                       $title,
+                                       wfMsgHtml( 'filedelete-edit-reasonlist' ),
+                                       array(),
+                                       array( 'action' => 'edit' )
+                               );
                                $form .= '<p class="mw-filedelete-editreasons">' . $link . '</p>';
                        }
 
@@ -215,8 +235,8 @@ class FileDeleteForm {
         * showing an appropriate message depending upon whether
         * it's a current file or an old version
         *
-        * @param string $message Message base
-        * @return string
+        * @param $message String: message base
+        * @return String
         */
        private function prepareMessage( $message ) {
                global $wgLang;
@@ -245,7 +265,16 @@ class FileDeleteForm {
                global $wgOut, $wgUser;
                $wgOut->setPageTitle( wfMsg( 'filedelete', $this->title->getText() ) );
                $wgOut->setRobotPolicy( 'noindex,nofollow' );
-               $wgOut->setSubtitle( wfMsg( 'filedelete-backlink', $wgUser->getSkin()->makeKnownLinkObj( $this->title ) ) );
+               $wgOut->setSubtitle( wfMsg(
+                       'filedelete-backlink',
+                       $wgUser->getSkin()->link(
+                               $this->title,
+                               null,
+                               array(),
+                               array(),
+                               array( 'known', 'noclasses' )
+                       )
+               ) );
        }
 
        /**
@@ -279,10 +308,12 @@ class FileDeleteForm {
         */
        private function getAction() {
                $q = array();
-               $q[] = 'action=delete';
+               $q['action'] = 'delete';
+
                if( $this->oldimage )
-                       $q[] = 'oldimage=' . urlencode( $this->oldimage );
-               return $this->title->getLocalUrl( implode( '&', $q ) );
+                       $q['oldimage'] = $this->oldimage;
+
+               return $this->title->getLocalUrl( $q );
        }
 
        /**
@@ -293,5 +324,4 @@ class FileDeleteForm {
        private function getTimestamp() {
                return $this->oldfile->getTimestamp();
        }
-
 }