right click editing bug

[lhc/web/wiklou.git] / install.php

diff --git a/install.php b/install.php
index bb364dd..8761881 100644 (file)
--- a/install.php
+++ b/install.php
@@ -1,5 +1,12 @@
 <?
 
+if (!extension_loaded('mysql')) {
+    if (!dl('mysql.so')) {
+        print "Could not load MySQL driver! Please compile ".
+              "php --with-mysql or install the mysql.so module.\n";
+       exit;
+    }
+}
 # Install software and create new empty database.
 #
 
@@ -169,7 +176,7 @@ function copydirectory( $source, $dest ) {
 
 function readconsole() {
        $fp = fopen( "php://stdin", "r" );
-       $resp = trim( fgets( $fp ) );
+       $resp = trim( fgets( $fp, 1024 ) );
        fclose( $fp );
        return $resp;
 }
@@ -246,11 +253,21 @@ function populatedata() {
        $sql = "DELETE FROM user";
        wfQuery( $sql, $fname );
 
-       $sql = "INSERT INTO user (user_name, user_password, user_rights)" .
-         "VALUES ('WikiSysop','" . User::encryptPassword( $wgDBadminpassword ) .
-         "','sysop'),('WikiDeveloper','" . User::encryptPassword(
-         $wgDBadminpassword ) . "','sysop,developer')";
-       wfQuery( $sql, $fname );
+       $u = User::newFromName( "WikiSysop" );
+       if ( 0 == $u->idForName() ) {
+               $u->addToDatabase();
+               $u->setPassword( $wgDBadminpassword );
+               $u->addRight( "sysop" );
+               $u->saveSettings();
+       }
+       $u = User::newFromName( "WikiDeveloper" );
+       if ( 0 == $u->idForName() ) {
+               $u->addToDatabase();
+               $u->setPassword( $wgDBadminpassword );
+               $u->addRight( "sysop" );
+               $u->addRight( "developer" );
+               $u->saveSettings();
+       }
        
        $wns = Namespace::getWikipedia();
        $ulp = addslashes( wfMsg( "uploadlogpage" ) );