Changes in server/DataAccess.cpp [60017fc:41ad8ed] in network-game

File:

• server/DataAccess.cpp (modified) (5 diffs)

server/DataAccess.cpp

@@ -3 +3 @@
 #include <iostream>
 #include <sstream>
-#include <cstdlib>
 
 using namespace std;
@@ -28 +27 @@
    ostringstream oss;
 
-   string salt = "$1$";
-   int random;
-   char chr;
-   for(int i=0; i<8; i++)
-   {
-      random = rand() % 62;
-      if (random < 26)
-         chr = (char)('a'+random);
-      else if (random < 52)
-         chr = (char)('A'+random-26);
-      else
-         chr = (char)('0'+random-52);
-      salt += chr;
-   }
-   salt += '$';
-
-   string encrypted(crypt(password.c_str(), salt.c_str()));
-
-   oss << "'" << username << "', '" << encrypted << "'";
+   oss << "'" << username << "', '" << password << "'";
 
    return insert("users", "name, password", oss.str());
-}
-
-int DataAccess::updatePlayer(string username, string password)
-{
-   ostringstream values, where;
-
-   values << "password='" << password << "'";
-   
-   where << "name='" << username << "'";
-
-   return update("users", values.str(), where.str());
 }
 
@@ -81 +51 @@
    }
 
-   if ( ( row = mysql_fetch_row(result)) != NULL ) {
-      cout << "Creating a new player" << endl;
+   if ( ( row = mysql_fetch_row(result)) != NULL )
       p = new Player(string(row[1]), string(row[2]));
-   }else {
+   else {
       cout << "Returned no results for some reason" << endl;
       p = NULL;
@@ -94 +63 @@
 }
 
-// need to make sure this list is freed
-// since we need to create a DataAccess class
-// when calling these functions,
-// we could free this list in the destructor
-list<Player*>* DataAccess::getPlayers()
+int DataAccess::printPlayers()
 {
    MYSQL_RES *result;
@@ -108 +73 @@
    if (result == NULL) {
       cout << mysql_error(connection) << endl;
-      return NULL;
+      return 1;
    }
 
-   list<Player*>* lstPlayers = new list<Player*>();
    while ( ( row = mysql_fetch_row(result)) != NULL ) {
       cout << row[0] << ", " << row[1] << ", " << row[2] << endl;
-      lstPlayers->push_back(new Player(row[1], row[2]));
    }
 
    mysql_free_result(result);
 
-   return lstPlayers;
+   return 0;
 }
 
-bool DataAccess::verifyPassword(string password, string encrypted)
-{
-   string test(crypt(password.c_str(), encrypted.c_str()));
-
-   return encrypted.compare(test) == 0;
-}
-
-int DataAccess::insert(string table, string columns, string values)
+int DataAccess::insert(string table, string rows, string values)
 {
    int query_state;
    ostringstream oss;
 
-   oss << "INSERT into " << table << " (" << columns << ") VALUES (" << values << ")";
-   cout << "query: " << oss.str() << endl;
-
-   query_state = mysql_query(connection, oss.str().c_str());
-
-   if (query_state != 0) {
-      cout << mysql_error(connection) << endl;
-      return 1;
-   }
-
-   return 0;
-}
-
-int DataAccess::update(string table, string values, string where)
-{
-   int query_state;
-   ostringstream oss;
-
-   oss << "UPDATE " << table << " SET " << values << " WHERE " << where;
+   oss << "INSERT into " << table << " (" << rows << ") VALUES (" << values << ")";
    cout << "query: " << oss.str() << endl;