bugfix: fixed create user with OU having null value in fields

bugfix: fixed translit russian ъЪьЬ
bugfix: fixed illegal call dnsmasq script - sended dhcp relay ip as user ip in old requests

docs/devices/system-vendors.csv

@@ -52,3 +52,4 @@
 66;Trassir
 67;Testo
 68;Hw-group
+69;TP-Link

html/admin/users/index.php

@@ -16,13 +16,16 @@ if (isset($_POST["create"])) {
     if (!empty($login)) {
         $lcount = get_count_records($db_link,"User_list","LCase(login)=LCase('$login')");
         if ($lcount > 0) {
-            $msg_error = "WEB_cell_login $login $msg_exists!";
+            $msg_error = WEB_cell_login." ".$login." ".$msg_exists."!";
             unset($_POST);
         } else {
             $new['login'] = $login;
             $new['ou_id'] = $rou;
-            $ou_info = get_record_sql($db,"SELECT * FROM OU WHERE id=".$rou);
+            $ou_info = get_record_sql($db_link,"SELECT * FROM OU WHERE id=".$rou);
 	    if (!empty($ou_info)) {
+		if (empty($ou_info['enabled'])) { $ou_info['enabled'] = 0; }
+		if (empty($ou_info['queue_id'])) { $ou_info['queue_id'] = 0; }
+		if (empty($ou_info['filter_group_id'])) { $ou_info['filter_group_id'] = 0; }
 	        $new['enabled'] = $ou_info['enabled'];
 	        $new['queue_id'] = $ou_info['queue_id'];
 	        $new['filter_group_id'] = $ou_info['filter_group_id'];

scripts/dnsmasq-hook.sh

@@ -2,8 +2,14 @@
 
 time=$(date +%s)
 
+#bug in dnsmasq - send relay ip as user ip
+if [ "x${DNSMASQ_RELAY_ADDRESS}" = "x${3}" ]; then
+    exit
+    fi
+
 CIRCUIT_ID=$(echo ${DNSMASQ_CIRCUIT_ID} | /usr/bin/hexdump -v -e '/1 "%02X"' | sed 's/0A$//i' )
 REMOTE_ID=$(echo ${DNSMASQ_REMOTE_ID} | /usr/bin/hexdump -v -e '/1 "%02X"' | sed 's/0A$//i' )
+#printenv >>/tmp/1
 
 echo "$1;$2;$3;$4;${time};${DNSMASQ_TAGS};${DNSMASQ_SUPPLIED_HOSTNAME};${DNSMASQ_OLD_HOSTNAME};${DNSMASQ_CIRCUIT_ID};${DNSMASQ_REMOTE_ID};${DNSMASQ_CLIENT_ID};${CIRCUIT_ID};${REMOTE_ID}" >>/var/log/dhcp.log &
 

scripts/eyelib/main.pm

@@ -526,9 +526,11 @@ $textline =~ s/Ц/Ts/g;		$textline =~ s/ц/ts/g;
 $textline =~ s/Ч/Ch/g;		$textline =~ s/ч/ch/g;
 $textline =~ s/Ш/Sh/g;		$textline =~ s/ш/sh/g;
 $textline =~ s/Щ/Shch/g;	$textline =~ s/щ/shch/g;
-$textline =~ s/Ь/'/g;		$textline =~ s/ь/'/g;
+#$textline =~ s/Ь/'/g;		$textline =~ s/ь/'/g;
+#$textline =~ s/Ъ/''/g;		$textline =~ s/ъ/''/g;
+$textline =~ s/Ь//g;		$textline =~ s/ь//g;
+$textline =~ s/Ъ//g;		$textline =~ s/ъ//g;
 $textline =~ s/Ы/Y/g;		$textline =~ s/ы/y/g;
-$textline =~ s/Ъ/''/g;		$textline =~ s/ъ/''/g;
 $textline =~ s/Э/E/g;		$textline =~ s/э/e/g;
 $textline =~ s/Ю/Yu/g;		$textline =~ s/ю/yu/g;
 $textline =~ s/Я/Ya/g;		$textline =~ s/я/ya/g;