trim added to new guaranteed users names

[brisk.git] / web / index_wr.php

diff --git a/web/index_wr.php b/web/index_wr.php
index 20f4167..cb5ed92 100644 (file)
--- a/web/index_wr.php
+++ b/web/index_wr.php
@@ -358,13 +358,11 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie)
             if (!isset($post['info'])) {
                 return FALSE;
             }
-
-            if (($ret = $brisk->info_save($user, $post['info'])) == TRUE) {
-                if ($ret == TRUE) {
-                    echo "1";
-                    return TRUE;
-                }
+            if (($ret = $brisk->info_save($user, $post['info'])) == 0) {
+                echo "1";
+                return TRUE;
             }
+
             printf($mlang_indwr['info_err'][$G_lang], $ret);
             return FALSE;
         }
@@ -430,7 +428,7 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie)
                 if (($wa_lock = Warrant::lock_data(TRUE)) != FALSE) {
                     if (($fp = @fopen(LEGAL_PATH."/warrant.txt", 'a')) != FALSE) {
                         /* Unix time | session | nickname | IP | where was | mesg */
-                        fwrite($fp, sprintf("%ld|%s|%s|%s|\n", $curtime, xcapelt($user->name), xcapelt(urldecode($cli_name)), xcapelt(urldecode($cli_email))));
+                        fwrite($fp, sprintf("%ld|%s|%s|%s|\n", $curtime, xcapelt($user->name), xcapelt(trim(urldecode($cli_name))), xcapelt(trim(urldecode($cli_email)))));
                         fclose($fp);
                     }
                     Warrant::unlock_data($wa_lock);
@@ -452,8 +450,8 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie)
                     if (($bdb = BriskDB::create()) == FALSE)
                         break;
 
-                    $cli_name = urldecode($cli_name);
-                    $cli_email = urldecode($cli_email);
+                    $cli_name = trim(urldecode($cli_name));
+                    $cli_email = trim(urldecode($cli_email));
 
                     // check for already used fields
                     if (($idret = $bdb->check_record_by_login_or_email($cli_name, $cli_email)) != 0) {