libtransport.git Changeset - e5fcbf00b799

Changeset - e5fcbf00b799

Parent rev.

Child rev.

[Not reviewed]

0 8 0

HanzZ - 14 years ago 2011-03-07 20:52:35
hanzz.k@gmail.com

Swift::String removed

8 files changed with 30 insertions and 30 deletions:

include/transport/transport.h

include/transport/userregistration.h

src/discoinforesponder.cpp

src/discoinforesponder.h

src/sqlite3backend.cpp

src/transport.cpp

src/usermanager.cpp

src/userregistration.cpp

0 comments (0 inline, 0 general)

include/transport/transport.h

➞

Show inline comments

@@ @@ -111,8 +111,8 @@ namespace Transport { @@
 			void handlePresence(Swift::Presence::ref presence);
 			void handleSubscription(Swift::Presence::ref presence);
 			void handleProbePresence(Swift::Presence::ref presence);
 			void handleDataRead(const Swift::String &data);
 			void handleDataWritten(const Swift::String &data);
 			void handleDataRead(const std::string &data);
 			void handleDataWritten(const std::string &data);
 			void handleDiscoInfoResponse(boost::shared_ptr<Swift::DiscoInfo> info, Swift::ErrorPayload::ref error, const Swift::JID& jid);
 // 			void handleCapsChanged(const Swift::JID& jid);

include/transport/userregistration.h

➞

Show inline comments

 		boost::signal<void (const UserInfo &user)> onUserUpdated;
 	private:
 		bool handleGetRequest(const Swift::JID& from, const Swift::JID& to, const Swift::String& id, boost::shared_ptr<Swift::InBandRegistrationPayload> payload);
 		bool handleSetRequest(const Swift::JID& from, const Swift::JID& to, const Swift::String& id, boost::shared_ptr<Swift::InBandRegistrationPayload> payload);
 		bool handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr<Swift::InBandRegistrationPayload> payload);
 		bool handleSetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr<Swift::InBandRegistrationPayload> payload);
 		Component *m_component;
 		StorageBackend *m_storageBackend;

src/discoinforesponder.cpp

➞

Show inline comments

 	onBuddyCapsInfoChanged(caps.generateCapsInfo(m_buddyInfo));
+}
 bool DiscoInfoResponder::handleGetRequest(const Swift::JID& from, const Swift::JID& to, const Swift::String& id, boost::shared_ptr<Swift::DiscoInfo> info) {
 	if (!info->getNode().isEmpty()) {
 bool DiscoInfoResponder::handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr<Swift::DiscoInfo> info) {
 	if (!info->getNode().empty()) {
 		sendError(from, id, ErrorPayload::ItemNotFound, ErrorPayload::Cancel);
 		return true;
+	}
 	// presence for transport
-	if (to.getNode().isEmpty()) {
+	if (to.getNode().empty()) {
 		sendResponse(from, id, boost::shared_ptr<DiscoInfo>(new DiscoInfo(m_transportInfo)));
+	}
 	// presence for buddy

src/discoinforesponder.h

➞

Show inline comments

 		boost::signal<void (const Swift::CapsInfo &capsInfo)> onBuddyCapsInfoChanged;
 	private:
-		virtual bool handleGetRequest(const Swift::JID& from, const Swift::JID& to, const Swift::String& id, boost::shared_ptr<Swift::DiscoInfo> payload);
+		virtual bool handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr<Swift::DiscoInfo> payload);
 		Swift::DiscoInfo m_transportInfo;
 		Swift::DiscoInfo m_buddyInfo;

src/sqlite3backend.cpp

➞

Show inline comments

+}
 bool SQLite3Backend::removeUser(long id) {
+	>
+	return true;
+}
+}

src/transport.cpp

➞

Show inline comments

 	m_reconnectTimer->start();
