Changeset 1035 in subversion


Ignore:
Timestamp:
Feb 10, 2008 12:08:40 PM (5 years ago)
Author:
till
Message:
  • fixing #1484494 (people can delete the last identity otherwise)
  • FOR TRANSLATERS: introducing new message
Location:
trunk/roundcubemail/program
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/roundcubemail/program/include/rcube_user.inc

    r938 r1035  
    241241     
    242242    if (!$this->ID) 
     243      return false; 
     244 
     245    $sql_result = $DB->query("SELECT count(*) AS ident_count FROM " . 
     246      get_table_name('identities') . 
     247      " WHERE user_id = ? AND del != 1", 
     248      $this->ID); 
     249 
     250    $sql_arr = $DB->fetch_assoc($sql_result); 
     251    if ($sql_arr['ident_count'] <= 1) 
    243252      return false; 
    244253     

  • trunk/roundcubemail/program/localization/de_DE/messages.inc

    r951 r1035  
    7777$messages['receiptsent'] = 'BestÀtigung erfolgreich gesendet'; 
    7878$messages['errorsendingreceipt'] = 'BestÀtigung konnte nicht gesendet werden'; 
    79  
     79$messages['nodeletelastidentity'] = 'Sie koennen diesen Absender nicht loeschen.'; 
    8080?> 

  • trunk/roundcubemail/program/localization/en_GB/messages.inc

    r950 r1035  
    7575$messages['errorsavingcontact'] = 'Could not save the contact address'; 
    7676$messages['movingmessage'] = 'Moving message...'; 
    77  
     77$messages['nodeletelastidentity'] = 'You cannot delete this identity, it\'s your last one.'; 
    7878?> 

  • trunk/roundcubemail/program/localization/en_US/messages.inc

    r1013 r1035  
    7777$messages['receiptsent'] = 'Successfully sent a read receipt'; 
    7878$messages['errorsendingreceipt'] = 'Could not send the receipt'; 
    79  
     79$messages['nodeletelastidentity'] = 'You cannot delete this identity, it\'s your last one.'; 
    8080?> 

  • trunk/roundcubemail/program/steps/settings/delete_identity.inc

    r938 r1035  
    2424 
    2525  if ($USER->delete_identity($ids)) 
     26  { 
    2627    $OUTPUT->show_message('deletedsuccessfully', 'confirmation'); 
    27  
     28  } 
     29  else  
     30  { 
     31    $OUTPUT->show_message('nodeletelastidentity', 'error'); 
     32  } 
    2833  // send response 
    2934  if ($OUTPUT->ajax_call) 
Note: See TracChangeset for help on using the changeset viewer.