Changeset 17892 for extensions/UserAdvManager/trunk/include/functions.inc.php

Timestamp:

Sep 13, 2012, 7:10:29 PM (12 years ago)

Author:

Eric

Message:

Connection rejection seems to work on user registration when $confguest_access = false;

More tests have to be performed before validation of this trick.

File:

• extensions/UserAdvManager/trunk/include/functions.inc.php (modified) (2 diffs)

extensions/UserAdvManager/trunk/include/functions.inc.php

@@ -105 +105 @@
 
   // Perform user logout after registration if not validated
-  if ((isset($conf_UAM[39]) and $conf_UAM[39] == 'true') and !UAM_UsrReg_Verif($user['id']) and !is_admin() and is_webmaster())
+  if ((isset($conf_UAM[39]) and $conf_UAM[39] == 'true') and !UAM_UsrReg_Verif($user['id']) and !is_admin() and !is_webmaster())
   {
     invalidate_user_cache();
@@ -456 +456 @@
     }
   }
-  elseif ((isset($conf_UAM[39]) and $conf_UAM[39] == 'true') and UAM_UsrReg_Verif($user['id']) == false and is_admin()==false and is_webmaster() == false)
+  elseif ((isset($conf_UAM[39]) and $conf_UAM[39] == 'true') and !UAM_UsrReg_Verif($user['id']) and !is_admin() and !is_webmaster())
   {
     // Logged-in user cleanup, session destruction and redirected to custom page
     // -------------------------------------------------------------------------
-    if (UAM_UsrReg_Verif($user['id']))
-    {
-      $var2 = "UAM_UsrReg_Verif = True";
-    }
-    else
-    {
-      $var2 = "UAM_UsrReg_Verif = False";
-    }
-    
-    if (is_admin())
-    {
-      $var3 = "is_admin = True";
-    }
-    else
-    {
-      $var3 = "is_admin = False";
-    }
-
-    if (is_webmaster())
-    {
-      $var4 = "is_webmaster = True";
-    }
-    else
-    {
-      $var4 = "is_webmaster = False";
-    }
-    UAMLog($conf_UAM[39],$var2,$var3,$var4);
-    //invalidate_user_cache();
-    //logout_user();
-    //redirect(UAM_PATH.'rejected.php');
+    invalidate_user_cache();
+    logout_user();
+    redirect(UAM_PATH.'rejected.php');
   }
 }