diff options
author | thomascube <thomas@roundcube.net> | 2012-01-18 11:10:46 +0000 |
---|---|---|
committer | thomascube <thomas@roundcube.net> | 2012-01-18 11:10:46 +0000 |
commit | 7fe3811c65a7c63154f03610e289a6d196f3ae2e (patch) | |
tree | 2c916daa970bd8b5ccc732f80b2bbd3fb351f466 /program/steps/mail | |
parent | e52aaee0633bf76b5850eaed6aff4590436a4432 (diff) |
Changed license to GNU GPLv3+ with exceptions for skins and plugins
Diffstat (limited to 'program/steps/mail')
-rw-r--r-- | program/steps/mail/addcontact.inc | 5 | ||||
-rw-r--r-- | program/steps/mail/attachments.inc | 5 | ||||
-rw-r--r-- | program/steps/mail/autocomplete.inc | 5 | ||||
-rw-r--r-- | program/steps/mail/check_recent.inc | 5 | ||||
-rw-r--r-- | program/steps/mail/compose.inc | 5 | ||||
-rw-r--r-- | program/steps/mail/copy.inc | 5 | ||||
-rw-r--r-- | program/steps/mail/folders.inc | 5 | ||||
-rw-r--r-- | program/steps/mail/func.inc | 5 | ||||
-rw-r--r-- | program/steps/mail/get.inc | 5 | ||||
-rw-r--r-- | program/steps/mail/getunread.inc | 5 | ||||
-rw-r--r-- | program/steps/mail/headers.inc | 5 | ||||
-rw-r--r-- | program/steps/mail/list.inc | 5 | ||||
-rw-r--r-- | program/steps/mail/list_contacts.inc | 5 | ||||
-rw-r--r-- | program/steps/mail/mark.inc | 5 | ||||
-rw-r--r-- | program/steps/mail/move_del.inc | 5 | ||||
-rw-r--r-- | program/steps/mail/pagenav.inc | 5 | ||||
-rw-r--r-- | program/steps/mail/search.inc | 5 | ||||
-rw-r--r-- | program/steps/mail/sendmail.inc | 9 | ||||
-rw-r--r-- | program/steps/mail/sendmdn.inc | 5 | ||||
-rw-r--r-- | program/steps/mail/show.inc | 5 | ||||
-rw-r--r-- | program/steps/mail/viewsource.inc | 5 |
21 files changed, 86 insertions, 23 deletions
diff --git a/program/steps/mail/addcontact.inc b/program/steps/mail/addcontact.inc index ab7bfc06f..8e11272e0 100644 --- a/program/steps/mail/addcontact.inc +++ b/program/steps/mail/addcontact.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: | | Add the submitted contact to the users address book | diff --git a/program/steps/mail/attachments.inc b/program/steps/mail/attachments.inc index 52de1c1f8..ff9424fd6 100644 --- a/program/steps/mail/attachments.inc +++ b/program/steps/mail/attachments.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: | | Upload, remove, display attachments in compose form | diff --git a/program/steps/mail/autocomplete.inc b/program/steps/mail/autocomplete.inc index 6eea705ef..a7823a5f9 100644 --- a/program/steps/mail/autocomplete.inc +++ b/program/steps/mail/autocomplete.inc @@ -7,7 +7,10 @@ | This file is part of the Roundcube Webmail client | | Copyright (C) 2008-2011, Roundcube Dev Team | | Copyright (C) 2011, Kolab Systems AG | - | 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: | | Perform a search on configured address books for the address | diff --git a/program/steps/mail/check_recent.inc b/program/steps/mail/check_recent.inc index 6673d0c17..4f97d0fe7 100644 --- a/program/steps/mail/check_recent.inc +++ b/program/steps/mail/check_recent.inc @@ -6,7 +6,10 @@ | | | This file is part of the Roundcube Webmail client | | Copyright (C) 2005-2010, 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: | | Check for recent messages, in all mailboxes | diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index 687849863..6b2fa7b2b 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -6,7 +6,10 @@ | | | This file is part of the Roundcube Webmail client | | Copyright (C) 2005-2012, 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: | | Compose a new mail message with all headers and attachments | diff --git a/program/steps/mail/copy.inc b/program/steps/mail/copy.inc index e553adc14..af8e9b8b9 100644 --- a/program/steps/mail/copy.inc +++ b/program/steps/mail/copy.inc @@ -6,7 +6,10 @@ | | | This file is part of the Roundcube Webmail client | | Copyright (C) 2005-2010, 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: | | Copy the submitted messages to a specific mailbox | diff --git a/program/steps/mail/folders.inc b/program/steps/mail/folders.inc index 2aa83ee0d..ee94f56a7 100644 --- a/program/steps/mail/folders.inc +++ b/program/steps/mail/folders.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: | | Implement folder operations line EXPUNGE and Clear | diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 0ffffc5fc..fb8e7fa26 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -6,7 +6,10 @@ | | | This file is part of the Roundcube Webmail client | | Copyright (C) 2005-2010, 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: | | Provide webmail functionality and GUI objects | diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc index 7da8f13fa..e8e2c1cb3 100644 --- a/program/steps/mail/get.inc +++ b/program/steps/mail/get.inc @@ -6,7 +6,10 @@ | | | This file is part of the Roundcube Webmail client | | Copyright (C) 2005-2011, 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: | | Delivering a specific part of a mail message | diff --git a/program/steps/mail/getunread.inc b/program/steps/mail/getunread.inc index 64e7a6aee..0d2e94b96 100644 --- a/program/steps/mail/getunread.inc +++ b/program/steps/mail/getunread.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: | | Check all mailboxes for unread messages and update GUI | diff --git a/program/steps/mail/headers.inc b/program/steps/mail/headers.inc index 0cce5a503..0892247f8 100644 --- a/program/steps/mail/headers.inc +++ b/program/steps/mail/headers.inc @@ -5,7 +5,10 @@ | | | This file is part of the Roundcube Webmail client | | Copyright (C) 2005-2007, 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: | | Fetch message headers in raw format for display | diff --git a/program/steps/mail/list.inc b/program/steps/mail/list.inc index 8bfb4c8f1..dad86663a 100644 --- a/program/steps/mail/list.inc +++ b/program/steps/mail/list.inc @@ -6,7 +6,10 @@ | | | This file is part of the Roundcube Webmail client | | Copyright (C) 2005-2007, 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: | | Send message list to client (as remote response) | diff --git a/program/steps/mail/list_contacts.inc b/program/steps/mail/list_contacts.inc index cbe0e8b54..23804b155 100644 --- a/program/steps/mail/list_contacts.inc +++ b/program/steps/mail/list_contacts.inc @@ -6,7 +6,10 @@ | | | This file is part of the Roundcube Webmail client | | Copyright (C) 2012, 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: | | Send contacts list to client (as remote response) | diff --git a/program/steps/mail/mark.inc b/program/steps/mail/mark.inc index ab64debb7..f165011ca 100644 --- a/program/steps/mail/mark.inc +++ b/program/steps/mail/mark.inc @@ -5,7 +5,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: | | Mark the submitted messages with the specified flag | diff --git a/program/steps/mail/move_del.inc b/program/steps/mail/move_del.inc index 63f27440f..a30b4e660 100644 --- a/program/steps/mail/move_del.inc +++ b/program/steps/mail/move_del.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: | | Move the submitted messages to a specific mailbox or delete them | diff --git a/program/steps/mail/pagenav.inc b/program/steps/mail/pagenav.inc index e74298b88..e4a4a075d 100644 --- a/program/steps/mail/pagenav.inc +++ b/program/steps/mail/pagenav.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: | | Updates message page navigation controls | diff --git a/program/steps/mail/search.inc b/program/steps/mail/search.inc index 8835730e4..3f9b86e98 100644 --- a/program/steps/mail/search.inc +++ b/program/steps/mail/search.inc @@ -4,7 +4,10 @@ | steps/mail/search.inc | | | | Search functions for rc webmail | - | 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. | | | +-----------------------------------------------------------------------+ | Author: Benjamin Smith <defitro@gmail.com> | diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc index 520724e8a..0c143058b 100644 --- a/program/steps/mail/sendmail.inc +++ b/program/steps/mail/sendmail.inc @@ -6,7 +6,10 @@ | | | This file is part of the Roundcube Webmail client | | Copyright (C) 2005-2011, 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: | | Compose a new mail message with all headers and attachments | @@ -711,7 +714,7 @@ if ($store_target) { $delete_idx = $RCMAIL->storage->search_once($CONFIG['drafts_mbox'], 'HEADER Message-ID '.$olddraftmessageid); - if ($del_uid = $delete_idx->get_element('FIRST')) { + if ($del_uid = $delete_idx->getElement('FIRST')) { $deleted = $RCMAIL->storage->delete_message($del_uid, $CONFIG['drafts_mbox']); // raise error if deletion of old draft failed @@ -734,7 +737,7 @@ if ($savedraft) { // remember new draft-uid ($saved could be an UID or TRUE here) if (is_bool($saved)) { $draft_idx = $RCMAIL->storage->search_once($CONFIG['drafts_mbox'], 'HEADER Message-ID '.$msgid); - $saved = $draft_idx->get_element('FIRST'); + $saved = $draft_idx->getElement('FIRST'); } $COMPOSE['param']['draft_uid'] = $saved; diff --git a/program/steps/mail/sendmdn.inc b/program/steps/mail/sendmdn.inc index 8973cdad9..3498630b5 100644 --- a/program/steps/mail/sendmdn.inc +++ b/program/steps/mail/sendmdn.inc @@ -6,7 +6,10 @@ | | | This file is part of the Roundcube Webmail client | | Copyright (C) 2008-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: | | Send a message disposition notification for a specific mail | diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc index 7a3d3cd7f..29fe650a9 100644 --- a/program/steps/mail/show.inc +++ b/program/steps/mail/show.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: | | Display a mail message similar as a usual mail application does | diff --git a/program/steps/mail/viewsource.inc b/program/steps/mail/viewsource.inc index c9aeac4c1..f38ca76eb 100644 --- a/program/steps/mail/viewsource.inc +++ b/program/steps/mail/viewsource.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: | | Display a mail message similar as a usual mail application does | |