1875.patch

Botanic, 03/01/2012 09:02 am

Download (6.9 kB)

b/code/ryzom/tools/server/www/login/r2_login.php Thu Mar 01 00:01:27 2012 -0800
6 6
	// For error handling, buffer all output
7 7
	ob_start('ob_callback_r2login');
8 8

9
	include_once('accountfunc.php');
9 10
	include_once('config.php');
10 11
	include_once('login_translations.php');
11 12
	include_once('../tools/nel_message.php');
12 13
	include_once('../tools/domain_info.php');
13 14
	include_once('login_service_itf.php');
14 15
	include_once('../ring/join_shard.php');
16
	
15 17

16 18

17
	// see errorMsg
18
	function errorMsgBlock($errNum=GENERIC_ERROR_NUM) // $mixedArgs
19
	{
20
		$args = func_get_args();
21
		return '0:'.call_user_func_array('errorMsg', $args);
22
	}
19

23 20

24 21
	class LoginCb extends CLoginServiceWeb
25 22
	{
......
137 134

138 135
	if (!isset($_GET['cmd']))
139 136
	{
140
		die (errorMsgBlock(3002));
137
		header( 'Location: register.php' ) ;
141 138
	}
142 139

143 140
	// check for 'clear password' tag
......
181 178
				$ringDb = mysql_connect($DBHost, $RingDBUserName, $RingDBPassword) or die(errorMsgBlock(3004, 'Ring', $DBHost, $RingDBUserName));
182 179
				mysql_select_db ($domainInfo['ring_db_name'], $ringDb) or die(errorMsgBlock(3005, 'Ring', $domainInfo['ring_db_name'], $DBHost, $RingDBUserName));
183 180
				$query = "SELECT user_id FROM ring_users where user_id = '".$id."'";
184
				$result = mysql_query ($query) or die(errorMsgBlock(3006, $query, 'Ring', $domainInfo['ring_db_name'], $DBHost, $RingDBUserName, mysql_error()));
181
				$result = mysql_query ($query) or die(errorMsgBlock(2004, $query, 'Ring', $domainInfo['ring_db_name'], $DBHost, $RingDBUserName, mysql_error()));
185 182

186 183
				if (mysql_num_rows($result) == 0)
187 184
				{
188 185
					// no ring user record, build one
189 186
					$query = "INSERT INTO ring_users SET user_id = '".$id."', user_name = '".$_GET["login"]."', user_type='ut_pioneer'";
190
					$result = mysql_query ($query) or die(errorMsgBlock(3006, $query, 'Ring', $domainInfo['ring_db_name'], $DBHost, $RingDBUserName, mysql_error()));
187
					$result = mysql_query ($query) or die(errorMsgBlock(2004, $query, 'Ring', $domainInfo['ring_db_name'], $DBHost, $RingDBUserName, mysql_error()));
191 188
				}
192 189

193 190
//				// check that there is a character record (deprecated)
......
297 294

298 295
		// now, retrieve the user infos
299 296
		$query = "SELECT * FROM user where Login='$login'";
300
		$result = mysql_query ($query) or die (errorMsgBlock(3006, $query, 'main', $DBName, $DBHost, $DBUserName, mysql_error()));
297
		$result = mysql_query ($query) or die (errorMsgBlock(2004, $query, 'main', $DBName, $DBHost, $DBUserName, mysql_error()));
301 298

302 299
		if (mysql_num_rows ($result) == 0)
303 300
		{
......
309 306

310 307
				// get the user to have his UId
311 308
				$query = "SELECT * FROM user WHERE Login='$login'";
312
				$result = mysql_query ($query) or die (errorMsgBlock(3006, $query, 'main', $DBName, $DBHost, $DBUserName, mysql_error()));
309
				$result = mysql_query ($query) or die (errorMsgBlock(2004, $query, 'main', $DBName, $DBHost, $DBUserName, mysql_error()));
313 310

314 311
				if (mysql_num_rows ($result) == 1)
315 312
				{
......
378 375
				// check if the user can use this application
379 376

380 377
				$query = "SELECT * FROM permission WHERE UId='".$row["UId"]."' AND ClientApplication='$clientApplication'";
381
				$result = mysql_query ($query) or die (errorMsgBlock(3006, $query, 'main', $DBName, $DBHost, $DBUserName, mysql_error()));
378
				$result = mysql_query ($query) or die (errorMsgBlock(2004, $query, 'main', $DBName, $DBHost, $DBUserName, mysql_error()));
382 379
				if (mysql_num_rows ($result) == 0)
383 380
				{
384 381
					if ($AcceptUnknownUser)
......
478 475
		mysql_select_db ($DBName) or die (errorMsgBlock(3005, 'main', $DBName, $DBHost, $DBUserName));
479 476

480 477
		$query = "SELECT Password FROM user WHERE Login='$login'";
481
		$result = mysql_query ($query) or die (errorMsgBlock(3006, $query, 'main', $DBName, $DBHost, $DBUserName, mysql_error()));
478
		$result = mysql_query ($query) or die (errorMsgBlock(2004, $query, 'main', $DBName, $DBHost, $DBUserName, mysql_error()));
482 479

483 480
		if (mysql_num_rows ($result) != 1)
484 481
		{
......
492 489
			{
493 490
				// Check if this is not an unconfirmed account
494 491
				$query = "SELECT GamePassword, Language FROM signup_data WHERE login='$login'";
495
				$result = mysql_query($query) or die (errorMsgBlock(3006, $query, 'main', $DBName, $DBHost, $DBUserName, mysql_error()));
492
				$result = mysql_query($query) or die (errorMsgBlock(2004, $query, 'main', $DBName, $DBHost, $DBUserName, mysql_error()));
496 493

497 494
				if (mysql_num_rows($result) == 0)
498 495
				{
b/code/ryzom/tools/server/www/login/style.css Thu Mar 01 00:01:27 2012 -0800
1
BODY {
2
	font-family: Arial, sans-serif;
3
	color: black;
4
	background-color: black;
5
	background-repeat: no-repeat;
6
	background-position: top center;
7
	font-size : 12px;
8
	
9
}
10
UL {
11

12
	margin : 0px;
13
}
14
OL {
15

16
	margin : 0px;
17
}
18
TD {
19
	color : black;
20
	font-size :12px;
21
	font-family: Arial, sans-serif;
22
	
23

24
}
25
#main {
26
	width: 710px;
27
	margin-left: auto;
28
	margin-right: auto;
29
	text-align : left;
30
}
31

32

33
#top {
34
	background-repeat: no-repeat;
35
	height : 35px;
36
	text-align : center;
37
	background-color: #0c292e;
38
	color: white;
39
}
40

41
#top_title {
42
	padding-top: 5px;
43

44
}
45

46
#middle {
47
	background-repeat: repeat-y;
48
	background-color: #d8ccb6;
49
	padding-left : 35px;
50
	padding-right : 20px;
51

52
	color : black;
53
}
54

55

56

57

58
#bottom {
59
	background-repeat: no-repeat;
60
	height : 35px;
61
	text-align : left;
62
	background-color: #0c292e;
63
	padding-left : 20px;
64
	padding-right : 10px;
65
	color: white;
66
}
67

68
#bottom a {
69
	color : gray;
70
	text-decoration : none;
71
}
72

73
#bottom table {
74
	margin : 0;
75
	padding : 0;
76
}
77

78
#bottomBlock {
79
	padding-top : 10px;
80
}
81

82
H1 {
83
	font-size : 110%;
84
	font-weight : bold;
85
	text-align : center;
86
	margin:0;	
87
	padding-top : 5px;
88
	padding-bottom : 5px;
89
	
90
}
91

92
H2 {
93
	font-size : 110%;
94
	font-weight : bold;
95
	color : black;
96
	margin : 0;
97
	border-bottom : solid 1px #aca393;
98
	padding-top : 5px;
99
}
100

101

102
form {
103
	margin : 0;
104
}
105

106
.infos {
107

108
}
109

110
/* PROFILE */
111
a {
112
	color :  #124e70;
113
	text-decoration : none;
114
}
115
a:hover {
116
	color :  #124e70;
117
	text-decoration : underline;
118
}
119

120
table.proftable {
121
/*	margin-top : 10px;*/
122
}
123
.proftitle {	
124
	border-bottom : solid 2px #aca393;
125
	font-weight : bold;
126
}
127

128

129
.profregu {
130
	font-size : 130%;
131
	color: red;
132
	font-weight : bold;
133
}
134

135
input.regulbutton {
136
	width: 650px;
137
}