X-Git-Url: http://git.harvie.cz/?a=blobdiff_plain;f=wwwroot%2Finc%2Feventz%2Fregister.inc;h=48f225a371b598c27adf7abedb67792a5dbe9ad7;hb=945c8fc4e3e7db4ea960e3ed751c113da0e0ad64;hp=c9bcff618979072ffd41ace926cc848789bc0ac6;hpb=1b5b232716e27e0a5ec811e8e09607be711444f7;p=mirrors%2FKyberia-bloodline.git

diff --git a/wwwroot/inc/eventz/register.inc b/wwwroot/inc/eventz/register.inc
index c9bcff6..48f225a 100644
--- a/wwwroot/inc/eventz/register.inc
+++ b/wwwroot/inc/eventz/register.inc
@@ -5,6 +5,7 @@ function register() {
     $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,14 +35,14 @@ 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;
     }
 
     // registration clause  // XXX hard coded, registration text
-    $qr_rc = $db->query('select node_content from nodes where node_id = 791946');
+    $qr_rc = $db->query('select node_content from nodes where node_id = '.REGISTRATION_TEXT_NODE);
     $qr_rc->next();
 
     $params['node_content'] = sprintf('<i>%s</i><br />%s<br />
@@ -50,7 +51,7 @@ function register() {
                                       $content,
                                       $email);
     // XXX hard-coded
-    $params['node_parent']  = 1836516; // registrations_noverified forum
+    $params['node_parent']  = UNVERIFIED_REGISTRATIONS_NODE; // registrations_noverified forum
     $params['node_name'] = 'request for access';
     $params['flag'] = 'registration';
     $user_id = nodes::addNode($params);
@@ -61,8 +62,8 @@ function register() {
     $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);
+                  hash = "%s", xmpp="%s"',
+                 $pass, $user_id, $login, $email, $vercode, $xmpp);
     $db->query($q); // XXX rewrite
     $emailtext = sprintf(
 'Vitaj %s! Prave som sa s radostou dozvedel, ze si vyplnil(a)
@@ -78,7 +79,7 @@ Ten musis zadat na adresu '.SYSTEM_URL.'/id/1976899/, kde
 vyplnis formular s tvojim nickom a verifkacnym kodom.
 Od tej chvile bude tvoja ziadost volne pristupna
 uz zaregistrovanym clenom, ktori o nej budu hlasovat.
-Pocet hlasov aby sa ziadosti vyhovelo je 5.
+Pocet hlasov aby sa ziadosti vyhovelo je x.
 Deadline na nazbieranie je 1 tyzden.
 Takze fakticky dufam ze si o sebe napisal(a) nieco inteligentne :)