Removed everything from 'web' directory except genofiles and renamed the directory to 'genotype_files'

5 files changed, 0 insertions, 281 deletions

diff --git a/web/webqtl/user/__init__.py b/web/webqtl/user/__init__.py
deleted file mode 100755
index e69de29b..00000000
--- a/web/webqtl/user/__init__.py
+++ /dev/null
diff --git a/web/webqtl/user/userLogin.py b/web/webqtl/user/userLogin.py
deleted file mode 100755
index 145af03e..00000000
--- a/web/webqtl/user/userLogin.py
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright (C) University of Tennessee Health Science Center, Memphis, TN.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Affero General Public License
-# as published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the GNU Affero General Public License for more details.
-#
-# This program is available from Source Forge: at GeneNetwork Project
-# (sourceforge.net/projects/genenetwork/).
-#
-# Contact Drs. Robert W. Williams and Xiaodong Zhou (2010)
-# at rwilliams@uthsc.edu and xzhou15@uthsc.edu
-#
-#
-#
-# This module is used by GeneNetwork project (www.genenetwork.org)
-#
-# Created by GeneNetwork Core Team 2010/08/10
-#
-# Last updated by GeneNetwork Core Team 2010/10/20
-
-#Xiaodong changed the independancy structure
-
-from htmlgen import HTMLgen2 as HT
-import os
-
-from base.templatePage import templatePage
-from base import webqtlConfig
-from utility import webqtlUtil
-from search import IndexPage
-from base.myCookie import myCookie
-
-class userLogin(templatePage):
-
-	def __init__(self, fd):	
-
-		templatePage.__init__(self, fd)
-
-		if not self.updMysql():
-			return
-
-		try:	
-			user = fd.formdata.getvalue('user').strip()
-			password = fd.formdata.getvalue('password').strip()
-		except:
-			user = password = ''
-
-		if user and password:
-			try:
-				if user == password:
-					raise 'identError'
-				privilege, id, account_name, encrypt_password, grpName = webqtlUtil.authUser(user, password, self.cursor)
-
-				if encrypt_password:
-					self.session_data_changed['user'] = user
-					self.session_data_changed['privilege'] = privilege
-
-					self.cursor.execute("""update User set user_ip=%s,lastlogin=Now() where name=%s""",(fd.remote_ip,user))
-
-					myPage = IndexPage.IndexPage(fd)
-					self.dict['title'] = myPage.dict['title']
-					self.dict['body'] = myPage.dict['body']
-					self.dict['js1'] = myPage.dict['js1']
-					self.dict['js2'] = myPage.dict['js2']
-					return
-				else:
-					result = HT.Blockquote(HT.Font('Error: ',color='red'),HT.Font('You entered wrong user name or password. Please try it again.',color='black'))
-			except 'identError':
-				result = HT.Blockquote(HT.Font('Error: ',color='red'),HT.Font('User name and password are the same, modify you password before login.',color='black'))
-			except:
-				result = HT.Blockquote(HT.Font('Error: ',color='red'),HT.Font('User database is not ready yet. Try again later.',color='black'))
-		else:
-			result = HT.Blockquote(HT.Font('Error: ',color='red'),HT.Font('No user name or password was entered, Please try it again.',color='black'))
-		
-		result.__setattr__("class","subtitle")
-		self.dict['title'] = 'User Login Result'
-		self.dict['body'] = HT.TD(result,colspan=2,height=200,width="100%",bgColor='#eeeeee')
-		LOGOUT = HT.Href(text = "Logout",Class="small", target="_blank",url=os.path.join(webqtlConfig.CGIDIR, webqtlConfig.SCRIPTFILE) + "?FormID=userLogoff")
-		self.dict['login'] = LOGOUT
diff --git a/web/webqtl/user/userLogoff.py b/web/webqtl/user/userLogoff.py
deleted file mode 100755
index 203ac69c..00000000
--- a/web/webqtl/user/userLogoff.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright (C) University of Tennessee Health Science Center, Memphis, TN.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Affero General Public License
-# as published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the GNU Affero General Public License for more details.
-#
-# This program is available from Source Forge: at GeneNetwork Project
-# (sourceforge.net/projects/genenetwork/).
-#
-# Contact Drs. Robert W. Williams and Xiaodong Zhou (2010)
-# at rwilliams@uthsc.edu and xzhou15@uthsc.edu
-#
-#
-#
-# This module is used by GeneNetwork project (www.genenetwork.org)
-#
-# Created by GeneNetwork Core Team 2010/08/10
-#
-# Last updated by GeneNetwork Core Team 2010/10/20
-
-#Xiaodong changed the independancy structure
-
-from htmlgen import HTMLgen2 as HT
-
-from base.templatePage import templatePage
-from base.myCookie import myCookie
-
-#########################################
-#      User Logoff Page
-#########################################
-
-class userLogoff(templatePage):
-	def __init__(self, fd):	
-
-		templatePage.__init__(self, fd)
-
-		self.session_data_changed['user'] = 'Guest'
-		self.session_data_changed['privilege'] = 'guest'
-
-		#self.cookie.append(myCookie('user',' ',0))
-		#self.cookie.append(myCookie('password',' ',0))
-		result = HT.Blockquote(HT.Font('Logout Result: ',color='green'),HT.Font('You have been succesfully logged out. ',color='black'))
-		result.__setattr__("class","subtitle")
-		self.dict['title'] = 'User Logoff Result'
-		self.dict['body'] = HT.TD(result,colspan=2,height=200,width="100%",bgColor='#eeeeee')
-		LOGIN = HT.Href(text = "Login",Class="small", target="_blank",url="account.html")
-		self.dict['login'] = LOGIN
-			
diff --git a/web/webqtl/user/userPasswd.py b/web/webqtl/user/userPasswd.py
deleted file mode 100755
index 58c9bbc9..00000000
--- a/web/webqtl/user/userPasswd.py
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright (C) University of Tennessee Health Science Center, Memphis, TN.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Affero General Public License
-# as published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the GNU Affero General Public License for more details.
-#
-# This program is available from Source Forge: at GeneNetwork Project
-# (sourceforge.net/projects/genenetwork/).
-#
-# Contact Drs. Robert W. Williams and Xiaodong Zhou (2010)
-# at rwilliams@uthsc.edu and xzhou15@uthsc.edu
-#
-#
-#
-# This module is used by GeneNetwork project (www.genenetwork.org)
-#
-# Created by GeneNetwork Core Team 2010/08/10
-#
-# Last updated by GeneNetwork Core Team 2010/10/20
-
-#Xiaodong changed the independancy structure
-
-from htmlgen import HTMLgen2 as HT
-
-from base.templatePage import templatePage
-from utility import webqtlUtil
-
-
-#########################################
-#      User Password Page
-#########################################
-
-class userPasswd(templatePage):
-	def __init__(self, fd):	
-
-		templatePage.__init__(self, fd)
-
-		if not self.updMysql():
-			return
-
-		try:	
-			user = fd.formdata.getvalue('user')
-			password = fd.formdata.getvalue('password')
-			newpassword = fd.formdata.getvalue('newpassword')
-			retypepassword = fd.formdata.getvalue('retypepassword')
-		except:
-			user = ''
-		
-		if newpassword != retypepassword:
-			result = HT.Blockquote(HT.Font('Error: ',color='red'),HT.Font('The new passwords you just entered are inconsistent. Please try it again',color='black'))
-		elif user and password and newpassword:
-			try:
-				encrypt_password = webqtlUtil.authUser(user,password,self.cursor)[3]
-				if encrypt_password:
-					self.cursor.execute("""update User set password=SHA(%s) where name=%s""",(newpassword,user))
-					result = HT.Blockquote(HT.Font('Change Result: ',color='green'),HT.Font('You have succesfully changed your password. You may continue to use WebQTL.',color='black'))
-				else:
-					result = HT.Blockquote(HT.Font('Error: ',color='red'),HT.Font('You entered wrong user name or password. Please try it again.',color='black'))
-			except:
-				result = HT.Blockquote(HT.Font('Error: ',color='red'),HT.Font('User database is not ready yet. Try again later.',color='black'))
-		else:
-			result = HT.Blockquote(HT.Font('Error: ',color='red'),HT.Font('No user name or password or new password was entered, Please try it again.',color='black'))
-		
-		result.__setattr__("class","subtitle")
-		self.dict['title'] = 'Change Password Result'
-		self.dict['body'] = HT.TD(result,colspan=2,height=200,width="100%",bgColor='#eeeeee')
-
diff --git a/web/webqtl/user/userPasswdPage.py b/web/webqtl/user/userPasswdPage.py
deleted file mode 100755
index 2c9135f1..00000000
--- a/web/webqtl/user/userPasswdPage.py
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright (C) University of Tennessee Health Science Center, Memphis, TN.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Affero General Public License
-# as published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the GNU Affero General Public License for more details.
-#
-# This program is available from Source Forge: at GeneNetwork Project
-# (sourceforge.net/projects/genenetwork/).
-#
-# Contact Drs. Robert W. Williams and Xiaodong Zhou (2010)
-# at rwilliams@uthsc.edu and xzhou15@uthsc.edu
-#
-#
-#
-# This module is used by GeneNetwork project (www.genenetwork.org)
-#
-# Created by GeneNetwork Core Team 2010/08/10
-#
-# Last updated by GeneNetwork Core Team 2010/10/20
-
-#Xiaodong changed the independancy structure
-
-from htmlgen import HTMLgen2 as HT
-
-from base.templatePage import templatePage
-from utility import webqtlUtil
-
-
-#########################################
-#      User Password Page
-#########################################
-
-class userPasswdPage(templatePage):
-	def __init__(self, fd):	
-		templatePage.__init__(self)
-		if not self.updMysql():
-			return
-		try:	
-			user = fd.formdata.getvalue('user')
-			password = fd.formdata.getvalue('password')
-			newpassword = fd.formdata.getvalue('newpassword')
-			retypepassword = fd.formdata.getvalue('retypepassword')
-		except:
-			user = ''
-		
-		if newpassword != retypepassword:
-			result = HT.Blockquote(HT.Font('Error: ',color='red'),HT.Font('The new passwords you just entered are inconsistent. Please try it again',color='black'))
-		elif user and password and newpassword:
-			try:
-				encrypt_password = webqtlUtil.authUser(user,password,self.cursor)[3]
-				if encrypt_password:
-					self.cursor.execute("""update User set password=SHA(%s) where name=%s""",(newpassword,user))
-					result = HT.Blockquote(HT.Font('Change Result: ',color='green'),HT.Font('You have succesfully changed your password. You may continue to use WebQTL.',color='black'))
-				else:
-					result = HT.Blockquote(HT.Font('Error: ',color='red'),HT.Font('You entered wrong user name or password. Please try it again.',color='black'))
-			except:
-				result = HT.Blockquote(HT.Font('Error: ',color='red'),HT.Font('User database is not ready yet. Try again later.',color='black'))
-		else:
-			result = HT.Blockquote(HT.Font('Error: ',color='red'),HT.Font('No user name or password or new password was entered, Please try it again.',color='black'))
-		
-		result.__setattr__("class","subtitle")
-		self.dict['title'] = 'Change Password Result'
-		self.dict['body'] = HT.TD(result,colspan=2,height=200,width="100%",bgColor='#eeeeee')
-