Changeset 14651


Ignore:
Timestamp:
05/02/12 21:46:59 (8 years ago)
Author:
Eric
Message:

Bug 2620 fixed - Display of ConfirmMail, rejected and del_account pages have been improved
Bug 2621 fixed - Display of ConfirmMail, rejected and del_account pages have been improved for IE8 and IE9 render
Bug 2631 fixed - Piwigo 2.4 compliance : $confgallery_url replaced by get_gallery_home_url() for [myurl] tag

Location:
extensions/UserAdvManager/trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • extensions/UserAdvManager/trunk/ConfirmMail.php

    r14371 r14651  
    7777      $replacements[] = $conf['gallery_title']; 
    7878      $patterns[] = '#\[myurl\]#i'; 
    79       $replacements[] = $conf['gallery_url']; 
    80     
     79      $replacements[] = get_gallery_home_url(); 
     80 
    8181      if (function_exists('get_user_language_desc')) 
    8282      { 
     
    8787     
    8888    $redirect = true; 
    89     $Path_UAM = UAM_PATH; // Path to be used in template to reach the icons 
    90      
    91     $template->assign( 
    92                         array( 
    93         'UAM_PATH'             => $Path_UAM, 
    94         'REDIRECT'             => $redirect, 
    95         'STATUS'               => $status, 
    96                                 'CONFIRM_MAIL_MESSAGE' => $custom_text, 
    97                         ) 
    98                 ); 
    9989  }   
    10090  else 
     
    112102      $replacements[] = $conf['gallery_title']; 
    113103      $patterns[] = '#\[myurl\]#i'; 
    114       $replacements[] = $conf['gallery_url']; 
     104      $replacements[] = get_gallery_home_url(); 
    115105    
    116106      if (function_exists('get_user_language_desc')) 
     
    120110      else $custom_text = l10n(preg_replace($patterns, $replacements, $conf_UAM_ConfirmMail[6])); 
    121111    } 
    122      
    123     $template->assign( 
    124                         array( 
    125         'REDIRECT'             => $redirect, 
    126         'GALLERY_URL'          => make_index_url(), 
    127         'STATUS'               => $status, 
    128                                 'CONFIRM_MAIL_MESSAGE' => $custom_text, 
    129                         ) 
    130                 ); 
    131112  } 
     113 
     114  $Path_UAM = UAM_PATH; // Path to be used in template to reach the icons 
     115 
     116  $template->assign( 
     117    array( 
     118      'UAM_PATH'             => $Path_UAM, 
     119      'REDIRECT'             => $redirect, 
     120      'STATUS'               => $status, 
     121                  'CONFIRM_MAIL_MESSAGE' => $custom_text, 
     122    ) 
     123  ); 
    132124} 
    133125 
  • extensions/UserAdvManager/trunk/GT_del_account.php

    r14371 r14651  
    2828  $replacements[] = $conf['gallery_title']; 
    2929  $patterns[] = '#\[myurl\]#i'; 
    30   $replacements[] = $conf['gallery_url']; 
     30  $replacements[] = get_gallery_home_url(); 
    3131 
    3232  if (function_exists('get_user_language_desc')) 
     
    4242  array( 
    4343    'UAM_PATH'             => $Path_UAM, 
    44     'GALLERY_URL'          => make_index_url(), 
    4544    'CUSTOM_REDIR_MSG'     => $custom_text, 
    4645  ) 
  • extensions/UserAdvManager/trunk/USR_del_account.php

    r12271 r14651  
    2828  $replacements[] = $conf['gallery_title']; 
    2929  $patterns[] = '#\[myurl\]#i'; 
    30   $replacements[] = $conf['gallery_url']; 
     30  $replacements[] = get_gallery_home_url(); 
    3131 
    3232  if (function_exists('get_user_language_desc')) 
     
    3939$template->assign( 
    4040  array( 
    41     'GALLERY_URL'          => make_index_url(), 
    4241    'CUSTOM_REDIR_MSG'     => $custom_text, 
    4342  ) 
  • extensions/UserAdvManager/trunk/changelog.txt.php

    r14635 r14651  
    304304            Bug 2619 fixed - Confirmation email when registered user changes his email was not sent and user not demoted 
    305305            Bug 2620 fixed - Display of ConfirmMail, rejected and del_account pages have been improved 
     306            Bug 2621 fixed - Display of ConfirmMail, rejected and del_account pages have been improved for IE8 and IE9 render 
     307            Bug 2622 fixed - Display of ConfirmMail, rejected and del_account pages have been improved for Stripped theme 
    306308            Bug 2628 fixed - Php notice when email is not mandatory for registration 
     309            Bug 2631 fixed - Piwigo 2.4 compliance : $conf['gallery_url'] replaced by get_gallery_home_url() for [myurl] tag 
    307310*/ 
    308311?> 
  • extensions/UserAdvManager/trunk/include/functions.inc.php

    r14366 r14651  
    861861    $replacements[] = $conf['gallery_title']; 
    862862    $patterns[] = '#\[myurl\]#i'; 
    863     $replacements[] = $conf['gallery_url']; 
     863    $replacements[] = get_gallery_home_url(); 
    864864     
    865865    $infos = preg_replace($patterns, $replacements, $conf_UAM[29])."\n"."\n".$infos; 
     
    933933        $replacements[] = $conf['gallery_title']; 
    934934        $patterns[] = '#\[myurl\]#i'; 
    935         $replacements[] = $conf['gallery_url']; 
     935        $replacements[] = get_gallery_home_url(); 
    936936     
    937937        if (function_exists('get_user_language_desc')) 
     
    980980        $replacements[] = $conf['gallery_title']; 
    981981        $patterns[] = '#\[myurl\]#i'; 
    982         $replacements[] = $conf['gallery_url']; 
     982        $replacements[] = get_gallery_home_url(); 
    983983     
    984984        if (function_exists('get_user_language_desc')) 
     
    10321032      $replacements[] = $conf['gallery_title']; 
    10331033      $patterns[] = '#\[myurl\]#i'; 
    1034       $replacements[] = $conf['gallery_url']; 
     1034      $replacements[] = get_gallery_home_url(); 
    10351035       
    10361036      if (isset($conf_UAM_ConfirmMail[0]) and $conf_UAM_ConfirmMail[0] == 'true') // [Kdays] replacement only if related option is active 
     
    11071107        $replacements[] = $conf['gallery_title']; 
    11081108        $patterns[] = '#\[myurl\]#i'; 
    1109         $replacements[] = $conf['gallery_url']; 
     1109        $replacements[] = get_gallery_home_url(); 
    11101110 
    11111111        if (isset($conf_UAM_ConfirmMail[0]) and $conf_UAM_ConfirmMail[0] == 'true') // [Kdays] replacement only if related option is active 
     
    11511151        $replacements[] = $conf['gallery_title']; 
    11521152        $patterns[] = '#\[myurl\]#i'; 
    1153         $replacements[] = $conf['gallery_url']; 
     1153        $replacements[] = get_gallery_home_url(); 
    11541154 
    11551155        if (isset($conf_UAM_ConfirmMail[0]) and $conf_UAM_ConfirmMail[0] == 'true') // [Kdays] replacement only if related option is active 
     
    12321232    $replacements[] = $conf['gallery_title']; 
    12331233    $patterns[] = '#\[myurl\]#i'; 
    1234     $replacements[] = $conf['gallery_url']; 
     1234    $replacements[] = get_gallery_home_url(); 
    12351235    $patterns[] = '#\[days\]#i'; 
    12361236    $replacements[] = $conf_UAM[16]; 
     
    13131313    $replacements[] = $conf['gallery_title']; 
    13141314    $patterns[] = '#\[myurl\]#i'; 
    1315     $replacements[] = $conf['gallery_url']; 
     1315    $replacements[] = get_gallery_home_url(); 
    13161316 
    13171317    if (function_exists('get_user_language_desc')) 
     
    14121412    $replacements[] = $conf['gallery_title']; 
    14131413    $patterns[] = '#\[myurl\]#i'; 
    1414     $replacements[] = $conf['gallery_url']; 
     1414    $replacements[] = get_gallery_home_url(); 
    14151415 
    14161416    if (function_exists('get_user_language_desc')) 
  • extensions/UserAdvManager/trunk/rejected.php

    r14371 r14651  
    2828  $replacements[] = $conf['gallery_title']; 
    2929  $patterns[] = '#\[myurl\]#i'; 
    30   $replacements[] = $conf['gallery_url']; 
     30  $replacements[] = get_gallery_home_url(); 
    3131 
    3232  if (function_exists('get_user_language_desc')) 
     
    4242  array( 
    4343    'UAM_PATH'             => $Path_UAM, 
    44     'GALLERY_URL'          => make_index_url(), 
    4544    'CUSTOM_REJECT_MSG'    => $custom_text, 
    4645  ) 
  • extensions/UserAdvManager/trunk/template/ConfirmMail.tpl

    r14371 r14651  
    11{html_head}<link rel="stylesheet" type="text/css" href="template/confmail.css">{/html_head} 
    22 
     3{if $themeconf.name|strstr:"stripped"} 
    34<div class="titrePage"> 
    45  <ul class="categoryActions"> 
     
    910      </a> 
    1011    {else} 
    11       <a href="{$GALLERY_URL}" title="{'return to homepage'|@translate}"> 
     12      <a href="{$ROOT_URL}" title="{'return to homepage'|@translate}"> 
     13        <img src="{$UAM_PATH}template/icon/home.png" class="button" alt="{'home'|@translate}"> 
     14      </a> 
     15    {/if} 
     16    </li> 
     17  </ul> 
     18  &nbsp;&nbsp;&nbsp;<h2 class="confmail">{'UAM_title_confirm_mail'|@translate}</h2> 
     19</div> 
     20{else} 
     21<div class="titrePage"> 
     22  <ul class="categoryActions"> 
     23    <li> 
     24    {if $REDIRECT} 
     25      <a href="{$ROOT_URL}identification.php" title="{'return to homepage'|@translate}"> 
     26        <img src="{$UAM_PATH}template/icon/home.png" class="button" alt="{'home'|@translate}"> 
     27      </a> 
     28    {else} 
     29      <a href="{$ROOT_URL}" title="{'return to homepage'|@translate}"> 
    1230        <img src="{$UAM_PATH}template/icon/home.png" class="button" alt="{'home'|@translate}"> 
    1331      </a> 
     
    1735  <h2 class="confmail">{'UAM_title_confirm_mail'|@translate}</h2> 
    1836</div> 
     37{/if} 
    1938 
    2039<ul> 
  • extensions/UserAdvManager/trunk/template/del_account.tpl

    r14371 r14651  
    11{html_head}<link rel="stylesheet" type="text/css" href="template/confmail.css">{/html_head} 
    22 
     3{if $themeconf.name|strstr:"stripped"} 
    34<div class="titrePage"> 
    45  <ul class="categoryActions"> 
    56    <li> 
    6       <a href="{$GALLERY_URL}" title="{'return to homepage'|@translate}"> 
     7      <a href="{$ROOT_URL}" title="{'return to homepage'|@translate}"> 
     8        <img src="{$UAM_PATH}template/icon/home.png" class="button" alt="{'home'|@translate}"> 
     9      </a> 
     10    </li> 
     11  </ul> 
     12  &nbsp;&nbsp;&nbsp;<h2 class="confmail">{'UAM_title_redir_page'|@translate}</h2> 
     13</div> 
     14{else} 
     15<div class="titrePage"> 
     16  <ul class="categoryActions"> 
     17    <li> 
     18      <a href="{$ROOT_URL}" title="{'return to homepage'|@translate}"> 
    719        <img src="{$UAM_PATH}template/icon/home.png" class="button" alt="{'home'|@translate}"> 
    820      </a> 
     
    1123  <h2 class="confmail">{'UAM_title_redir_page'|@translate}</h2> 
    1224</div> 
     25{/if} 
    1326 
    1427<ul> 
  • extensions/UserAdvManager/trunk/template/rejected.tpl

    r14371 r14651  
    11{html_head}<link rel="stylesheet" type="text/css" href="template/confmail.css">{/html_head} 
    22 
     3{if $themeconf.name|strstr:"stripped"} 
    34<div class="titrePage"> 
    45  <ul class="categoryActions"> 
    56    <li> 
    6       <a href="{$GALLERY_URL}" title="{'return to homepage'|@translate}"> 
     7      <a href="{$ROOT_URL}" title="{'return to homepage'|@translate}"> 
     8        <img src="{$UAM_PATH}template/icon/home.png" class="button" alt="{'home'|@translate}"> 
     9      </a> 
     10    </li> 
     11  </ul> 
     12  &nbsp;&nbsp;&nbsp;<h2 class="confmail">{'UAM_Reject_Page_Title'|@translate}</h2> 
     13</div> 
     14{else} 
     15<div class="titrePage"> 
     16  <ul class="categoryActions"> 
     17    <li> 
     18      <a href="{$ROOT_URL}" title="{'return to homepage'|@translate}"> 
    719        <img src="{$UAM_PATH}template/icon/home.png" class="button" alt="{'home'|@translate}"> 
    820      </a> 
     
    1123  <h2 class="confmail">{'UAM_Reject_Page_Title'|@translate}</h2> 
    1224</div> 
    13  
     25{/if} 
    1426<ul> 
    1527  <div class="errors">{$CUSTOM_REJECT_MSG}</div> 
Note: See TracChangeset for help on using the changeset viewer.