diff options
Diffstat (limited to 'program')
53 files changed, 34 insertions, 58 deletions
diff --git a/program/include/html.php b/program/include/html.php index 0930f5853..54a6cdeaa 100644 --- a/program/include/html.php +++ b/program/include/html.php @@ -719,4 +719,3 @@ class html_table extends html } } -?> diff --git a/program/include/main.inc b/program/include/main.inc index fff9652fa..8b8a7d23b 100644 --- a/program/include/main.inc +++ b/program/include/main.inc @@ -1730,4 +1730,3 @@ function log_bug($arg_arr) } } -?> diff --git a/program/include/rcube_browser.php b/program/include/rcube_browser.php index aa3782bfe..1e30fc3a3 100644 --- a/program/include/rcube_browser.php +++ b/program/include/rcube_browser.php @@ -69,5 +69,5 @@ class rcube_browser $this->pngalpha = $this->mz || $this->safari || ($this->ie && $this->ver>=5.5) || ($this->ie && $this->ver>=5 && $this->mac) || ($this->opera && $this->ver>=7) ? true : false; } - } +} diff --git a/program/include/rcube_imap_generic.php b/program/include/rcube_imap_generic.php index 451f980d3..9aa879756 100644 --- a/program/include/rcube_imap_generic.php +++ b/program/include/rcube_imap_generic.php @@ -2236,4 +2236,3 @@ class rcube_imap_generic } -?> diff --git a/program/include/rcube_ldap.php b/program/include/rcube_ldap.php index b54827691..27547941d 100644 --- a/program/include/rcube_ldap.php +++ b/program/include/rcube_ldap.php @@ -732,4 +732,3 @@ class rcube_ldap extends rcube_addressbook } -?> diff --git a/program/include/rcube_shared.inc b/program/include/rcube_shared.inc index a643f4438..79526277d 100644 --- a/program/include/rcube_shared.inc +++ b/program/include/rcube_shared.inc @@ -674,4 +674,3 @@ if (!extension_loaded('mbstring')) } } -?> diff --git a/program/include/rcube_sqlite.inc b/program/include/rcube_sqlite.inc index cc8086518..fd0511922 100644 --- a/program/include/rcube_sqlite.inc +++ b/program/include/rcube_sqlite.inc @@ -73,5 +73,4 @@ function rcube_sqlite_debug($str) { //console($str); } - -?> + diff --git a/program/steps/addressbook/copy.inc b/program/steps/addressbook/copy.inc index 525f9278a..1b938726c 100644 --- a/program/steps/addressbook/copy.inc +++ b/program/steps/addressbook/copy.inc @@ -91,4 +91,3 @@ if ($cid && preg_match('/^[a-zA-Z0-9\+\/=_-]+(,[a-zA-Z0-9\+\/=_-]+)*$/', $cid) & // send response $OUTPUT->send(); -?> diff --git a/program/steps/addressbook/delete.inc b/program/steps/addressbook/delete.inc index da83757a8..ba0ac0fad 100644 --- a/program/steps/addressbook/delete.inc +++ b/program/steps/addressbook/delete.inc @@ -49,4 +49,4 @@ if ($OUTPUT->ajax_call && } exit; -?> + diff --git a/program/steps/addressbook/edit.inc b/program/steps/addressbook/edit.inc index 3e2d8c583..96a2f39ee 100644 --- a/program/steps/addressbook/edit.inc +++ b/program/steps/addressbook/edit.inc @@ -110,4 +110,4 @@ if (!$CONTACTS->get_result() && $OUTPUT->template_exists('addcontact')) // this will be executed if no template for addcontact exists $OUTPUT->send('editcontact'); -?> + diff --git a/program/steps/addressbook/export.inc b/program/steps/addressbook/export.inc index 7e6855e92..15d1e7233 100644 --- a/program/steps/addressbook/export.inc +++ b/program/steps/addressbook/export.inc @@ -41,4 +41,3 @@ while ($result && ($row = $result->next())) { exit; -?> diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc index c044fc331..a43acd9c8 100644 --- a/program/steps/addressbook/func.inc +++ b/program/steps/addressbook/func.inc @@ -236,4 +236,3 @@ $OUTPUT->add_handlers(array( 'searchform' => array($OUTPUT, 'search_form') )); -?> diff --git a/program/steps/addressbook/groups.inc b/program/steps/addressbook/groups.inc index c98d4d840..004096aaf 100644 --- a/program/steps/addressbook/groups.inc +++ b/program/steps/addressbook/groups.inc @@ -98,4 +98,3 @@ else if ($RCMAIL->action == 'group-delete') { // send response $OUTPUT->send(); -?> diff --git a/program/steps/addressbook/import.inc b/program/steps/addressbook/import.inc index ace9ad32d..9ba1c1d90 100644 --- a/program/steps/addressbook/import.inc +++ b/program/steps/addressbook/import.inc @@ -188,5 +188,3 @@ $OUTPUT->add_handlers(array( // render page $OUTPUT->send('importcontacts'); - -?>
\ No newline at end of file diff --git a/program/steps/addressbook/list.inc b/program/steps/addressbook/list.inc index 71b9379b1..cc8c0bbfd 100644 --- a/program/steps/addressbook/list.inc +++ b/program/steps/addressbook/list.inc @@ -32,4 +32,3 @@ rcmail_js_contacts_list($result); // send response $OUTPUT->send(); -?>
\ No newline at end of file diff --git a/program/steps/addressbook/mailto.inc b/program/steps/addressbook/mailto.inc index 002c4e801..4b4f524e3 100644 --- a/program/steps/addressbook/mailto.inc +++ b/program/steps/addressbook/mailto.inc @@ -47,4 +47,3 @@ else // send response $OUTPUT->send(); -?>
\ No newline at end of file diff --git a/program/steps/addressbook/save.inc b/program/steps/addressbook/save.inc index 168d995a1..a277008c8 100644 --- a/program/steps/addressbook/save.inc +++ b/program/steps/addressbook/save.inc @@ -131,4 +131,4 @@ else } } -?> + diff --git a/program/steps/addressbook/search.inc b/program/steps/addressbook/search.inc index 790db060d..e5ace2451 100644 --- a/program/steps/addressbook/search.inc +++ b/program/steps/addressbook/search.inc @@ -49,5 +49,3 @@ $OUTPUT->command('set_rowcount', rcmail_get_rowcount_text()); // send response $OUTPUT->send(); - -?>
\ No newline at end of file diff --git a/program/steps/addressbook/show.inc b/program/steps/addressbook/show.inc index 8ceaac28c..f3bea3094 100644 --- a/program/steps/addressbook/show.inc +++ b/program/steps/addressbook/show.inc @@ -72,4 +72,3 @@ function rcmail_contact_details($attrib) //$OUTPUT->framed = $_framed; $OUTPUT->add_handler('contactdetails', 'rcmail_contact_details'); $OUTPUT->send('showcontact'); -?>
\ No newline at end of file diff --git a/program/steps/mail/addcontact.inc b/program/steps/mail/addcontact.inc index 23e657974..20a49a169 100644 --- a/program/steps/mail/addcontact.inc +++ b/program/steps/mail/addcontact.inc @@ -60,4 +60,4 @@ if (!$done) $OUTPUT->show_message('errorsavingcontact', 'warning'); $OUTPUT->send(); -?> + diff --git a/program/steps/mail/attachments.inc b/program/steps/mail/attachments.inc index 2b4a59024..dca727278 100644 --- a/program/steps/mail/attachments.inc +++ b/program/steps/mail/attachments.inc @@ -152,4 +152,3 @@ else if ($_SERVER['REQUEST_METHOD'] == 'POST') { $OUTPUT->command('auto_save_start', false); $OUTPUT->send('iframe'); -?> diff --git a/program/steps/mail/autocomplete.inc b/program/steps/mail/autocomplete.inc index 4fbea1fba..4b6b6f964 100644 --- a/program/steps/mail/autocomplete.inc +++ b/program/steps/mail/autocomplete.inc @@ -85,4 +85,3 @@ function contact_results_sort($a, $b) return strcoll(trim($name_a, '" '), trim($name_b, '" ')); } -?> diff --git a/program/steps/mail/check_recent.inc b/program/steps/mail/check_recent.inc index 3031bf715..19d4fb85f 100644 --- a/program/steps/mail/check_recent.inc +++ b/program/steps/mail/check_recent.inc @@ -84,4 +84,4 @@ foreach ($a_mailboxes as $mbox_name) { $OUTPUT->send(); -?> + diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index 6f183d3a1..a0b68d2f0 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -1134,4 +1134,4 @@ $OUTPUT->add_handlers(array( $OUTPUT->send('compose'); -?> + diff --git a/program/steps/mail/copy.inc b/program/steps/mail/copy.inc index 3ddae613b..175994f8e 100644 --- a/program/steps/mail/copy.inc +++ b/program/steps/mail/copy.inc @@ -54,4 +54,4 @@ else { // send response $OUTPUT->send(); -?> + diff --git a/program/steps/mail/folders.inc b/program/steps/mail/folders.inc index a4d71d2c0..ce3406c83 100644 --- a/program/steps/mail/folders.inc +++ b/program/steps/mail/folders.inc @@ -71,4 +71,4 @@ else if ($RCMAIL->action=='purge' && ($mbox = get_input_value('_mbox', RCUBE_INP $OUTPUT->send($commands); -?> + diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 805f0af97..911832691 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -1606,4 +1606,4 @@ $OUTPUT->add_handlers(array( 'searchform' => array($OUTPUT, 'search_form'), )); -?> + diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc index 89180dd3a..9ebdf4367 100644 --- a/program/steps/mail/get.inc +++ b/program/steps/mail/get.inc @@ -129,4 +129,4 @@ else { header('HTTP/1.1 404 Not Found'); exit; -?> + diff --git a/program/steps/mail/getunread.inc b/program/steps/mail/getunread.inc index 625e3dc68..af927fc00 100644 --- a/program/steps/mail/getunread.inc +++ b/program/steps/mail/getunread.inc @@ -42,4 +42,4 @@ if (!empty($a_folders)) $OUTPUT->send(); -?> + diff --git a/program/steps/mail/headers.inc b/program/steps/mail/headers.inc index aa1065531..5d071cc08 100644 --- a/program/steps/mail/headers.inc +++ b/program/steps/mail/headers.inc @@ -47,4 +47,4 @@ if ($uid = get_input_value('_uid', RCUBE_INPUT_POST)) exit; -?> + diff --git a/program/steps/mail/list.inc b/program/steps/mail/list.inc index cf3855169..69d03b3bf 100644 --- a/program/steps/mail/list.inc +++ b/program/steps/mail/list.inc @@ -102,5 +102,4 @@ else // send response $OUTPUT->send(); -?> diff --git a/program/steps/mail/mark.inc b/program/steps/mail/mark.inc index 973ce687e..6d102aff7 100644 --- a/program/steps/mail/mark.inc +++ b/program/steps/mail/mark.inc @@ -123,4 +123,4 @@ if (($uids = get_input_value('_uid', RCUBE_INPUT_POST)) && ($flag = get_input_va } exit; -?> + diff --git a/program/steps/mail/move_del.inc b/program/steps/mail/move_del.inc index 11eb24227..3947ad123 100644 --- a/program/steps/mail/move_del.inc +++ b/program/steps/mail/move_del.inc @@ -135,4 +135,4 @@ else // send response $OUTPUT->send(); -?> + diff --git a/program/steps/mail/search.inc b/program/steps/mail/search.inc index 52469952a..e512e79b3 100644 --- a/program/steps/mail/search.inc +++ b/program/steps/mail/search.inc @@ -134,4 +134,4 @@ $OUTPUT->set_env('pagecount', ceil($count/$IMAP->page_size)); $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($count, 1)); $OUTPUT->send(); -?> + diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc index e229234c1..91f374cea 100644 --- a/program/steps/mail/sendmail.inc +++ b/program/steps/mail/sendmail.inc @@ -695,4 +695,4 @@ else $OUTPUT->send('iframe'); } -?> + diff --git a/program/steps/mail/sendmdn.inc b/program/steps/mail/sendmdn.inc index ba6d37f0c..880c5c578 100644 --- a/program/steps/mail/sendmdn.inc +++ b/program/steps/mail/sendmdn.inc @@ -40,5 +40,3 @@ else { } $OUTPUT->send(); - -?>
\ No newline at end of file diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc index 71cbf7086..69b30eb4d 100644 --- a/program/steps/mail/show.inc +++ b/program/steps/mail/show.inc @@ -228,4 +228,4 @@ if ($MESSAGE && $MESSAGE->headers && !$MESSAGE->headers->seen && exit; -?> + diff --git a/program/steps/mail/viewsource.inc b/program/steps/mail/viewsource.inc index 2e2228ab6..a110238d9 100644 --- a/program/steps/mail/viewsource.inc +++ b/program/steps/mail/viewsource.inc @@ -56,4 +56,4 @@ else } exit; -?> + diff --git a/program/steps/settings/delete_identity.inc b/program/steps/settings/delete_identity.inc index 3d8e2420b..a62a0524e 100644 --- a/program/steps/settings/delete_identity.inc +++ b/program/steps/settings/delete_identity.inc @@ -49,4 +49,4 @@ if ($OUTPUT->ajax_call) // go to identities page rcmail_overwrite_action('identities'); -?> + diff --git a/program/steps/settings/edit_identity.inc b/program/steps/settings/edit_identity.inc index d0f3581d4..e46d98eb1 100644 --- a/program/steps/settings/edit_identity.inc +++ b/program/steps/settings/edit_identity.inc @@ -135,4 +135,4 @@ if ($RCMAIL->action=='add-identity' && $OUTPUT->template_exists('addidentity')) $OUTPUT->send('editidentity'); -?> + diff --git a/program/steps/settings/edit_prefs.inc b/program/steps/settings/edit_prefs.inc index 06ae250b3..b5fd0b95b 100644 --- a/program/steps/settings/edit_prefs.inc +++ b/program/steps/settings/edit_prefs.inc @@ -55,7 +55,7 @@ function rcmail_user_prefs_form($attrib) $out .= html::tag('fieldset', null, html::tag('legend', null, $block['name']) . $table->show($attrib)); } } - + return $out . $form_end; } @@ -75,4 +75,4 @@ $OUTPUT->add_handlers(array( $OUTPUT->send('settingsedit'); -?> + diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc index f22cad8ef..d71714b64 100644 --- a/program/steps/settings/func.inc +++ b/program/steps/settings/func.inc @@ -729,4 +729,3 @@ $OUTPUT->add_handlers(array( 'identitieslist' => 'rcmail_identities_list', )); -?> diff --git a/program/steps/settings/identities.inc b/program/steps/settings/identities.inc index e480f367e..ca332da15 100644 --- a/program/steps/settings/identities.inc +++ b/program/steps/settings/identities.inc @@ -45,4 +45,3 @@ $OUTPUT->add_handler('identityframe', 'rcmail_identity_frame'); $OUTPUT->set_env('identities_level', IDENTITIES_LEVEL); $OUTPUT->send('identities'); -?>
\ No newline at end of file diff --git a/program/steps/settings/manage_folders.inc b/program/steps/settings/manage_folders.inc index 54dd0bd92..e3231ac28 100644 --- a/program/steps/settings/manage_folders.inc +++ b/program/steps/settings/manage_folders.inc @@ -427,4 +427,4 @@ $OUTPUT->add_handlers(array( $OUTPUT->add_label('deletefolderconfirm','addsubfolderhint','forbiddencharacter','folderdeleting','folderrenaming','foldercreating','foldermoving'); $OUTPUT->send('managefolders'); -?> + diff --git a/program/steps/settings/save_identity.inc b/program/steps/settings/save_identity.inc index d36114cd0..ea8c3b13d 100644 --- a/program/steps/settings/save_identity.inc +++ b/program/steps/settings/save_identity.inc @@ -123,4 +123,4 @@ if ($default_id) // go to next step rcmail_overwrite_action('identities'); -?> + diff --git a/program/steps/settings/save_prefs.inc b/program/steps/settings/save_prefs.inc index 215ec44e8..dd304861d 100644 --- a/program/steps/settings/save_prefs.inc +++ b/program/steps/settings/save_prefs.inc @@ -160,4 +160,4 @@ if ($USER->save_prefs($a_user_prefs)) // display the form again rcmail_overwrite_action('edit-prefs'); -?> + diff --git a/program/steps/utils/error.inc b/program/steps/utils/error.inc index 364c953e7..083a256fd 100644 --- a/program/steps/utils/error.inc +++ b/program/steps/utils/error.inc @@ -126,4 +126,4 @@ $__page_content EOF; exit; -?> + diff --git a/program/steps/utils/html2text.inc b/program/steps/utils/html2text.inc index ff2b40e6b..2327f7f93 100644 --- a/program/steps/utils/html2text.inc +++ b/program/steps/utils/html2text.inc @@ -25,4 +25,4 @@ header('Content-Type: text/plain; charset=UTF-8'); print trim($converter->get_text()); exit; -?> + diff --git a/program/steps/utils/killcache.inc b/program/steps/utils/killcache.inc index a2e7b3e25..b49d36cb8 100644 --- a/program/steps/utils/killcache.inc +++ b/program/steps/utils/killcache.inc @@ -49,4 +49,4 @@ if (PEAR::isError($res)) { echo "Cache cleared\n"; exit; -?> + diff --git a/program/steps/utils/modcss.inc b/program/steps/utils/modcss.inc index 2224901ac..00d943352 100644 --- a/program/steps/utils/modcss.inc +++ b/program/steps/utils/modcss.inc @@ -95,4 +95,4 @@ header('HTTP/1.0 404 Not Found'); echo $error; exit; -?> + diff --git a/program/steps/utils/spell.inc b/program/steps/utils/spell.inc index dab56956b..d0fbcb9e4 100644 --- a/program/steps/utils/spell.inc +++ b/program/steps/utils/spell.inc @@ -25,4 +25,4 @@ if ($spell_engine = $RCMAIL->config->get('spellcheck_engine', 'googie')) { header('HTTP/1.1 404 Not Found'); exit; -?> + diff --git a/program/steps/utils/spell_googie.inc b/program/steps/utils/spell_googie.inc index ec60f48f0..038559c3f 100644 --- a/program/steps/utils/spell_googie.inc +++ b/program/steps/utils/spell_googie.inc @@ -70,4 +70,4 @@ header("Content-Type: text/xml; charset=".RCMAIL_CHARSET); print $store; exit; -?> + diff --git a/program/steps/utils/spell_pspell.inc b/program/steps/utils/spell_pspell.inc index f892f8963..2c9c2333c 100644 --- a/program/steps/utils/spell_pspell.inc +++ b/program/steps/utils/spell_pspell.inc @@ -75,4 +75,4 @@ header("Content-Type: text/xml; charset=".RCMAIL_CHARSET); echo $out; exit; -?> + |