+}
 void Component::handleDataRead(const String &data) {
 	onXMLIn(data.getUTF8String());
 void Component::handleDataRead(const std::string &data) {
 	onXMLIn(data);
+}
 void Component::handleDataWritten(const String &data) {
 	onXMLOut(data.getUTF8String());
 void Component::handleDataWritten(const std::string &data) {
 	onXMLOut(data);
+}
 void Component::handlePresenceReceived(Swift::Presence::ref presence) {
 	bool isMUC = presence->getPayload<MUCPayload>() != NULL;
 	// filter out login/logout presence spam
-	if (!presence->getTo().getNode().isEmpty() && isMUC == false)
+	if (!presence->getTo().getNode().empty() && isMUC == false)
 		return;
 	// filter out bad presences
 void Component::handleSubscription(Swift::Presence::ref presence) {
 	// answer to subscibe
-	if (presence->getType() == Swift::Presence::Subscribe && presence->getTo().getNode().isEmpty()) {
+	if (presence->getType() == Swift::Presence::Subscribe && presence->getTo().getNode().empty()) {
 // 		Log(presence->getFrom().toString().getUTF8String(), "Subscribe presence received => sending subscribed");
 		Swift::Presence::ref response = Swift::Presence::create();
 		response->setFrom(presence->getTo());

src/usermanager.cpp

➞

Show inline comments

@@ @@ -35,7 +35,7 @@ UserManager::~UserManager(){ @@
+}
 User *UserManager::getUserByJID(const std::string &barejid){
-	if (m_cachedUser && barejid == m_cachedUser->getJID().toBare().toString().getUTF8String()) {
 	if (m_cachedUser && barejid == m_cachedUser->getJID().toBare().toString()) {
 		return m_cachedUser;
+	}

src/userregistration.cpp

➞

Show inline comments

 	return true;
+}
-bool UserRegistration::handleGetRequest(const Swift::JID& from, const Swift::JID& to, const Swift::String& id, boost::shared_ptr<Swift::InBandRegistrationPayload> payload) {
+bool UserRegistration::handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr<Swift::InBandRegistrationPayload> payload) {
 	if (CONFIG_STRING(m_config, "service.protocol") == "irc") {
 		Swift::GetResponder<Swift::InBandRegistrationPayload>::sendError(from, id, ErrorPayload::BadRequest, ErrorPayload::Modify);
 		return true;
+	}
-	std::string barejid = from.toBare().toString().getUTF8String();
 	std::string barejid = from.toBare().toString();
 // 	User *user = m_userManager->getUserByJID(barejid);
 	if (!CONFIG_BOOL(m_config,"registration.enable_public_registration")) {
 		std::list<std::string> const &x = CONFIG_LIST(m_config,"service.allowed_servers");
-		if (std::find(x.begin(), x.end(), from.getDomain().getUTF8String()) == x.end()) {
 		if (std::find(x.begin(), x.end(), from.getDomain()) == x.end()) {
 // 			Log("UserRegistration", "This user has no permissions to register an account");
 			Swift::GetResponder<Swift::InBandRegistrationPayload>::sendError(from, id, ErrorPayload::BadRequest, ErrorPayload::Modify);
 			return true;
 	return true;
+}
-bool UserRegistration::handleSetRequest(const Swift::JID& from, const Swift::JID& to, const Swift::String& id, boost::shared_ptr<Swift::InBandRegistrationPayload> payload) {
+bool UserRegistration::handleSetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr<Swift::InBandRegistrationPayload> payload) {
 	if (CONFIG_STRING(m_config, "service.protocol") == "irc") {
 		Swift::GetResponder<Swift::InBandRegistrationPayload>::sendError(from, id, ErrorPayload::BadRequest, ErrorPayload::Modify);
 		return true;
+	}
-	std::string barejid = from.toBare().toString().getUTF8String();
 	std::string barejid = from.toBare().toString();
 // 	AbstractUser *user = m_component->userManager()->getUserByJID(barejid);
 	if (!CONFIG_BOOL(m_config,"registration.enable_public_registration")) {
 		std::list<std::string> const &x = CONFIG_LIST(m_config,"service.allowed_servers");
-		if (std::find(x.begin(), x.end(), from.getDomain().getUTF8String()) == x.end()) {
 		if (std::find(x.begin(), x.end(), from.getDomain()) == x.end()) {
 // 			Log("UserRegistration", "This user has no permissions to register an account");
 			Swift::SetResponder<Swift::InBandRegistrationPayload>::sendError(from, id, ErrorPayload::BadRequest, ErrorPayload::Modify);
 			return true;
 					payload->setUsername(textSingle->getValue());
+				}
 				else if (textSingle->getName() == "encoding") {
-					encoding = textSingle->getValue().getUTF8String();
 					encoding = textSingle->getValue();
+				}
 				continue;
+			}
 			ListSingleFormField::ref listSingle = boost::dynamic_pointer_cast<ListSingleFormField>(*it);
 			if (listSingle) {
 				if (listSingle->getName() == "language") {
-					language = listSingle->getValue().getUTF8String();
 					language = listSingle->getValue();
+				}
 				continue;
+			}
+	}
 	// Register or change password
 	if (payload->getUsername()->isEmpty() ||
 		(payload->getPassword()->isEmpty() && CONFIG_STRING(m_config, "service.protocol") != "twitter" && CONFIG_STRING(m_config, "service.protocol") != "bonjour")
 	if (payload->getUsername()->empty() ||
 		(payload->getPassword()->empty() && CONFIG_STRING(m_config, "service.protocol") != "twitter" && CONFIG_STRING(m_config, "service.protocol") != "bonjour")
 // 		|| localization.getLanguages().find(language) == localization.getLanguages().end()
+	)
+	{
 		// User tries to register someone who's already registered.
 		UserInfo user_row;
-		bool registered = m_storageBackend->getUser(Swift::JID(*payload->getUsername()).toBare().toString().getUTF8String(), user_row);
 		bool registered = m_storageBackend->getUser(Swift::JID(*payload->getUsername()).toBare().toString(), user_row);
 		if (registered) {
 			Swift::SetResponder<Swift::InBandRegistrationPayload>::sendError(from, id, ErrorPayload::NotAcceptable, ErrorPayload::Modify);
 			return true;
+		}
+	}
-	std::string username = payload->getUsername()->getUTF8String();
+	std::string username = *payload->getUsername();
 // 	m_component->protocol()->prepareUsername(username);
 	std::string newUsername(username);
 	if (!registered) {
 		res.jid = barejid;
 		res.uin = username;
-		res.password = payload->getPassword()->getUTF8String();
+		res.password = *payload->getPassword();
 		res.language = language;
 		res.encoding = encoding;
 		res.vip = 0;
 		// change passwordhttp://soumar.jabbim.cz/phpmyadmin/index.php
 // 		Log("UserRegistration", "changing user password: "<< barejid << ", " << username);
 		res.jid = barejid;
-		res.password = payload->getPassword()->getUTF8String();
+		res.password = *payload->getPassword();
 		res.language = language;
 		res.encoding = encoding;
 		m_storageBackend->setUser(res);

0 comments (0 inline, 0 general)