v4.0.4-32

E-F-A · Mar 12, 2022 · 5e86055 · 5e86055
1 parent 129b273
commit 5e86055
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/rpmbuild/SOURCES/eFa-4.0.4/eFa/eFa-learn.php b/rpmbuild/SOURCES/eFa-4.0.4/eFa/eFa-learn.php
@@ -52,7 +52,7 @@
         if (file_exists('/etc/sysconfig/eFa_trusted_networks')) {
             $file = fopen('/etc/sysconfig/eFa_trusted_networks', 'r');
             if ($file) {
-                while (($line = fgets($fp, 80)) !== false) {
+                while (($line = fgets($file, 80)) !== false) {
                     $line = rtrim($line);
                     if (preg_match('/[^:]/', $line)) { # assume ipv4 if it does not contain a colon
                         if(!ipv4_in_range($remote_ip, $line)) {

diff --git a/rpmbuild/SOURCES/eFa-4.0.4/eFa/lib-eFa-Configure/func_trustednetworks b/rpmbuild/SOURCES/eFa-4.0.4/eFa/lib-eFa-Configure/func_trustednetworks
@@ -11,8 +11,7 @@ function func_ask-trustednets() {
       echo -e ""
       echo -e "$green[eFa]$clean Trusted networks are networks from which you want to accept"
       echo -e "$green[eFa]$clean spam submissions via the \"Click here to report this message as spam\""
-      echo -e "$green[eFa]$clean link. All other networks will receive a message indicating that"
-      echo -e "$green[eFa]$clean submission is being attempted from an untrusted network."
+      echo -e "$green[eFa]$clean link. All other networks will be redirected to the login page"
       echo -e ""
 
       local RULES
@@ -45,6 +44,7 @@ function func_ask-trustednets() {
                 if [[ $choice > "0" && $choice < $((rLen+1)) ]]; then
                   ENTIP=${RULES[$((choice*2-2))]}
                   echo -e "Entry Selected: $ENTIP" 
+                  ENTIP=$(echo $ENTIP | sed -e 's|/|\\/|')
                   local flag=0
                   local ISIP4=0
                   local ISIP6=0

diff --git a/rpmbuild/SPECS/eFa4.spec b/rpmbuild/SPECS/eFa4.spec
@@ -26,7 +26,7 @@
 Name:      eFa
 Summary:   eFa Maintenance rpm
 Version:   4.0.4
-Release:   31.eFa%{?dist}
+Release:   32.eFa%{?dist}
 Epoch:     1
 Group:     Applications/System
 URL:       https://efa-project.org
@@ -545,6 +545,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644, root, root) %{_sysconfdir}/logrotate.d/eFa-logrotate
 
 %changelog
+* Sat Mar 12 2022 eFa Project <[email protected]> - 4.0.4-32
+- More Fixes trusted networks dialog 
+
 * Sat Mar 12 2022 eFa Project <[email protected]> - 4.0.4-31
 - Fix trusted networks dialog