Fixed: FS#1184 - Email Autoresponder "and" is not true

tbrehm

2010-05-26 7dcfbfb793542d41492e62dff04e95c368181f70

Fixed: FS#1184 - Email Autoresponder "and" is not true 

 interface/lib/lang/en.lng

@@ -1,35 +1,34 @@
<?php
$wb['conf_format_dateshort'] = 'Y-m-d';
$wb['conf_format_datelong'] = 'l dS of F Y';
$wb['conf_format_timeshort'] = 'H:i';
$wb['conf_format_timelong'] = 'H:i:s';
$wb['conf_format_datetime'] = 'Y-m-d H:i';

$wb['301'] = 'Module not permitted for the current user.';
$wb['302'] = 'Module invalid.';
$wb['1001'] = 'The username and password cannot be empty !';
$wb['1002'] = 'The username and/or password are not correct !';
$wb['1003'] = 'The username is deactivated!';
$wb['delete_confirmation'] = 'Do you really want to delete this record?';
$wb['error_no_view_permission'] = 'You dont have the permission to view this record or this record does not exist!';
$wb['error_no_delete_permission'] = 'You dont have the permission to delete this record!';
$wb["page_txt"] = 'Page';
$wb["page_of_txt"] = 'of';
$wb["page_and_txt"] = 'and';
$wb["page_next_txt"] = 'Next';
$wb["page_back_txt"] = 'Back';
$wb["delete_txt"] = 'Delete';
$wb["filter_txt"] = 'Filter';
$wb["add_new_record_txt"] = 'Add new record';
$wb['conf_format_dateshort'] = "Y-m-d";
$wb['conf_format_datelong'] = "l dS of F Y";
$wb['conf_format_timeshort'] = "H:i";
$wb['conf_format_timelong'] = "H:i:s";
$wb['conf_format_datetime'] = "Y-m-d H:i";
$wb['301'] = "Module not permitted for the current user.";
$wb['302'] = "Module invalid.";
$wb['1001'] = "The username and password cannot be empty !";
$wb['1002'] = "The username and/or password are not correct !";
$wb['1003'] = "The username is deactivated!";
$wb['delete_confirmation'] = "Do you really want to delete this record?";
$wb['error_no_view_permission'] = "You dont have the permission to view this record or this record does not exist!";
$wb['error_no_delete_permission'] = "You dont have the permission to delete this record!";
$wb['page_txt'] = "Page";
$wb['page_of_txt'] = "of";
$wb['page_and_txt'] = "and";
$wb['page_next_txt'] = "Next";
$wb['page_back_txt'] = "Back";
$wb['delete_txt'] = "Delete";
$wb['filter_txt'] = "Filter";
$wb['add_new_record_txt'] = "Add new record";
$wb['btn_save_txt'] = "Save";
$wb['btn_cancel_txt'] = "Back";
$wb['top_menu_system'] = 'System';
$wb['top_menu_client'] = 'Client';
$wb['top_menu_email'] = 'Email';
$wb['top_menu_monitor'] = 'Monitor';
$wb['top_menu_sites'] = 'Sites';
$wb['top_menu_dns'] = 'DNS';
$wb['top_menu_tools'] = 'Tools';
$wb['top_menu_help'] = 'Help';
$wb['toolsarea_head_txt'] = 'Tools';
$wb['top_menu_system'] = "System";
$wb['top_menu_client'] = "Client";
$wb['top_menu_email'] = "Email";
$wb['top_menu_monitor'] = "Monitor";
$wb['top_menu_sites'] = "Sites";
$wb['top_menu_dns'] = "DNS";
$wb['top_menu_tools'] = "Tools";
$wb['top_menu_help'] = "Help";
$wb['toolsarea_head_txt'] = "Tools";
?>

 interface/web/mail/lib/lang/en_mail_user.lng

@@ -36,4 +36,5 @@
$wb["move_junk_txt"] = 'Move Spam Emails to Junk directory';
$wb["name_txt"] = 'Realname';
$wb["name_optional_txt"] = '(Optional)';
$wb['autoresponder_active'] = 'Enable the autoresponder';
?>

 interface/web/mail/templates/mail_user_autoresponder_edit.htm

@@ -1,37 +1,37 @@
<h2><tmpl_var name="list_head_txt"></h2>

<p><tmpl_var name="list_desc_txt"></p>



<div class="panel panel_mail_user">



  <div class="pnl_formsarea">

    <fieldset class="inlineLabels">

      <div class="ctrlHolder">

          <label for="autoresponder_text">{tmpl_var name='autoresponder_text_txt'}</label>

        <textarea name="autoresponder_text" id="autoresponder_text" rows='15' cols='30'>{tmpl_var name='autoresponder_text'}</textarea>

      </div>

      <div class="ctrlHolder">

                <p class="label">{tmpl_var name='autoresponder_txt'}</p>

                    <div class="multiField">

                      <div class="ctrlHolder" style="margin-bottom: 5px;">

                        <input type="checkbox" value="y" id="autoresponder" name="autoresponder" onclick="AR_ResetDates();" {tmpl_var name='ar_active'} />&nbsp;{tmpl_var format='strtoupper' name='page_and_txt'}<br />

                      </div>



                      <p style="margin-bottom: 3px;">

                      <label for="autoresponder_start_date[day]" style="width: 55px;">{tmpl_var name='autoresponder_start_date_txt'}</label>

                      {tmpl_var name='autoresponder_start_date'}&nbsp;<a href="javascript:AR_SetNow();">now</a></p>

					  
                      <label for="password" style="width: 55px;">{tmpl_var name='autoresponder_end_date_txt'}</label>

                      {tmpl_var name='autoresponder_end_date'}				
                    </div>

     </div>

    </fieldset>



    <input type="hidden" name="id" value="{tmpl_var name='id'}">



    <div class="buttonHolder buttons">

      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>

      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>

    </div>

  </div>

  
<h2><tmpl_var name="list_head_txt"></h2>
<p><tmpl_var name="list_desc_txt"></p>

<div class="panel panel_mail_user">

  <div class="pnl_formsarea">
    <fieldset class="inlineLabels">
      <div class="ctrlHolder">
          <label for="autoresponder_text">{tmpl_var name='autoresponder_text_txt'}</label>
        <textarea name="autoresponder_text" id="autoresponder_text" rows='15' cols='30'>{tmpl_var name='autoresponder_text'}</textarea>
      </div>
      <div class="ctrlHolder">
                <p class="label">{tmpl_var name='autoresponder_txt'}</p>
                    <div class="multiField">
                      <div class="ctrlHolder" style="margin-bottom: 5px;">
                        <input type="checkbox" value="y" id="autoresponder" name="autoresponder" onclick="AR_ResetDates();" {tmpl_var name='ar_active'} />&nbsp;{tmpl_var name='autoresponder_active'}<br />
                      </div>

                      <p style="margin-bottom: 3px;">
                      <label for="autoresponder_start_date[day]" style="width: 55px;">{tmpl_var name='autoresponder_start_date_txt'}</label>
                      {tmpl_var name='autoresponder_start_date'}&nbsp;<a href="javascript:AR_SetNow();">now</a></p>
					  
                      <label for="password" style="width: 55px;">{tmpl_var name='autoresponder_end_date_txt'}</label>
                      {tmpl_var name='autoresponder_end_date'}				
                    </div>
     </div>
    </fieldset>

    <input type="hidden" name="id" value="{tmpl_var name='id'}">

    <div class="buttonHolder buttons">
      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
    </div>
  </div>
  
</div>