Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better saved logins, with grid

Browse Source 
Please, someone throw away the oodles of dead, confusing and redundant code -.-
This commit is contained in:
Siana Gearz
2011-06-15 15:14:55 +02:00
parent 9d57163479
commit c82cf613a6
4 changed files with 56 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
indra/newview/llsavedlogins.cpp
View File

@@ -34,6 +34,7 @@
#include "llsavedlogins.h"
#include "llxorcipher.h"
#include "llsdserialize.h"
#include "hippogridmanager.h"
//---------------------------------------------------------------------------
// LLSavedLoginEntry methods
@@ -57,6 +58,10 @@ LLSavedLoginEntry::LLSavedLoginEntry(const LLSD& entry_data)
{
throw std::invalid_argument("Missing password key.");
}
if (!entry_data.has("grid"))
{
throw std::invalid_argument("Missing grid key.");
}
if (!entry_data.get("firstname").isString())
{
throw std::invalid_argument("firstname key is not string.");
@@ -69,16 +74,22 @@ LLSavedLoginEntry::LLSavedLoginEntry(const LLSD& entry_data)
{
throw std::invalid_argument("password key is neither blank nor binary.");
}
if (!entry_data.get("grid").isString())
{
throw std::invalid_argument("grid key is not string.");
}
mEntry = entry_data;
}
LLSavedLoginEntry::LLSavedLoginEntry(const std::string& firstname,
const std::string& lastname,
const std::string& password)
const std::string& password,
const std::string& grid)
{
mEntry.clear();
mEntry.insert("firstname", LLSD(firstname));
mEntry.insert("lastname", LLSD(lastname));
mEntry.insert("grid", LLSD(grid));
setPassword(password);
}
@@ -87,13 +98,6 @@ LLSD LLSavedLoginEntry::asLLSD() const
return mEntry;
}
const std::string LLSavedLoginEntry::getDisplayString() const
{
std::ostringstream etitle;
etitle << getFirstName() << " " << getLastName();
return etitle.str();
}
const std::string LLSavedLoginEntry::getPassword() const
{
return (mEntry.has("password") ? decryptPassword(mEntry.get("password")) : std::string());
@@ -177,13 +181,14 @@ void LLSavedLogins::addEntry(const LLSavedLoginEntry& entry)
}
void LLSavedLogins::deleteEntry(const std::string& firstname,
const std::string& lastname)
const std::string& lastname, const std::string& grid)
{
for (LLSavedLoginsList::iterator i = mEntries.begin();
i != mEntries.end();)
{
if (i->getFirstName() == firstname &&
i->getLastName() == lastname)
i->getLastName() == lastname &&
i->getGrid() == grid)
{
i = mEntries.erase(i);
}