Changeset 17969 for extensions/UserAdvManager

Timestamp:

Sep 17, 2012, 5:38:42 PM (12 years ago)

Author:

flop25

Message:

No more need of rejected.php and tpl (je te laisse les supprimer, si tu valides ce changement)

Location:

extensions/UserAdvManager/trunk

Files:

• admin/UAM_admin.php (modified) (3 diffs)
• include/functions.inc.php (modified) (5 diffs)
• main.inc.php (modified) (1 diff)

extensions/UserAdvManager/trunk/admin/UAM_admin.php

@@ -195 +195 @@
       $_POST['UAM_Username_Char'],
       $_POST['UAM_Username_List'],
-      (isset($_POST['UAM_No_Confirm_Status'])?$_POST['UAM_No_Confirm_Status']:''),
+      (isset($_POST['UAM_No_Confirm_Status'])?$_POST['UAM_No_Confirm_Status']:''),//7
       $_POST['UAM_MailInfo_Text'],
       $_POST['UAM_ConfirmMail_Text'],
@@ -214 +214 @@
       $_POST['UAM_GTAutoMailText'],
       (isset($_POST['UAM_Downgrade_Group'])?$_POST['UAM_Downgrade_Group']:''),
-      (isset($_POST['UAM_Downgrade_Status'])?$_POST['UAM_Downgrade_Status']:''),
+      (isset($_POST['UAM_Downgrade_Status'])?$_POST['UAM_Downgrade_Status']:''),//26
       $_POST['UAM_AdminValidationMail_Text'],
       $_POST['UAM_CustomPasswRetr'],
@@ -340 +340 @@
 
   $conf_UAM = unserialize($conf['UserAdvManager']);
+  //print_r ($conf_UAM) ;
 
   // Group setting for unvalidated, validated users and downgrade group

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

@@ -59 +59 @@
 
   $conf_UAM = unserialize($conf['UserAdvManager']);
+  
 
   // Admins, Guests and Adult_Content users are not tracked for Ghost Tracker or Users Tracker
@@ -108 +109 @@
       invalidate_user_cache();
       logout_user();
-      redirect(UAM_PATH.'rejected.php');
+      if ( $conf['guest_access'] )
+      {
+        redirect( make_index_url().'?UAM_msg=rejected', 0);
+      }
+      else
+      {
+        redirect( get_root_url().'identification.php?UAM_msg=rejected' , 0);
+      }
     }
   }
@@ -472 +480 @@
     invalidate_user_cache();
     logout_user();
-    redirect(UAM_PATH.'rejected.php');
+    if ( $conf['guest_access'] )
+    {
+      redirect( make_index_url().'?UAM_msg=rejected', 0);
+    }
+    else
+    {
+      redirect( get_root_url().'identification.php?UAM_msg=rejected' , 0);
+    }
   }
 }
@@ -875 +890 @@
 }
 
+/**
+ * Triggered on init
+ * 
+ * Display a message according to $_GET['UAM_msg']
+ */
+function UAM_DisplayMsg()
+{
+  if( isset($_GET['UAM_msg']))
+  {
+    global $user, $lang, $conf, $page;
+    $conf_UAM = unserialize($conf['UserAdvManager']);
+    
+    if (isset($conf_UAM[40]) and $conf_UAM[40] <> '' and $_GET['UAM_msg']="rejected")
+    {
+      // Management of Extension flags ([mygallery], [myurl])
+      // ---------------------------------------------------
+      $patterns[] = '#\[mygallery\]#i';
+      $replacements[] = $conf['gallery_title'];
+      $patterns[] = '#\[myurl\]#i';
+      $replacements[] = get_gallery_home_url();
+    
+      if (function_exists('get_user_language_desc'))
+      {
+        $custom_text = get_user_language_desc(preg_replace($patterns, $replacements, $conf_UAM[40]));
+      }
+      else $custom_text = l10n(preg_replace($patterns, $replacements, $conf_UAM[40]));
+      $page["errors"][]=$custom_text;
+    }
+  }
+}
 
 /**
@@ -3240 +3285 @@
    fclose($fo) ;
 }
+
 ?>

extensions/UserAdvManager/trunk/main.inc.php

@@ -66 +66 @@
 add_event_handler('init', 'UAM_InitPage');
 
+// Display messages about Login rejected, etc
+// ---------------------------
+add_event_handler('init','UAM_DisplayMsg');
+add_event_handler('identification','UAM_DisplayMsg');
 // PWG_Stuffs module
 // -----------------