Changeset 17805 for extensions/UserAdvManager/branches/2.40/include

Timestamp:

Sep 7, 2012, 10:59:51 PM (12 years ago)

Author:

Eric

Message:

r17804 merged from trunk to branch 2.40

File:

• extensions/UserAdvManager/branches/2.40/include/functions.inc.php (modified) (3 diffs)

extensions/UserAdvManager/branches/2.40/include/functions.inc.php

@@ -49 +49 @@
  * Triggered on loc_begin_index
  * 
- * Initiating GhostTracker
+ * Initiating GhostTracker - Perform user logout after registration if not validated
  */
 function UAM_GhostTracker()
 {
   global $conf, $user;
+
+  include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
 
   $conf_UAM = unserialize($conf['UserAdvManager']);
@@ -99 +101 @@
       }
     }
+  }
+
+  // Perform user logout after registration if not validated
+  if ((isset($conf_UAM[39]) and $conf_UAM[39] == 'true') and !UAM_UsrReg_Verif($user['id']))
+  {
+    invalidate_user_cache();
+    logout_user();
+    redirect(UAM_PATH.'rejected.php');
   }
 }
@@ -1526 +1536 @@
     // -------------------------------------------------------
     $patterns[] = '#\[username\]#i';
-    $replacements[] = $username;
+    $replacements[] = $result['username'];
     $patterns[] = '#\[mygallery\]#i';
     $replacements[] = $conf['gallery_title'];