X-Git-Url: http://git.harvie.cz/?a=blobdiff_plain;f=wwwroot%2Finc%2Feventz%2Fregister.inc;h=fa9f983df064963549364a72ebeaa9517cb7d43a;hb=398c40e1701842c337237ab4b2ce7f1c7fe055fb;hp=14506f9c1bfd965b3992ec5985fb9144abb01ddc;hpb=8630d2174a0f798739eeea16be61b8653a10a5da;p=mirrors%2FKyberia-bloodline.git

diff --git a/wwwroot/inc/eventz/register.inc b/wwwroot/inc/eventz/register.inc
index 14506f9..fa9f983 100644
--- a/wwwroot/inc/eventz/register.inc
+++ b/wwwroot/inc/eventz/register.inc
@@ -2,9 +2,11 @@
 function register() {
     global $db, $error;
 
+    $guild_id = mysql_real_escape_string(strip_tags(trim($_POST['guild_id'])));
     $content = mysql_real_escape_string(strip_tags(trim($_POST['reg_content'])));
     $email   = mysql_real_escape_string(strip_tags(trim($_POST['reg_email'])));
     $login   = mysql_real_escape_string(strip_tags(trim($_POST['reg_login'])));
+    $xmpp    = mysql_real_escape_string(strtolower(strip_tags(trim($_POST['reg_login']))));
     $pass    = mysql_real_escape_string($_POST['reg_pass']);
     $pass2   = mysql_real_escape_string($_POST['reg_pass2']);
     
@@ -34,9 +36,9 @@ function register() {
     }
 
     $set = $db->query(sprintf('select login from users where 
-				login = "%s" or email = "%s"', $login, $email));
+				login = "%s" or email = "%s" or xmpp = "%s"', $login, $email, $xmpp));
     if ($set->getNumRows() > 0) {
-        $error = sprintf('No-no, user with this email is already registered');
+        $error = sprintf('No-no, user with this nick/email is already registered');
         return false;
     }
 
@@ -54,17 +56,22 @@ function register() {
     $params['node_name'] = 'request for access';
     $params['flag'] = 'registration';
     $user_id = nodes::addNode($params);
+
+	
+	//puttin in the guild node is realized only after email verification
+	//nodes::putNode($user_id,$guild_id);
+
     $q = sprintf('update nodes set node_system_access = "private" where node_id = %d', $user_id);
     $db->update($q);
 
-    $pass = md5($pass);
-    $vercode = substr( md5( uniqid( rand() ) ), rand(0, 7), 23);
-    $q = sprintf('insert into users set password = "%s", user_id = %d,
-                  header_id = 2091520, login = "%s", email = "%s",
-                  hash = "%s"',
-                 $pass, $user_id, $login, $email, $vercode);
-    $db->query($q); // XXX rewrite
-    $emailtext = sprintf(
+	$pass = md5($pass);
+	$vercode = substr( md5( uniqid( rand() ) ), rand(0, 7), 23);
+	$q = sprintf('insert into users set password = "%s", user_id = %d,
+		header_id = 2091520, login = "%s", email = "%s",
+		hash = "%s", xmpp="%s", guild_id="%s"',
+		$pass, $user_id, $login, $email, $vercode, $xmpp, $guild_id);
+	$db->query($q); // XXX rewrite
+	$emailtext = sprintf(
 'Vitaj %s! Prave som sa s radostou dozvedel, ze si vyplnil(a)
 registracny formular na stranke '.SYSTEM_URL.' a chces sa stat
 clenom tejto komunity.