register event now also generates fixed Jabber ID

[mirrors/Kyberia-bloodline.git] / wwwroot / inc / eventz / register.inc

diff --git a/wwwroot/inc/eventz/register.inc b/wwwroot/inc/eventz/register.inc
index 98234878ae17129a1f8b523b08efd08f1c8a2ed4..48f225a371b598c27adf7abedb67792a5dbe9ad7 100644 (file)
--- 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'])));\r
     $email   = mysql_real_escape_string(strip_tags(trim($_POST['reg_email'])));\r
     $login   = mysql_real_escape_string(strip_tags(trim($_POST['reg_login'])));\r
+    $xmpp    = mysql_real_escape_string(strtolower(strip_tags(trim($_POST['reg_login']))));\r
     $pass    = mysql_real_escape_string($_POST['reg_pass']);\r
     $pass2   = mysql_real_escape_string($_POST['reg_pass2']);\r
     \r
@@ -34,14 +35,14 @@ function register() {
     }\r
 \r
     $set = $db->query(sprintf('select login from users where \r
-                               login = "%s" or email = "%s"', $login, $email));\r
+                               login = "%s" or email = "%s" or xmpp = "%s"', $login, $email, $xmpp));\r
     if ($set->getNumRows() > 0) {\r
-        $error = sprintf('No-no, user with this email is already registered');\r
+        $error = sprintf('No-no, user with this nick/email is already registered');\r
         return false;\r
     }\r
 \r
-    // registration clause  // XXX hard coded\r
-    $qr_rc = $db->query('select node_content from nodes where node_id = 791946');\r
+    // registration clause  // XXX hard coded, registration text\r
+    $qr_rc = $db->query('select node_content from nodes where node_id = '.REGISTRATION_TEXT_NODE);\r
     $qr_rc->next();\r
 \r
     $params['node_content'] = sprintf('<i>%s</i><br />%s<br />\r
@@ -50,7 +51,7 @@ function register() {
                                       $content,\r
                                       $email);\r
     // XXX hard-coded\r
-    $params['node_parent']  = 1836516; // registrations_noverified forum\r
+    $params['node_parent']  = UNVERIFIED_REGISTRATIONS_NODE; // registrations_noverified forum\r
     $params['node_name'] = 'request for access';\r
     $params['flag'] = 'registration';\r
     $user_id = nodes::addNode($params);\r
@@ -61,12 +62,12 @@ function register() {
     $vercode = substr( md5( uniqid( rand() ) ), rand(0, 7), 23);\r
     $q = sprintf('insert into users set password = "%s", user_id = %d,\r
                   header_id = 2091520, login = "%s", email = "%s",\r
-                  hash = "%s"',\r
-                 $pass, $user_id, $login, $email, $vercode);\r
+                  hash = "%s", xmpp="%s"',\r
+                 $pass, $user_id, $login, $email, $vercode, $xmpp);\r
     $db->query($q); // XXX rewrite\r
     $emailtext = sprintf(\r
 'Vitaj %s! Prave som sa s radostou dozvedel, ze si vyplnil(a)\r
-registracny formular na stranke kyberia.sk a chces sa stat\r
+registracny formular na stranke '.SYSTEM_URL.' a chces sa stat\r
 clenom tejto komunity.\r
 Budem sa snazit urobit tento pokec trosku dlhsi,\r
 lebo v povodnej kratkej forme ho pohlcuju spamfiltre, takze\r
@@ -74,11 +75,11 @@ ospravedln nasledujuce blabla a moj typicky atypicky zmysel
 pre cierny humor, kedze sluzi ku dobrej veci :)\r
 Pri registracii ti bol prideleny verifikacny kod.\r
 Ten kod znie "%s" [bez uvodzoviek].\r
-Ten musis zadat na adresu https://kyberia.sk/id/1976899/, kde \r
+Ten musis zadat na adresu '.SYSTEM_URL.'/id/1976899/, kde \r
 vyplnis formular s tvojim nickom a verifkacnym kodom.\r
 Od tej chvile bude tvoja ziadost volne pristupna\r
 uz zaregistrovanym clenom, ktori o nej budu hlasovat.\r
-Pocet hlasov aby sa ziadosti vyhovelo je 5.\r
+Pocet hlasov aby sa ziadosti vyhovelo je x.\r
 Deadline na nazbieranie je 1 tyzden.\r
 Takze fakticky dufam ze si o sebe napisal(a) nieco inteligentne :)\r
 \r