Changed license to GNU GPLv3+ with exceptions for skins and plugins

thomascube

2012-01-18 7fe3811c65a7c63154f03610e289a6d196f3ae2e

 program/steps/settings/save_identity.inc

@@ -6,7 +6,10 @@
 |                                                                       |
 | This file is part of the Roundcube Webmail client                     |
 | Copyright (C) 2005-2009, The Roundcube Dev Team                       |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
 | See the README file for a full license statement.                     |
 |                                                                       |
 | PURPOSE:                                                              |
 |   Save an identity record or to add a new one                         |
@@ -96,7 +99,7 @@

    if ($_POST['_framed']) {
      // update the changed col in list
      // ...
      $OUTPUT->command('parent.update_identity_row', $iid, Q(trim($save_data['name'] . ' <' . rcube_idn_to_utf8($save_data['email']) .'>')));
    }
  }
  else {
@@ -135,6 +138,11 @@

    if (!empty($_POST['_standard']))
      $default_id = $insert_id;

    if ($_POST['_framed']) {
      // add a new row to the list
      $OUTPUT->command('parent.update_identity_row', $insert_id, Q(trim($save_data['name'] . ' <' . rcube_idn_to_utf8($save_data['email']) .'>')), true);
    }
  }
  else {
    // show error message
@@ -152,4 +160,8 @@
  $RCMAIL->user->set_default($default_id);

// go to next step
rcmail_overwrite_action('identities');
if (!empty($_REQUEST['_framed'])) {
  rcmail_overwrite_action('edit-identity');
}
else
  rcmail_overwrite_action('identities');