Changeset 18275 for extensions

Timestamp:

Sep 26, 2012, 6:15:49 PM (12 years ago)

Author:

Eric

Message:

no more need of USR_del_account.php
Deleting obsolete files from trunk

Location:

extensions/UserAdvManager/trunk

Files:

• ConfirmMail.php (deleted)
• GT_del_account.php (deleted)
• USR_del_account.php (deleted)
• changelog.txt.php (modified) (1 diff)
• include/functions.inc.php (modified) (4 diffs)
• template (deleted)

extensions/UserAdvManager/trunk/changelog.txt.php

@@ -344 +344 @@
             New unvalidated user controls more efficient
             Get admins emails instead of webmaster's for sending validation email
+            rejected.php, ConfirmMail.php, GT_del_account.php and USR_del_account.php (and associated templates)are no more used. All messages are displayed on Piwigo's main page
             TODO - New simplifed administration panel
+            Update es_ES, thanks to : jpr928
+            Update el_GR, thanks to : bas_alba
 */
 ?>

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

@@ -577 +577 @@
           invalidate_user_cache();
           logout_user();
-          redirect( make_index_url().'?UAM_msg=deleted', 0);
+          redirect(make_index_url().'?UAM_msg=deleted', 0);
         }
                 }
@@ -805 +805 @@
           invalidate_user_cache();
           logout_user();
-          redirect(UAM_PATH.'USR_del_account.php');
+          redirect(make_index_url().'?UAM_msg=deleted', 0);
         }
                 }
@@ -929 +929 @@
     }
 
-                                // User account deleted after validation deadline
+                                // User account deleted after validation deadline - Triggered by any other user
     elseif (isset($conf_UAM[23]) and !empty($conf_UAM[23]) and $_GET['UAM_msg']=="deleted")
     {
@@ -944 +944 @@
       }
       else $custom_text = l10n(preg_replace($patterns, $replacements, $conf_UAM[23]));
+      
+      $page["errors"][]=$custom_text;
+    }
+
+                                // User account deleted after validation deadline - Triggered by user himself
+    elseif (isset($conf_UAM[31]) and !empty($conf_UAM[31]) and $_GET['UAM_msg']=="deleted")
+    {
+      // Management of Extension flags ([mygallery], [myurl]) - [username] flag can't be used here
+      // -----------------------------------------------------------------------------------------
+      $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[31]));
+      }
+      else $custom_text = l10n(preg_replace($patterns, $replacements, $conf_UAM[31]));
       
       $page["errors"][]=$custom_text;