Changeset 7277 for extensions/NBC_UserAdvManager

Timestamp:

Oct 19, 2010, 7:03:27 PM (14 years ago)

Author:

Eric

Message:

Bug 1935 fixed : Fatal error on ConfirmMail page when Extended Description plugin is not used
Bug 1936 fixed : Bad home link in ConfirmMail page when gallery URL is not set
Small CSS improvement (thx to Gotcha)

Location:

extensions/NBC_UserAdvManager/trunk

Files:

• ConfirmMail.php (modified) (5 diffs)
• changelog.txt.php (modified) (1 diff)
• main.inc.php (modified) (1 diff)
• template/ConfirmMail.tpl (modified) (1 diff)

extensions/NBC_UserAdvManager/trunk/ConfirmMail.php

@@ -4 +4 @@
 
 include_once( PHPWG_ROOT_PATH.'include/common.inc.php' );
+include_once( PHPWG_ROOT_PATH.'include/functions_mail.inc.php' );
 
 include_once (UAM_PATH.'include/constants.php');
@@ -62 +63 @@
     else $custom_text = l10n($conf_UAM_ConfirmMail[5]);
 
-    if (isset($conf_UAM[21]) and $conf_UAM[21] == 'true')
-    {
-      $user_idsOK = array();
-      if (!check_consult($userid, $user_idsOK))
-      {
-        $redirect = true;
-      }
-    }
+    $redirect = true;
     
     $template->assign(
@@ -82 +76 @@
   {
     $status = false;
+    $redirect = false;
     if (function_exists('get_user_language_desc'))
     {
@@ -91 +86 @@
                         array(
         'REDIRECT'             => $redirect,
+        'GALLERY_URL'          => make_index_url(),
         'STATUS'               => $status,
                                 'CONFIRM_MAIL_MESSAGE' => $custom_text,
@@ -105 +101 @@
 }
 
-if ( isset($conf['gallery_url']) )
-{
-        $template->assign(
-                array(
-        'GALLERY_URL' =>
-                isset($page['gallery_url']) ?
-                        $page['gallery_url'] : $conf['gallery_url'],
-                )
-        );
-}
-
 $template->set_filenames(
   array(

extensions/NBC_UserAdvManager/trunk/changelog.txt.php

@@ -198 +198 @@
 
 -- 2.15.7 : Bug 1869 fixed - Compatibility with Adult_Content installation process
+
+-- 2.15.8 : Bug 1935 fixed - Fatal error on ConfirmMail page when Extended Description plugin is not used
+            Bug 1936 fixed - Bad home link in ConfirmMail page when gallery URL is not set
+            small CSS improvement (thx to Gotcha)
 */
 ?>

extensions/NBC_UserAdvManager/trunk/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: UserAdvManager
-Version: 2.15.7
+Version: 2.15.8
 Description: Renforcer la gestion des utilisateurs - Enforce users management
 Plugin URI: http://fr.piwigo.org/ext/extension_view.php?eid=216

extensions/NBC_UserAdvManager/trunk/template/ConfirmMail.tpl

@@ -10 +10 @@
         </a>
     {else}
-      {if isset($GALLERY_URL)}
         <a href="{$GALLERY_URL}" title="{'return to homepage'|@translate}">
           <img src="{$ROOT_URL}{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}">
         </a>
-      {else}
-        <a href="{$U_HOME}" title="{'return to homepage'|@translate}">
-          <img src="{$ROOT_URL}{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}">
-        </a>
-      {/if}
     {/if}
       </li>