* (bug 6701) Kazakh language variants in MessagesEn.php

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

diff --git a/includes/SpecialLockdb.php b/includes/SpecialLockdb.php
index 652549a..72172e2 100644 (file)
--- a/includes/SpecialLockdb.php
+++ b/includes/SpecialLockdb.php
@@ -10,18 +10,30 @@
  */
 function wfSpecialLockdb() {
        global $wgUser, $wgOut, $wgRequest;
-       if( $wgUser->isAllowed( 'siteadmin' ) ) {
-               $form = new DBLockForm();
-               if( $action == 'success' ) {
-                       $form->showSuccess();
-               } else if( $action == 'submit' && wgRequest->wasPosted() && $wgUser->matchEditToken( $wgRequest->getVal( 'wpEditToken' ) ) ) {
-                       $form->doSubmit();
-               } else {
-                       $form->showForm();
-       } else {
+
+       if( !$wgUser->isAllowed( 'siteadmin' ) ) {
                $wgOut->permissionRequired( 'siteadmin' );
                return;
        }
+       
+       # If the lock file isn't writable, we can do sweet bugger all
+       global $wgReadOnlyFile;
+       if( !is_writable( dirname( $wgReadOnlyFile ) ) ) {
+               DBLockForm::notWritable();
+               return;
+       }
+
+       $action = $wgRequest->getVal( 'action' );
+       $f = new DBLockForm();
+
+       if ( 'success' == $action ) {
+               $f->showSuccess();
+       } else if ( 'submit' == $action && $wgRequest->wasPosted() &&
+               $wgUser->matchEditToken( $wgRequest->getVal( 'wpEditToken' ) ) ) {
+               $f->doSubmit();
+       } else {
+               $f->showForm( '' );
+       }
 }
 
 /**
@@ -52,12 +64,13 @@ class DBLockForm {
                $elr = htmlspecialchars( wfMsg( 'enterlockreason' ) );
                $titleObj = Title::makeTitle( NS_SPECIAL, 'Lockdb' );
                $action = $titleObj->escapeLocalURL( 'action=submit' );
+               $reason = htmlspecialchars( $this->reason );
                $token = htmlspecialchars( $wgUser->editToken() );
 
                $wgOut->addHTML( <<<END
 <form id="lockdb" method="post" action="{$action}">
 {$elr}:
-<textarea name="wpLockReason" rows="10" cols="60" wrap="virtual"></textarea>
+<textarea name="wpLockReason" rows="10" cols="60" wrap="virtual">{$reason}</textarea>
 <table border="0">
        <tr>
                <td align="right">
@@ -87,10 +100,13 @@ END
                        $this->showForm( wfMsg( 'locknoconfirm' ) );
                        return;
                }
-               $fp = fopen( $wgReadOnlyFile, 'w' );
+               $fp = @fopen( $wgReadOnlyFile, 'w' );
 
                if ( false === $fp ) {
-                       $wgOut->fileNotFoundError( $wgReadOnlyFile );
+                       # This used to show a file not found error, but the likeliest reason for fopen()
+                       # to fail at this point is insufficient permission to write to the file...good old
+                       # is_writable() is plain wrong in some cases, it seems...
+                       $this->notWritable();
                        return;
                }
                fwrite( $fp, $this->reason );
@@ -103,12 +119,18 @@ END
        }
 
        function showSuccess() {
-               global $wgOut, $wgUser;
+               global $wgOut;
 
                $wgOut->setPagetitle( wfMsg( 'lockdb' ) );
                $wgOut->setSubtitle( wfMsg( 'lockdbsuccesssub' ) );
                $wgOut->addWikiText( wfMsg( 'lockdbsuccesstext' ) );
        }
+       
+       function notWritable() {
+               global $wgOut;
+               $wgOut->errorPage( 'lockdb', 'lockfilenotwritable' );
+       }
+       
 }
 
 ?>