X-Git-Url: https://mop.ddnsfree.com/gitweb/?p=brisk.git;a=blobdiff_plain;f=web%2Fusermgmt.php;h=57a6ae1cc2f9735613a56aab2ee77313c60406ec;hp=51681d72d2e37a191d0bb9204ce8969b398462c9;hb=0b6452e28c5b16fbbde6191a6db4293905b808e3;hpb=8d0f6233af195d6439d7c57bd715686df4cfcb33

diff --git a/web/usermgmt.php b/web/usermgmt.php
index 51681d7..57a6ae1 100644
--- a/web/usermgmt.php
+++ b/web/usermgmt.php
@@ -84,7 +84,12 @@ function check_auth()
 
     $socket = FALSE;
     $ret = FALSE;
-    $ip = $_SERVER["REMOTE_ADDR"];
+    if (array_key_exists("HTTP_X_REAL_IP", $_SERVER)) {
+        $ip = $_SERVER["HTTP_X_REAL_IP"];
+    }
+    else {
+        $ip = $_SERVER["REMOTE_ADDR"];
+    }
     $stp = 0;
     $private = md5($G_alarm_passwd.$ip.$sess);
     $cmd = array ("cmd" => "userauth", "sess" => $sess, "private" => $private, "the_end" => "true");
@@ -92,7 +97,7 @@ function check_auth()
     $cmd_len = mb_strlen($cmd_ser, "ASCII");
 
     do {
-        if (($socket = stream_socket_client("unix://".USOCK_PATH."2")) == FALSE)
+        if (($socket = stream_socket_client('unix://'.USOCK_PATH_PFX.'_admin.sock')) == FALSE)
             break;
         $stp = 1;
         if (($rwr = fwrite($socket, $cmd_ser, $cmd_len)) == FALSE
@@ -221,9 +226,9 @@ SELECT usr.*, guar.login AS guar_login
                     $subj = $mlang_indwr['nu_msubj'][$G_lang];
                     if (($usr_obj->type & USER_FLAG_TY_APPR) == USER_FLAG_TY_APPR) {
                         $body_txt = sprintf($mlang_indwr['ap_mtext'][$G_lang],
-                                            $cli_name, $confirm_page);
+                                            $usr_obj->login, $confirm_page);
                         $body_htm = sprintf($mlang_indwr['ap_mhtml'][$G_lang],
-                                            $cli_name, $confirm_page);
+                                            $usr_obj->login, $confirm_page);
                     }
                     else {
                         $body_txt = sprintf($mlang_indwr['nu_mtext'][$G_lang],