Move replaceLinkHolders() from OutputPage to Parser, because

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

diff --git a/includes/SpecialMakesysop.php b/includes/SpecialMakesysop.php
index 622dd26..48799d1 100644 (file)
--- a/includes/SpecialMakesysop.php
+++ b/includes/SpecialMakesysop.php
@@ -1,8 +1,19 @@
 <?php
+/**
+ *
+ * @package MediaWiki
+ * @subpackage SpecialPage
+ */
+
+/**
+ *
+ */
 require_once( "LinksUpdate.php" );
 
-function wfSpecialMakesysop()
-{
+/**
+ * Constructor
+ */
+function wfSpecialMakesysop() {
        global $wgUser, $wgOut, $wgRequest;
 
        if ( 0 == $wgUser->getID() or $wgUser->isBlocked() ) {
@@ -24,15 +35,19 @@ function wfSpecialMakesysop()
        if ( $f->mSubmit ) { 
                $f->doSubmit(); 
        } else { 
-               $f->showForm( "" ); 
+               $f->showForm( '' ); 
        }
 }
 
+/**
+ *
+ * @package MediaWiki
+ * @subpackage SpecialPage
+ */
 class MakesysopForm {
        var $mTarget, $mAction, $mRights, $mUser, $mSubmit;
 
-       function MakesysopForm( &$request ) 
-       {
+       function MakesysopForm( &$request ) {
                $this->mAction = $request->getText( 'action' );
                $this->mRights = $request->getVal( 'wpRights' );
                $this->mUser = $request->getText( 'wpMakesysopUser' );
@@ -40,8 +55,7 @@ class MakesysopForm {
                $this->mBuro = $request->getBool( 'wpSetBureaucrat' );
        }
 
-       function showForm( $err = "")
-       {
+       function showForm( $err = '') {
                global $wgOut, $wgUser, $wgLang;
 
                if ( $wgUser->isDeveloper() ) {
@@ -119,20 +133,23 @@ class MakesysopForm {
 
        }
 
-       function doSubmit()
-       {
+       function doSubmit() {
                global $wgOut, $wgUser, $wgLang;
                global $wgDBname, $wgMemc, $wgLocalDatabases;
+
+               $fname = 'MakesysopForm::doSubmit';
                
                $dbw =& wfGetDB( DB_MASTER );
-               $parts = explode( "@", $this->mUser );
-               $usertable = $dbw->tableName( 'user' );
+               $parts = explode( '@', $this->mUser );
+               $user_rights = $dbw->tableName( 'user_rights' );
+               $usertable   = $dbw->tableName( 'user' );
 
-               if( count( $parts ) == 2 && $wgUser->isDeveloper() && strpos( '.', $usertable ) === false ){
+               if( count( $parts ) == 2 && $wgUser->isDeveloper() && strpos( '.', $user_rights ) === false ){
                        $username = $dbw->strencode( $parts[0] );
                        if ( array_key_exists( $parts[1], $wgLocalDatabases ) ) {
                                $dbName = $wgLocalDatabases[$parts[1]];
-                               $usertable = $dbName . "." . $usertable;
+                               $user_rights = $dbName . '.' . $user_rights;
+                               $usertable   = $usertable . '.' . $usertable;
                        } else {
                                $this->showFail();
                                return;
@@ -143,15 +160,15 @@ class MakesysopForm {
                }
                if ( $username{0} == "#" ) {
                        $id = intval( substr( $username, 1 ) );
-                       $sql = "SELECT user_id,user_rights FROM $usertable WHERE user_id=$id FOR UPDATE";
+                       $sql = "SELECT user_id,user_rights FROM $user_rights WHERE user_id=$id FOR UPDATE";
                } else {
                        $encName = $dbw->strencode( $username );
-                       $sql = "SELECT user_id, user_rights FROM $usertable WHERE user_name = '{$username}' FOR UPDATE";
+                       $sql = "SELECT u.user_id, user_rights FROM $usertable u LEFT JOIN $user_rights r ON u.user_id=r.user_id WHERE user_name = '{$username}' FOR UPDATE";
                }
                
-               $prev = $dbw->setIgnoreErrors( TRUE );
+               $prev = $dbw->ignoreErrors( TRUE );
                $res = $dbw->query( $sql );
-               $dbw->setIgnoreSQLErrors( $prev );
+               $dbw->ignoreErrors( $prev );
 
                if( $dbw->lastErrno() || ! $username || $dbw->numRows( $res ) == 0 ){
                        $this->showFail();
@@ -190,22 +207,21 @@ class MakesysopForm {
                if ( count( $rightsNotation ) == 0 ) {
                        $this->showFail();
                } else {
-                       $sql = "UPDATE $usertable SET user_rights = '{$newrights}' WHERE user_id = $id LIMIT 1";
-                       $dbw->query($sql);
+                       #$sql = "UPDATE $user_rights SET user_rights = '{$newrights}' WHERE user_id = $id LIMIT 1";
+                       #$dbw->query($sql);
+                       $dbw->replace( $user_rights, array( array( 'user_id', 'user_rights' )),
+                               array( 'user_id' => $id, 'user_rights' => $newrights ) , $fname );
                        $wgMemc->delete( "$dbName:user:id:$id" );
                        
-                       $bureaucratLog = wfMsg( "bureaucratlog" );
-                       $action = wfMsg( "bureaucratlogentry", $this->mUser, implode( " ", $rightsNotation ) );
-                       
-                       $log = new LogPage( $bureaucratLog );
-                       $log->addEntry( $action, "" );
+                       $log = new LogPage( 'rights' );
+                       $log->addEntry( 'rights', Title::makeTitle( NS_USER, $this->mUser ),
+                               implode( " ", $rightsNotation ) );
                        
                        $this->showSuccess();
                }
        }
 
-       function showSuccess()
-       {
+       function showSuccess() {
                global $wgOut, $wgUser;
 
                $wgOut->setPagetitle( wfMsg( "makesysoptitle" ) );
@@ -221,8 +237,7 @@ class MakesysopForm {
 
        }
 
-       function showFail()
-       {
+       function showFail() {
                global $wgOut, $wgUser;
 
                $wgOut->setPagetitle( wfMsg( "makesysoptitle" ) );