Changeset 17511 for extensions/UserAdvManager/branches/2.30/include/functions.inc.php

Timestamp:

Aug 9, 2012, 10:18:14 PM (12 years ago)

Author:

Eric

Message:

r17510 merged from trunk to branch 2.30

File:

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

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

@@ -25 +25 @@
 
   return $menu;
+}
+
+
+/**
+ * Triggered on loc_begin_admin_page
+ * 
+ * Check options compatibility
+ */
+function UAM_check_compat()
+{
+  global $conf, $page;
+ 
+  // Check mandatory email address for email exclusion
+  $conf_UAM = unserialize($conf['UserAdvManager']);
+  if (!$conf['obligatory_user_mail_address'] and $conf_UAM[10] = 'true')
+  {
+    array_push($page['warnings'], l10n('UAM_mail_exclusion_error'));
+  }
 }
 
@@ -2399 +2417 @@
     ON u.'.$conf['user_fields']['id'].' = ug.user_id
 WHERE u.'.$conf['user_fields']['id'].' >= 3
+  AND u.username NOT LIKE "16"
+  AND u.username NOT LIKE "18"
 ORDER BY ug.lastvisit DESC
 ;';