Ignore:
Timestamp:
Aug 14, 2010, 12:28:53 AM (10 years ago)
Author:
Eric
Message:
  • Bug 1656 fixed: New ability to manually validate new registers
  • Language files updated - Some DE, ES and IT translation are missing
Location:
extensions/NBC_UserAdvManager/trunk/admin
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • extensions/NBC_UserAdvManager/trunk/admin/UAM_admin.php

    r6753 r6754  
    2828$UAM_Password_Test_Score = 0;
    2929$UAM_Exclusionlist_Error = false;
    30 
    3130
    3231// +-----------------------------------------------------------------------+
     
    119118      $UAM_Exclusionlist_Error = true;
    120119    }
    121                
     120
    122121                $newconf_UAM = array(
    123122      $_POST['UAM_Mail_Info'],
     
    154153                pwg_query($query);
    155154
    156 
    157155/* Email confirmation settings */
    158156    $_POST['UAM_ConfirmMail_ReMail_Txt1'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_ConfirmMail_ReMail_Txt1'])));
     
    163161   
    164162    $_POST['UAM_ConfirmMail_Custom_Txt2'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_ConfirmMail_Custom_Txt2'])));
    165 
    166 
     163   
    167164          $newconf_UAM_ConfirmMail = array (
    168165      $_POST['UAM_ConfirmMail_TimeOut'],
     
    310307                'UAM_CONFIRM_MAIL_TRUE'          => $conf_UAM[1]=='true' ?  'checked="checked"' : '' ,
    311308                'UAM_CONFIRM_MAIL_FALSE'         => $conf_UAM[1]=='false' ?  'checked="checked"' : '' ,
     309    'UAM_CONFIRM_MAIL_LOCAL'         => $conf_UAM[1]=='local' ?  'checked="checked"' : '' ,
    312310                'UAM_CONFIRMMAIL_TEXT'           => $conf_UAM[10],
    313311                'UAM_No_Confirm_Group'           => $conf_UAM[2],
     
    626624  $conf_UAM_ConfirmMail = unserialize($conf['UserAdvManager_ConfirmMail']);
    627625       
    628   if (isset($conf_UAM[1]) and $conf_UAM[1]=='true' and ((isset($conf_UAM[2]) and $conf_UAM[2] <> '-1') or (isset($conf_UAM[8]) and $conf_UAM[8] <> '-1')))
    629   {
     626  if (isset($conf_UAM[1]) and ($conf_UAM[1]=='true' or $conf_UAM[1]=='local') and ((isset($conf_UAM[2]) and $conf_UAM[2] <> '-1') or (isset($conf_UAM[8]) and $conf_UAM[8] <> '-1')))
     627  {   
    630628// +-----------------------------------------------------------------------+
    631629// |                           initialization                              |
     
    11121110
    11131111                        $expiration = expiration($local_user['id']);
    1114 
     1112     
    11151113                $template->append(
    11161114                'users',
     
    11351133                                )
    11361134                        );
    1137                 }
     1135                }   
     1136
     1137    // Check if validation of register is made by admin or visitor
     1138    // If visitor, $Confirm_Local is used to mask useless buttons
     1139    $Confirm_Local = "";
     1140   
     1141    if ($conf_UAM[1] == 'local')
     1142    {
     1143      $Confirm_Local = $conf_UAM[1];
     1144    }
     1145    else
     1146    {
     1147      $Confirm_Local = "";
     1148    }
     1149   
    11381150    /* Plugin version inserted */
    11391151    $template->assign(
    11401152      array(
     1153        'CONFIRM_LOCAL'=> $Confirm_Local,
    11411154        'UAM_VERSION'  => $version,
    11421155        'UAM_PATH'     => UAM_PATH,
  • extensions/NBC_UserAdvManager/trunk/admin/template/global.tpl

    r6354 r6754  
    215215              {'UAM_Confirm_Mail_false'|@translate}<br>
    216216            <input type="radio" value="true" {$UAM_CONFIRM_MAIL_TRUE} name="UAM_Confirm_Mail">
    217               {'UAM_Confirm_Mail_true'|@translate}
     217              {'UAM_Confirm_Mail_true'|@translate}<br>
     218            <input type="radio" value="local" {$UAM_CONFIRM_MAIL_LOCAL} name="UAM_Confirm_Mail">
     219              {'UAM_Confirm_Mail_local'|@translate}
    218220            <br><br>
    219221                </li>
  • extensions/NBC_UserAdvManager/trunk/admin/template/usermanager.tpl

    r6399 r6754  
    4141                        <th>&nbsp;{'Groups'|@translate}&nbsp;&nbsp;</th>
    4242                        <th>&nbsp;{'Registration_Date'|@translate}&nbsp;&nbsp;</th>
     43          {if $CONFIRM_LOCAL == ""}
    4344            <th>&nbsp;{'Reminder'|@translate}&nbsp;&nbsp;</th>
     45          {/if}
    4446                        </tr>
    4547                        </thead>
     
    5355            <td>{$user.GROUPS}</td>
    5456            <td {if $user.EXPIRATION == True}style="color:red;text-align:center;"{else}style="color:lime;text-align:center;"{/if}>{$user.REGISTRATION}</td>
     57          {if $CONFIRM_LOCAL == ""}
    5558            <td style="text-align:center;">{$user.REMINDER}</td>
     59          {/if}
    5660            {foreach from=$user.plugin_columns item=data}
    5761              <td>{$data}</td>
     
    8791
    8892<p>
     93{if $CONFIRM_LOCAL == "local"}
     94  <input class="submit" type="submit" value="{'Delete_selected'|@translate}" name="Del_Selected">
     95  <input class="submit" type="submit" value="{'Force_Validation'|@translate}" name="Force_Validation">
     96{else}
    8997  <input class="submit" type="submit" value="{'Delete_selected'|@translate}" name="Del_Selected">
    9098  <input class="submit" type="submit" value="{'Mail_without_key'|@translate}" name="Mail_Without_Key">
    9199  <input class="submit" type="submit" value="{'Mail_with_key'|@translate}" name="Mail_With_Key">
    92100  <input class="submit" type="submit" value="{'Force_Validation'|@translate}" name="Force_Validation">
     101{/if}
    93102</p>
    94103  </fieldset>
Note: See TracChangeset for help on using the changeset viewer.