h-client:implemented login - requested svn version of h-source

1 files changed, 24 insertions, 16 deletions

diff --git a/h-client/hlibrary.py b/h-client/hlibrary.py
index 3205fbd..79679b7 100644
--- a/h-client/hlibrary.py
+++ b/h-client/hlibrary.py
@@ -373,7 +373,7 @@ class Client:
 			}
 	}
 
-	def __init__(self,url = 'http://www.h-node.com'):
+	def __init__(self,url = ''):
 		self.request = Mycurl(url)
 
 	def getNode(self):
@@ -430,27 +430,35 @@ class Client:
 
 	#get info about the user logged
 	def getUserInfo(self):
-		self.request.perform('users/info/en')
-		xmldoc = minidom.parseString(self.request.contents)
-		status = xmldoc.getElementsByTagName("status")[0].childNodes[0].data
-		
-		username = ''
-		token = ''
-		groups = ''
-		
-		if status == 'logged':
-			username = xmldoc.getElementsByTagName("username")[0].childNodes[0].data
-			token = xmldoc.getElementsByTagName("token")[0].childNodes[0].data
-			groups = xmldoc.getElementsByTagName("groups")[0].childNodes[0].data
+		result = self.request.perform('users/info/en')
+
+		if result:
+			xmldoc = minidom.parseString(self.request.contents)
+			status = xmldoc.getElementsByTagName("status")[0].childNodes[0].data
+
+			username = ''
+			token = ''
+			groups = ''
+
+			if status == 'logged':
+				username = xmldoc.getElementsByTagName("username")[0].childNodes[0].data
+				token = xmldoc.getElementsByTagName("token")[0].childNodes[0].data
+				groups = xmldoc.getElementsByTagName("groups")[0].childNodes[0].data
+
+			return {'status':status,'username':username,'token':token,'groups':groups}
 			
-		return {'status':status,'username':username,'token':token,'groups':groups}
+		else:
+			self._status = False
+			self.errors.append("unable to connect to server")
+			return False
 
 	#return True if the user is logged, else return False
 	def isLogged(self):
 		info = self.getUserInfo()
 
-		if info['status'] == 'logged':
-			return True
+		if info != False:
+			if info['status'] == 'logged':
+				return True
 		
 		return False