From 057082578ac3b96c19f703cec93458540a9e55b5 Mon Sep 17 00:00:00 2001
From: nikolark <nikolark@carmen.neuf.no>
Date: Mon, 29 Aug 2011 22:22:06 +0200
Subject: [PATCH] User.php: Removed use of checkForumUsername. ajax.php:
 Changed username check to allways return true.

---
 inside/User.php | 36 +++++++++++-------------------------
 inside/ajax.php | 21 +++++++++++----------
 2 files changed, 22 insertions(+), 35 deletions(-)

diff --git a/inside/User.php b/inside/User.php
index 60e36fa..8b76683 100644
--- a/inside/User.php
+++ b/inside/User.php
@@ -79,13 +79,6 @@ class User {
                 }
                 $this->password = $data['password1'];
 
-                /* Does the username chosen exist in the forum allready? */
-                if (!isAdmin() && checkForumUsername($data['username'], $this->password) == "wrong-password") {
-                    notify("Brukernavnet er allerede i bruk på forumet. Om du selv har dette brukernavnet må du oppgi riktig passord.");
-                    $this->id = -1;
-                    return false;
-                }
-
                 $this->addresstype = isset ($data['addresstype']) ? "int" : "no";
 
                 if (isDate($data['birthdate'])) {
@@ -396,31 +389,24 @@ class User {
   }
 
   public function changeUsername($username, $password) {
-    switch (checkForumUsername($username, $password)) {
-      case "wrong-password" :
-        notify("Brukernavnet er allerede i bruk på forumet. " . "Om du selv har dette brukernavnet må du oppgi " . "riktig passord.");
-        return false;
+      $sql = "UPDATE din_user SET " . "  username = '$username' " . "WHERE " . "  id = $this->id";
+      $result = $this->conn->query($sql);
 
-      case "not-used" :
-      case "auth-ok" :
-        $sql = "UPDATE din_user SET " . "  username = '$username' " . "WHERE " . "  id = $this->id";
-        $result = $this->conn->query($sql);
-        if (DB :: isError($result) == true) {
+      if (DB :: isError($result) == true) {
           if ($result->getCode() == -5) {
-            $err = $this->_findConstraintViolation();
-            error("Change username: $err already registered.");
-            notify("Brukernavnet er opptatt.");
-            $GLOBALS['extraScriptParams']['page'] = "change-username"; //Swap page
+              $err = $this->_findConstraintViolation();
+              error("Change username: $err already registered.");
+              notify("Brukernavnet er opptatt.");
+              $GLOBALS['extraScriptParams']['page'] = "change-username"; //Swap page
           } else {
-            error("Change username: " . $result->toString());
-            notify("Problem under endring av brukernavn.");
+              error("Change username: " . $result->toString());
+              notify("Problem under endring av brukernavn.");
           }
           return false;
-        } else {
+      } else {
           $this->_registerUpdate("Brukernavn endret til $username");
           notify("Brukernavn endret.");
-        }
-    }
+      }
   }
 
   public function getRegistered() {
diff --git a/inside/ajax.php b/inside/ajax.php
index 85ddf96..b8ed9f5 100644
--- a/inside/ajax.php
+++ b/inside/ajax.php
@@ -72,15 +72,16 @@ if ($action == 'checkZip'){
   printRemoveCatXML($type);
 
 }else if ($action == 'checkUsername') {
-  $username = $_REQUEST['username'];
-  $conn = db_connect("forum");
-  $sql = sprintf("SELECT user_id FROM phpbb_users u "."WHERE username_clean = '%s' ", strtolower($username));
-  $result = & $conn->query($sql);
-  if ($result->numRows() == 0) {
-    $status = "true";
-  }else {
-  	$status = "false";
-  }
+  $status = "true";
+  //$username = $_REQUEST['username'];
+  //$conn = db_connect("forum");
+  //$sql = sprintf("SELECT user_id FROM phpbb_users u "."WHERE username_clean = '%s' ", strtolower($username));
+  //$result = & $conn->query($sql);
+  //if ($result->numRows() == 0) {
+  //  $status = "true";
+  //}else {
+  //	$status = "false";
+  //}
 ?><username>
   <status><?php print $status; ?></status>
 </username>
@@ -114,4 +115,4 @@ function printRemoveCatXML($type){
 <?php
 
 }
-?>
\ No newline at end of file
+?>