From 58b8aae770b8eb01d6638a3f45361b46a59acc41 Mon Sep 17 00:00:00 2001 From: cimorrison Date: Thu, 21 Nov 2013 10:48:22 +0000 Subject: [PATCH] Removed closing PHP tags (?>) at the ends of files as they are unnecessary and can cause problems with unexpected output (eg see SF Bugs #288) git-svn-id: http://svn.code.sf.net/p/mrbs/code/mrbs/trunk@2784 25f7e783-145e-4f2d-a9f8-dd7182bfe9c7 --- convert_db_to_utf8.php | 1 - testdata.php | 1 - web/Blowfish.php | 1 - web/Blowfish/DefaultKey.php | 1 - web/File/Passwd.php | 2 +- web/File/Passwd/Authbasic.php | 1 - web/File/Passwd/Authdigest.php | 1 - web/File/Passwd/Common.php | 1 - web/File/Passwd/Custom.php | 1 - web/File/Passwd/Cvs.php | 1 - web/File/Passwd/Smb.php | 2 +- web/File/Passwd/Unix.php | 1 - web/PEAR.php | 2 +- web/Themes/classic126/styling.inc | 1 - web/Themes/default/header.inc | 2 +- web/Themes/default/styling.inc | 1 - web/add.php | 1 + web/admin.php | 2 +- web/approve_entry_handler.php | 1 - web/auth/auth_auth_basic.inc | 1 - web/auth/auth_config.inc | 1 - web/auth/auth_crypt.inc | 1 - web/auth/auth_db.inc | 1 - web/auth/auth_db_ext.inc | 1 - web/auth/auth_ext.inc | 1 - web/auth/auth_imap.inc | 1 - web/auth/auth_imap_php.inc | 1 - web/auth/auth_ldap.inc | 1 - web/auth/auth_nis.inc | 1 - web/auth/auth_none.inc | 1 - web/auth/auth_nw.inc | 1 - web/auth/auth_pop3.inc | 1 - web/auth/auth_smtp.inc | 1 - web/check_slot_ajax.php | 2 +- web/config.inc.php | 1 - web/day.php | 1 - web/defaultincludes.inc | 1 - web/del.php | 1 - web/del_entry.php | 2 +- web/del_entry_ajax.php | 2 +- web/edit_area_room.php | 2 +- web/edit_entry.php | 4 +++- web/edit_entry_handler.php | 2 +- web/edit_users.php | 1 - web/escapeshellarg.inc | 1 - web/functions.inc | 2 +- web/functions_ical.inc | 2 -- web/functions_mail.inc | 2 +- web/functions_view.inc | 1 - web/grab_globals.inc.php | 2 +- web/help.php | 2 +- web/import.php | 2 +- web/index.php | 1 - web/internalconfig.inc.php | 1 - web/js/refresh.js.php | 1 - web/lang/lang.ca | 1 - web/lang/lang.cs | 2 +- web/lang/lang.da | 1 - web/lang/lang.de | 2 +- web/lang/lang.el | 1 - web/lang/lang.en | 2 +- web/lang/lang.es | 2 +- web/lang/lang.eu | 1 - web/lang/lang.fi | 2 +- web/lang/lang.fr | 2 +- web/lang/lang.he | 1 - web/lang/lang.hu | 2 +- web/lang/lang.it | 1 - web/lang/lang.ja | 2 +- web/lang/lang.ko | 1 - web/lang/lang.nl | 1 - web/lang/lang.no | 1 - web/lang/lang.pt | 1 - web/lang/lang.pt-br | 1 - web/lang/lang.ru | 1 - web/lang/lang.sl | 2 -- web/lang/lang.sr-rs-latin | 4 ++-- web/lang/lang.sv | 2 +- web/lang/lang.th | 3 ++- web/lang/lang.tr | 1 - web/lang/lang.zh-cn | 1 - web/lang/lang.zh-tw | 1 - web/language.inc | 1 - web/mincals.inc | 2 +- web/month.php | 2 +- web/mrbs_auth.inc | 2 +- web/mrbs_sql.inc | 1 - web/mysql.inc | 1 - web/mysqli.inc | 1 - web/pending.php | 2 +- web/pgsql.inc | 1 - web/record_activity_ajax.php | 2 -- web/report.php | 2 +- web/search.php | 2 +- web/session/session_cookie.inc | 1 - web/session/session_host.inc | 1 - web/session/session_http.inc | 2 +- web/session/session_ip.inc | 1 - web/session/session_nt.inc | 1 - web/session/session_omni.inc | 1 - web/session/session_php.inc | 2 +- web/session/session_remote_user.inc | 1 - web/standard_vars.inc.php | 2 -- web/style.inc | 2 +- web/systemdefaults.inc.php | 1 - web/theme.inc | 1 - web/trailer.inc | 1 - web/upgrade.inc | 1 - web/upgrade/13/post.inc | 1 - web/upgrade/15/post.inc | 1 - web/upgrade/16/post.inc | 1 - web/upgrade/17/post.inc | 1 - web/upgrade/2/post.inc | 1 - web/upgrade/21/post.inc | 1 - web/upgrade/24/post.inc | 1 - web/upgrade/32/post.inc | 2 +- web/upgrade/34/post.inc | 1 - web/upgrade/4/post.inc | 1 - web/upgrade/5/post.inc | 1 - web/upgrade/6/post.inc | 1 - web/upgrade/7/post.inc | 1 - web/upgrade/8/post.inc | 1 - web/version.inc | 1 - web/view_entry.php | 2 +- web/week.php | 2 +- 125 files changed, 44 insertions(+), 129 deletions(-) diff --git a/convert_db_to_utf8.php b/convert_db_to_utf8.php index 4c098cdf..b94bb0ea 100644 --- a/convert_db_to_utf8.php +++ b/convert_db_to_utf8.php @@ -408,4 +408,3 @@ function convert_one_db($db) } // end of if ($alterdatabasecharset) } // end of function convert_one_db() -?> diff --git a/testdata.php b/testdata.php index fe162a18..1c66c4e3 100644 --- a/testdata.php +++ b/testdata.php @@ -77,4 +77,3 @@ } } -?> diff --git a/web/Blowfish.php b/web/Blowfish.php index a7b8948f..29634072 100644 --- a/web/Blowfish.php +++ b/web/Blowfish.php @@ -314,4 +314,3 @@ function setKey($key) } -?> diff --git a/web/Blowfish/DefaultKey.php b/web/Blowfish/DefaultKey.php index 2ff8ac78..f3bbef06 100644 --- a/web/Blowfish/DefaultKey.php +++ b/web/Blowfish/DefaultKey.php @@ -324,4 +324,3 @@ function Crypt_Blowfish_DefaultKey() } -?> diff --git a/web/File/Passwd.php b/web/File/Passwd.php index 1b2d3a6e..909e0d7f 100644 --- a/web/File/Passwd.php +++ b/web/File/Passwd.php @@ -413,4 +413,4 @@ function staticAuth($type, $file, $user, $pass, $opt = '') return call_user_func($func, $file, $user, $pass, $opt); } } -?> + diff --git a/web/File/Passwd/Authbasic.php b/web/File/Passwd/Authbasic.php index 599e400e..3fea047b 100644 --- a/web/File/Passwd/Authbasic.php +++ b/web/File/Passwd/Authbasic.php @@ -393,4 +393,3 @@ function generatePassword($pass, $mode = FILE_PASSWD_DES, $salt = null) return File_Passwd_Authbasic::generatePasswd($pass, $mode, $salt); } } -?> \ No newline at end of file diff --git a/web/File/Passwd/Authdigest.php b/web/File/Passwd/Authdigest.php index 2eaa9955..0e17803f 100644 --- a/web/File/Passwd/Authdigest.php +++ b/web/File/Passwd/Authdigest.php @@ -359,4 +359,3 @@ function generatePassword($user, $realm, $pass) return File_Passwd_Authdigest::generatePasswd($user, $realm, $pass); } } -?> \ No newline at end of file diff --git a/web/File/Passwd/Common.php b/web/File/Passwd/Common.php index b2a07d29..0b8eb6db 100644 --- a/web/File/Passwd/Common.php +++ b/web/File/Passwd/Common.php @@ -379,4 +379,3 @@ function _auth($file, $id, $sep = ':') return false; } } -?> \ No newline at end of file diff --git a/web/File/Passwd/Custom.php b/web/File/Passwd/Custom.php index 49ddbaad..7ab4be2c 100644 --- a/web/File/Passwd/Custom.php +++ b/web/File/Passwd/Custom.php @@ -590,4 +590,3 @@ function _genPass($pass, $salt = null, $func = null) return $return; } } -?> \ No newline at end of file diff --git a/web/File/Passwd/Cvs.php b/web/File/Passwd/Cvs.php index 026f42da..9ba0845b 100644 --- a/web/File/Passwd/Cvs.php +++ b/web/File/Passwd/Cvs.php @@ -301,4 +301,3 @@ function generatePassword($pass, $salt = null) return File_Passwd_Cvs::generatePasswd($pass, $salt); } } -?> \ No newline at end of file diff --git a/web/File/Passwd/Smb.php b/web/File/Passwd/Smb.php index 2e2303df..6b8b598c 100644 --- a/web/File/Passwd/Smb.php +++ b/web/File/Passwd/Smb.php @@ -423,4 +423,4 @@ function generatePassword($pass, $mode = 'nt') return File_Passwd_Smb::generatePasswd($pass, $mode); } } -?> + diff --git a/web/File/Passwd/Unix.php b/web/File/Passwd/Unix.php index 24b1fc6d..e35c2a91 100644 --- a/web/File/Passwd/Unix.php +++ b/web/File/Passwd/Unix.php @@ -657,4 +657,3 @@ function generatePassword($pass, $mode = FILE_PASSWD_MD5, $salt = null) } } -?> \ No newline at end of file diff --git a/web/PEAR.php b/web/PEAR.php index 39089f68..77586a0f 100644 --- a/web/PEAR.php +++ b/web/PEAR.php @@ -972,4 +972,4 @@ function toString() { * c-basic-offset: 4 * End: */ -?> + diff --git a/web/Themes/classic126/styling.inc b/web/Themes/classic126/styling.inc index 8d67e613..61d14241 100644 --- a/web/Themes/classic126/styling.inc +++ b/web/Themes/classic126/styling.inc @@ -103,4 +103,3 @@ $main_cell_height = '17'; // (px) height of the cells in the main d // ***** FONTS ************************ $standard_font_family = "Arial, 'Arial Unicode MS', Verdana, sans-serif"; -?> diff --git a/web/Themes/default/header.inc b/web/Themes/default/header.inc index 45cffe06..b925ce00 100644 --- a/web/Themes/default/header.inc +++ b/web/Themes/default/header.inc @@ -250,4 +250,4 @@ function print_theme_header($day, $month, $year, $area, $room) + diff --git a/web/Themes/default/styling.inc b/web/Themes/default/styling.inc index b0e52965..7f01001c 100644 --- a/web/Themes/default/styling.inc +++ b/web/Themes/default/styling.inc @@ -106,4 +106,3 @@ $main_cell_height = '17'; // (px) height of the cells in the main d // ***** FONTS ************************ $standard_font_family = "Arial, 'Arial Unicode MS', Verdana, sans-serif"; -?> diff --git a/web/add.php b/web/add.php index 7c523f26..f2e55ad9 100644 --- a/web/add.php +++ b/web/add.php @@ -38,3 +38,4 @@ $returl = "admin.php?area=$area" . (!empty($error) ? "&error=$error" : ""); header("Location: $returl"); + diff --git a/web/admin.php b/web/admin.php index 998f0810..448b11ca 100644 --- a/web/admin.php +++ b/web/admin.php @@ -433,4 +433,4 @@ } output_trailer(); -?> \ No newline at end of file + diff --git a/web/approve_entry_handler.php b/web/approve_entry_handler.php index 0891d6ff..e1086ad6 100644 --- a/web/approve_entry_handler.php +++ b/web/approve_entry_handler.php @@ -109,4 +109,3 @@ header("Location: $returl"); exit; -?> diff --git a/web/auth/auth_auth_basic.inc b/web/auth/auth_auth_basic.inc index 632aa725..eb430b75 100644 --- a/web/auth/auth_auth_basic.inc +++ b/web/auth/auth_auth_basic.inc @@ -106,4 +106,3 @@ function authGetUserLevel($user) return 1; } -?> diff --git a/web/auth/auth_config.inc b/web/auth/auth_config.inc index d03f4596..fcd9ca6a 100644 --- a/web/auth/auth_config.inc +++ b/web/auth/auth_config.inc @@ -85,4 +85,3 @@ function authGetUserLevel($user) return 1; } -?> diff --git a/web/auth/auth_crypt.inc b/web/auth/auth_crypt.inc index ecd8ce28..4a083eaa 100644 --- a/web/auth/auth_crypt.inc +++ b/web/auth/auth_crypt.inc @@ -101,4 +101,3 @@ function authGetUserLevel($user) return 1; } -?> diff --git a/web/auth/auth_db.inc b/web/auth/auth_db.inc index c4c0bdf1..ef0d6155 100644 --- a/web/auth/auth_db.inc +++ b/web/auth/auth_db.inc @@ -94,4 +94,3 @@ function authGetUserLevel($user) return $result; } -?> diff --git a/web/auth/auth_db_ext.inc b/web/auth/auth_db_ext.inc index 4a134dce..a4b1819e 100644 --- a/web/auth/auth_db_ext.inc +++ b/web/auth/auth_db_ext.inc @@ -147,4 +147,3 @@ function authGetUserLevel($user) return 1; } -?> diff --git a/web/auth/auth_ext.inc b/web/auth/auth_ext.inc index bea40219..d1ca73c3 100644 --- a/web/auth/auth_ext.inc +++ b/web/auth/auth_ext.inc @@ -120,4 +120,3 @@ function authGetUserLevel($user) return 1; } -?> diff --git a/web/auth/auth_imap.inc b/web/auth/auth_imap.inc index 9d15caf7..d9d02ad9 100644 --- a/web/auth/auth_imap.inc +++ b/web/auth/auth_imap.inc @@ -160,4 +160,3 @@ function authGetUserLevel($user) return 1; } -?> diff --git a/web/auth/auth_imap_php.inc b/web/auth/auth_imap_php.inc index 616d4118..0633b0e0 100644 --- a/web/auth/auth_imap_php.inc +++ b/web/auth/auth_imap_php.inc @@ -110,4 +110,3 @@ function authGetUserLevel($user) return 1; } -?> diff --git a/web/auth/auth_ldap.inc b/web/auth/auth_ldap.inc index f2564f89..5a43fb99 100644 --- a/web/auth/auth_ldap.inc +++ b/web/auth/auth_ldap.inc @@ -512,4 +512,3 @@ function authLdapDebug($message) } } -?> diff --git a/web/auth/auth_nis.inc b/web/auth/auth_nis.inc index 30b242a8..62dfd956 100644 --- a/web/auth/auth_nis.inc +++ b/web/auth/auth_nis.inc @@ -99,4 +99,3 @@ function authGetUserLevel($user) return 1; } -?> diff --git a/web/auth/auth_none.inc b/web/auth/auth_none.inc index 44435083..ed53235f 100644 --- a/web/auth/auth_none.inc +++ b/web/auth/auth_none.inc @@ -67,4 +67,3 @@ function authGetUserLevel($user) return 1; } -?> diff --git a/web/auth/auth_nw.inc b/web/auth/auth_nw.inc index 7fd1a107..e98ff299 100644 --- a/web/auth/auth_nw.inc +++ b/web/auth/auth_nw.inc @@ -80,4 +80,3 @@ function authGetUserLevel($user) return 1; } -?> diff --git a/web/auth/auth_pop3.inc b/web/auth/auth_pop3.inc index 11400b77..7b08ac5c 100644 --- a/web/auth/auth_pop3.inc +++ b/web/auth/auth_pop3.inc @@ -187,4 +187,3 @@ function authGetUserLevel($user) return 1; } -?> diff --git a/web/auth/auth_smtp.inc b/web/auth/auth_smtp.inc index 3cb0e869..6dabc10d 100644 --- a/web/auth/auth_smtp.inc +++ b/web/auth/auth_smtp.inc @@ -101,4 +101,3 @@ function authGetUserLevel($user) return 1; } -?> diff --git a/web/check_slot_ajax.php b/web/check_slot_ajax.php index cd9d6149..240f6bd9 100644 --- a/web/check_slot_ajax.php +++ b/web/check_slot_ajax.php @@ -36,4 +36,4 @@ } echo json_encode($result); -?> \ No newline at end of file + diff --git a/web/config.inc.php b/web/config.inc.php index 8a41133b..1bc47743 100644 --- a/web/config.inc.php +++ b/web/config.inc.php @@ -59,4 +59,3 @@ or areadefaults.inc.php. */ -?> diff --git a/web/day.php b/web/day.php index 977efaa8..e501f19c 100644 --- a/web/day.php +++ b/web/day.php @@ -125,4 +125,3 @@ output_trailer(); -?> diff --git a/web/defaultincludes.inc b/web/defaultincludes.inc index aad9b743..8bc7f99f 100644 --- a/web/defaultincludes.inc +++ b/web/defaultincludes.inc @@ -19,4 +19,3 @@ require_once "dbsys.inc"; require_once "mrbs_auth.inc"; require "standard_vars.inc.php"; -?> \ No newline at end of file diff --git a/web/del.php b/web/del.php index 4992486c..143b58a3 100644 --- a/web/del.php +++ b/web/del.php @@ -100,4 +100,3 @@ } } -?> diff --git a/web/del_entry.php b/web/del_entry.php index 3e92f070..e19e6f98 100644 --- a/web/del_entry.php +++ b/web/del_entry.php @@ -111,4 +111,4 @@ // If you got this far then we got an access denied. showAccessDenied($day, $month, $year, $area, ""); -?> + diff --git a/web/del_entry_ajax.php b/web/del_entry_ajax.php index 9dc2ff07..80fb4513 100644 --- a/web/del_entry_ajax.php +++ b/web/del_entry_ajax.php @@ -69,4 +69,4 @@ echo $result; -?> \ No newline at end of file + diff --git a/web/edit_area_room.php b/web/edit_area_room.php index fec36498..036657ea 100644 --- a/web/edit_area_room.php +++ b/web/edit_area_room.php @@ -1241,4 +1241,4 @@ function create_field_entry_timezone() } output_trailer(); -?> + diff --git a/web/edit_entry.php b/web/edit_entry.php index c606cd81..460e3799 100644 --- a/web/edit_entry.php +++ b/web/edit_entry.php @@ -1412,4 +1412,6 @@ function create_field_entry_custom_field($field, $key, $disabled=FALSE) - +\n"; output_trailer(); -?> + diff --git a/web/edit_users.php b/web/edit_users.php index 80e511b5..e42f521a 100644 --- a/web/edit_users.php +++ b/web/edit_users.php @@ -920,4 +920,3 @@ function output_row(&$row) output_trailer(); } -?> diff --git a/web/escapeshellarg.inc b/web/escapeshellarg.inc index 41d80e85..8a46b80d 100644 --- a/web/escapeshellarg.inc +++ b/web/escapeshellarg.inc @@ -12,4 +12,3 @@ function escapeshellarg($x) return "'".preg_replace("/'/", "\\'", $x)."'"; } -?> diff --git a/web/functions.inc b/web/functions.inc index 94640312..e57d6601 100644 --- a/web/functions.inc +++ b/web/functions.inc @@ -2554,4 +2554,4 @@ function is_cli() return FALSE; } } -?> + diff --git a/web/functions_ical.inc b/web/functions_ical.inc index 0c8711cf..a6c5e0d5 100644 --- a/web/functions_ical.inc +++ b/web/functions_ical.inc @@ -1221,5 +1221,3 @@ function export_icalendar(&$res, $keep_private, $export_end=PHP_INT_MAX) echo $icalendar; } - -?> diff --git a/web/functions_mail.inc b/web/functions_mail.inc index bf53752c..96b9b2c1 100644 --- a/web/functions_mail.inc +++ b/web/functions_mail.inc @@ -1321,4 +1321,4 @@ function sendMail($addresses, $subject, $text_body, $html_body, $attachment, $ch } // }}} -?> + diff --git a/web/functions_view.inc b/web/functions_view.inc index 0eb7256e..68de8001 100644 --- a/web/functions_view.inc +++ b/web/functions_view.inc @@ -247,4 +247,3 @@ function create_details_body($data, $as_html=FALSE, $keep_private=FALSE, $room_d return $tbody; } -?> \ No newline at end of file diff --git a/web/grab_globals.inc.php b/web/grab_globals.inc.php index 6d0f3e48..9bbfe821 100644 --- a/web/grab_globals.inc.php +++ b/web/grab_globals.inc.php @@ -231,4 +231,4 @@ function get_form_var($variable, $type = 'string') $cli_params = array_merge($cli_params, $param); } } -?> + diff --git a/web/help.php b/web/help.php index f9c8188b..ae79ffc5 100644 --- a/web/help.php +++ b/web/help.php @@ -37,4 +37,4 @@ require_once "site_faq/site_faq" . $faqfilelang . ".html"; output_trailer(); -?> + diff --git a/web/import.php b/web/import.php index aacb46d4..b1c0a861 100644 --- a/web/import.php +++ b/web/import.php @@ -562,4 +562,4 @@ function process_event($vevent) echo "\n"; output_trailer(); -?> \ No newline at end of file + diff --git a/web/index.php b/web/index.php index 70d85901..8a0e927d 100644 --- a/web/index.php +++ b/web/index.php @@ -26,4 +26,3 @@ header("Location: $redirect_str"); -?> \ No newline at end of file diff --git a/web/internalconfig.inc.php b/web/internalconfig.inc.php index d1f2a669..f8473717 100644 --- a/web/internalconfig.inc.php +++ b/web/internalconfig.inc.php @@ -398,4 +398,3 @@ error_reporting ($error_level); -?> \ No newline at end of file diff --git a/web/js/refresh.js.php b/web/js/refresh.js.php index 9c36d44d..bf8f1b86 100644 --- a/web/js/refresh.js.php +++ b/web/js/refresh.js.php @@ -144,4 +144,3 @@ function(result){ }; \ No newline at end of file diff --git a/web/lang/lang.ca b/web/lang/lang.ca index 7160eb80..2bebabf5 100644 --- a/web/lang/lang.ca +++ b/web/lang/lang.ca @@ -228,4 +228,3 @@ $vocab["failed_connect_db"] = "Error Fatal: Fallada al conectar a la base de da $vocab["type.I"] = "Intern"; $vocab["type.E"] = "Extern"; -?> diff --git a/web/lang/lang.cs b/web/lang/lang.cs index 0384863c..7d3a8975 100644 --- a/web/lang/lang.cs +++ b/web/lang/lang.cs @@ -504,4 +504,4 @@ // General $vocab["fatal_db_error"] = "Závažná chyba: databáze bohužel není momentálně dostupná."; $vocab["back"] = "Zpět"; -?> + diff --git a/web/lang/lang.da b/web/lang/lang.da index 5a4f7755..88f3535b 100644 --- a/web/lang/lang.da +++ b/web/lang/lang.da @@ -228,4 +228,3 @@ $vocab["failed_connect_db"] = "Fatal fejl: kunne ikke forbinde til databasen"; $vocab["type.I"] = "Internt"; $vocab["type.E"] = "Eksternt"; -?> diff --git a/web/lang/lang.de b/web/lang/lang.de index 0578da50..9d36da1e 100644 --- a/web/lang/lang.de +++ b/web/lang/lang.de @@ -504,4 +504,4 @@ $vocab["type.E"] = "Extern"; // General $vocab["fatal_db_error"] = "Fataler Fehler: Leider steht die Datenbank im Moment nicht zur Verfügung."; $vocab["back"] = "Zurück"; -?> + diff --git a/web/lang/lang.el b/web/lang/lang.el index 45a72155..139290a2 100644 --- a/web/lang/lang.el +++ b/web/lang/lang.el @@ -227,4 +227,3 @@ $vocab["failed_connect_db"] = "Κρίσιμο σφάλμα: Αποτυχία σ $vocab["type.I"] = "Εσωτερικά"; $vocab["type.E"] = "Εξωτερικά"; -?> diff --git a/web/lang/lang.en b/web/lang/lang.en index 60e4a70d..6fbee93b 100644 --- a/web/lang/lang.en +++ b/web/lang/lang.en @@ -504,4 +504,4 @@ $vocab["type.E"] = "External"; // General $vocab["fatal_db_error"] = "Fatal error: unfortunately the database is not available at the moment."; $vocab["back"] = "Back"; -?> + diff --git a/web/lang/lang.es b/web/lang/lang.es index 9a9bb585..6e4103a8 100644 --- a/web/lang/lang.es +++ b/web/lang/lang.es @@ -396,4 +396,4 @@ $vocab["type.E"] = "Externa"; // General $vocab["fatal_db_error"] = "Error: la base de datos no está disponible en este momento."; -?> + diff --git a/web/lang/lang.eu b/web/lang/lang.eu index 433e6073..aa8bb315 100644 --- a/web/lang/lang.eu +++ b/web/lang/lang.eu @@ -227,4 +227,3 @@ $vocab["failed_connect_db"] = "Errorea: Ezin izan da datubasearekiko konexioa b $vocab["type.I"] = "Arrunta"; $vocab["type.E"] = "Berezia"; -?> diff --git a/web/lang/lang.fi b/web/lang/lang.fi index 0a6beea6..1fdb485e 100644 --- a/web/lang/lang.fi +++ b/web/lang/lang.fi @@ -492,4 +492,4 @@ $vocab["type.E"] = "Ulkoinen"; // General $vocab["fatal_db_error"] = "Virhe: tietokanta ei ole käytettävissä."; $vocab["back"] = "Takaisin"; -?> + diff --git a/web/lang/lang.fr b/web/lang/lang.fr index 95a00fa5..9b151886 100644 --- a/web/lang/lang.fr +++ b/web/lang/lang.fr @@ -399,4 +399,4 @@ $vocab["type.E"] = "Occasionnel"; // General $vocab["back"] = "Retour"; -?> + diff --git a/web/lang/lang.he b/web/lang/lang.he index 557c9ae7..314ef04b 100644 --- a/web/lang/lang.he +++ b/web/lang/lang.he @@ -406,4 +406,3 @@ $vocab["failed_connect_db"] = "תקלה: ההתחברות למערכת נכשל // General $vocab["fatal_db_error"] = "תקלה: המערכת אינה זמינה כרגע. נסה שוב מאוחר יותר."; -?> diff --git a/web/lang/lang.hu b/web/lang/lang.hu index fa671b87..755d1c79 100644 --- a/web/lang/lang.hu +++ b/web/lang/lang.hu @@ -426,4 +426,4 @@ $vocab["type.E"] = "Külső"; // General $vocab["fatal_db_error"] = "Súlyos hiba történt: az adatbázis nem érhető el jelen pillanatban, kérlek, próbáld újra később."; $vocab["back"] = "Vissza"; -?> + diff --git a/web/lang/lang.it b/web/lang/lang.it index 376a8261..6d855dff 100644 --- a/web/lang/lang.it +++ b/web/lang/lang.it @@ -394,4 +394,3 @@ $vocab["restore_original"] = "Ripristina originali"; $vocab["type.I"] = "Interno"; $vocab["type.E"] = "Esterno"; -?> diff --git a/web/lang/lang.ja b/web/lang/lang.ja index 16ae3e16..38e0235d 100644 --- a/web/lang/lang.ja +++ b/web/lang/lang.ja @@ -488,4 +488,4 @@ $vocab["type.E"] = "外部"; // General $vocab["fatal_db_error"] = "致命的なエラー: 残念ながら、データベースは現在利用可能ではありません。"; $vocab["back"] = "戻る"; -?> + diff --git a/web/lang/lang.ko b/web/lang/lang.ko index faa0b0f1..bba814a9 100644 --- a/web/lang/lang.ko +++ b/web/lang/lang.ko @@ -227,4 +227,3 @@ $vocab["failed_connect_db"] = "심각한 에러: 데이터베이스에 접속 $vocab["type.I"] = "내부회의"; $vocab["type.E"] = "외부회의"; -?> diff --git a/web/lang/lang.nl b/web/lang/lang.nl index fff1cd63..f269191a 100644 --- a/web/lang/lang.nl +++ b/web/lang/lang.nl @@ -375,4 +375,3 @@ $vocab["failed_connect_db"] = "Fatale Fout: Verbinding naar database server mis $vocab["type.I"] = "Intern"; $vocab["type.E"] = "Extern"; -?> diff --git a/web/lang/lang.no b/web/lang/lang.no index f7c6f74e..fd9a44ad 100644 --- a/web/lang/lang.no +++ b/web/lang/lang.no @@ -424,4 +424,3 @@ $vocab["type.E"] = "Ekstern"; // General $vocab["fatal_db_error"] = "Fatal feil: beklageligvis er ikke databasen tilgjengelig for øyeblikket."; $vocab["back"] = "Tilbake"; -?> \ No newline at end of file diff --git a/web/lang/lang.pt b/web/lang/lang.pt index f8e0e348..402959e7 100644 --- a/web/lang/lang.pt +++ b/web/lang/lang.pt @@ -374,4 +374,3 @@ $vocab["failed_connect_db"] = "Erro: Failha ao ligar à base de dados"; $vocab["type.I"] = "Interno"; $vocab["type.E"] = "Externo"; -?> diff --git a/web/lang/lang.pt-br b/web/lang/lang.pt-br index b2e64883..14d0ee81 100644 --- a/web/lang/lang.pt-br +++ b/web/lang/lang.pt-br @@ -374,4 +374,3 @@ $vocab["failed_connect_db"] = "Erro: Falha ao ligar à base de dados"; $vocab["type.I"] = "Interno"; $vocab["type.E"] = "Externo"; -?> diff --git a/web/lang/lang.ru b/web/lang/lang.ru index 20a1faee..bdd3485a 100644 --- a/web/lang/lang.ru +++ b/web/lang/lang.ru @@ -402,4 +402,3 @@ $vocab["type.E"] = "Внешний"; // General $vocab["fatal_db_error"] = "Критическая ошибка: к сожалению, база данных не доступна в данный момент."; -?> diff --git a/web/lang/lang.sl b/web/lang/lang.sl index 29614bf5..ca728fda 100644 --- a/web/lang/lang.sl +++ b/web/lang/lang.sl @@ -240,5 +240,3 @@ $vocab["failed_connect_db"] = "NAPAKA: ni se možno povezati v podatkovno bazo" $vocab["type.I"] = "Interno"; $vocab["type.E"] = "Zunanje"; -?> - diff --git a/web/lang/lang.sr-rs-latin b/web/lang/lang.sr-rs-latin index ad1ab606..f38b261d 100644 --- a/web/lang/lang.sr-rs-latin +++ b/web/lang/lang.sr-rs-latin @@ -1,4 +1,4 @@ - + diff --git a/web/lang/lang.sv b/web/lang/lang.sv index 864e7140..f85f1695 100644 --- a/web/lang/lang.sv +++ b/web/lang/lang.sv @@ -492,4 +492,4 @@ $vocab["type.E"] = "Externt"; // General $vocab["fatal_db_error"] = "Fatalt fel: Databasen är inte tillgänglig för tillfället!"; $vocab["back"] = "Tillbaka"; -?> + diff --git a/web/lang/lang.th b/web/lang/lang.th index f30df061..3ec6f065 100644 --- a/web/lang/lang.th +++ b/web/lang/lang.th @@ -411,4 +411,5 @@ $vocab["type.E"] = "ภายนอก"; // General $vocab["fatal_db_error"] = "ข้อผิดพลาดร้ายแรง: น่าเสียดายที่ฐานข้อมูลจะไม่สามารถใช้ได้ในขณะนี้."; $vocab["back"] = "ย้อนกลับ"; -?> + + diff --git a/web/lang/lang.tr b/web/lang/lang.tr index e44e2d65..afa5f14c 100644 --- a/web/lang/lang.tr +++ b/web/lang/lang.tr @@ -425,4 +425,3 @@ $vocab["fatal_db_error"] = "Ciddi Hata: malesef VeriTabanı şu an ayakta de $vocab["type.I"] = "İç"; $vocab["type.E"] = "Dış"; -?> \ No newline at end of file diff --git a/web/lang/lang.zh-cn b/web/lang/lang.zh-cn index e66a24be..366875ae 100644 --- a/web/lang/lang.zh-cn +++ b/web/lang/lang.zh-cn @@ -227,4 +227,3 @@ $vocab["failed_connect_db"] = "Fatal Error: 无法连接数据库"; $vocab["type.I"] = "内部使用"; $vocab["type.E"] = "外部使用"; -?> diff --git a/web/lang/lang.zh-tw b/web/lang/lang.zh-tw index bd7fc6be..d4da13c0 100644 --- a/web/lang/lang.zh-tw +++ b/web/lang/lang.zh-tw @@ -227,4 +227,3 @@ $vocab["failed_connect_db"] = "Fatal Error: 無法連上資料庫"; $vocab["type.I"] = "內部使用"; $vocab["type.E"] = "外部使用"; -?> diff --git a/web/language.inc b/web/language.inc index d0ea5f73..55cff7da 100644 --- a/web/language.inc +++ b/web/language.inc @@ -1410,4 +1410,3 @@ function langs_arsort(&$langs) return TRUE; } -?> diff --git a/web/mincals.inc b/web/mincals.inc index 0369bb76..216e20c3 100644 --- a/web/mincals.inc +++ b/web/mincals.inc @@ -342,4 +342,4 @@ echo "\n"; echo "\n"; } -?> + diff --git a/web/month.php b/web/month.php index c1c34540..feb30147 100644 --- a/web/month.php +++ b/web/month.php @@ -533,4 +533,4 @@ function cmp3($a, $b) } output_trailer(); -?> + diff --git a/web/mrbs_auth.inc b/web/mrbs_auth.inc index adf8cf18..3792bfbd 100644 --- a/web/mrbs_auth.inc +++ b/web/mrbs_auth.inc @@ -231,4 +231,4 @@ function auth_book_admin($user, $room) { return (authGetUserLevel($user) >= 2); } -?> + diff --git a/web/mrbs_sql.inc b/web/mrbs_sql.inc index b2a0ff05..ff9f69b2 100644 --- a/web/mrbs_sql.inc +++ b/web/mrbs_sql.inc @@ -1701,4 +1701,3 @@ function mrbsMakeBookings($bookings, $id=NULL, $just_check=FALSE, $skip=FALSE, $ return $result; } -?> diff --git a/web/mysql.inc b/web/mysql.inc index 0830406a..1fc64350 100644 --- a/web/mysql.inc +++ b/web/mysql.inc @@ -551,4 +551,3 @@ function sql_mysql_close($connection) mysql_close($connection); } -?> diff --git a/web/mysqli.inc b/web/mysqli.inc index 76598969..5656cbc8 100644 --- a/web/mysqli.inc +++ b/web/mysqli.inc @@ -585,4 +585,3 @@ function sql_mysqli_close($connection) mysqli_close($connection); } -?> diff --git a/web/pending.php b/web/pending.php index a3e7e7e8..e33d9579 100644 --- a/web/pending.php +++ b/web/pending.php @@ -291,4 +291,4 @@ function display_entry_row($row) } output_trailer(); -?> + diff --git a/web/pgsql.inc b/web/pgsql.inc index 2eaa029b..03cb99f6 100644 --- a/web/pgsql.inc +++ b/web/pgsql.inc @@ -561,4 +561,3 @@ function sql_pgsql_close($connection) pg_close($connection); } -?> diff --git a/web/record_activity_ajax.php b/web/record_activity_ajax.php index 8c7a02fb..677f21b4 100644 --- a/web/record_activity_ajax.php +++ b/web/record_activity_ajax.php @@ -5,5 +5,3 @@ // this will be picked up and used by the appropriate session file). require "defaultincludes.inc"; - -?> \ No newline at end of file diff --git a/web/report.php b/web/report.php index 64e43426..4baa59e7 100644 --- a/web/report.php +++ b/web/report.php @@ -1572,4 +1572,4 @@ function do_summary(&$count, &$hours, &$room_hash, &$name_hash) { output_trailer(); } -?> + diff --git a/web/search.php b/web/search.php index 804b98f3..828767fa 100644 --- a/web/search.php +++ b/web/search.php @@ -359,4 +359,4 @@ function output_row($row) echo "\n"; output_trailer(); } -?> + diff --git a/web/session/session_cookie.inc b/web/session/session_cookie.inc index 5f84106d..2fc2aff4 100644 --- a/web/session/session_cookie.inc +++ b/web/session/session_cookie.inc @@ -316,4 +316,3 @@ function PrintLogonBox() } } -?> diff --git a/web/session/session_host.inc b/web/session/session_host.inc index 37b524a3..37adfea4 100644 --- a/web/session/session_host.inc +++ b/web/session/session_host.inc @@ -32,4 +32,3 @@ function getUserName() return $remotehostname; } -?> diff --git a/web/session/session_http.inc b/web/session/session_http.inc index 78bf4128..2ffc88ba 100644 --- a/web/session/session_http.inc +++ b/web/session/session_http.inc @@ -125,4 +125,4 @@ function PrintLogonBox() print "" . get_vocab('user_list') . "\n" ; } } -?> + diff --git a/web/session/session_ip.inc b/web/session/session_ip.inc index 8ac91606..a4460635 100644 --- a/web/session/session_ip.inc +++ b/web/session/session_ip.inc @@ -29,4 +29,3 @@ function getUserName() return $REMOTE_ADDR; } -?> diff --git a/web/session/session_nt.inc b/web/session/session_nt.inc index 47feced3..31830011 100644 --- a/web/session/session_nt.inc +++ b/web/session/session_nt.inc @@ -36,4 +36,3 @@ function getUserName() } -?> diff --git a/web/session/session_omni.inc b/web/session/session_omni.inc index 5f02f5de..2800f2e7 100644 --- a/web/session/session_omni.inc +++ b/web/session/session_omni.inc @@ -50,4 +50,3 @@ function getUserName() return $REMOTE_USER; } -?> diff --git a/web/session/session_php.inc b/web/session/session_php.inc index 8123e922..b67731f4 100644 --- a/web/session/session_php.inc +++ b/web/session/session_php.inc @@ -289,4 +289,4 @@ function PrintLogonBox() print "" . get_vocab('user_list') . "\n"; } } -?> + diff --git a/web/session/session_remote_user.inc b/web/session/session_remote_user.inc index f2d419c5..92410276 100644 --- a/web/session/session_remote_user.inc +++ b/web/session/session_remote_user.inc @@ -102,4 +102,3 @@ function PrintLogonBox() } } -?> diff --git a/web/standard_vars.inc.php b/web/standard_vars.inc.php index 8aef3f20..f24d04eb 100644 --- a/web/standard_vars.inc.php +++ b/web/standard_vars.inc.php @@ -47,5 +47,3 @@ } } } - -?> \ No newline at end of file diff --git a/web/style.inc b/web/style.inc index 885963bf..38a0db0f 100644 --- a/web/style.inc +++ b/web/style.inc @@ -67,4 +67,4 @@ if (($refresh_rate != 0) && preg_match("/(day|week|month)\.php/", $PHP_SELF)) echo "\n"; echo ($ajax_capable) ? "\n" : ''; } -?> + diff --git a/web/systemdefaults.inc.php b/web/systemdefaults.inc.php index 3b82b426..02f0d26e 100644 --- a/web/systemdefaults.inc.php +++ b/web/systemdefaults.inc.php @@ -1113,4 +1113,3 @@ // Default description for new bookings $default_description = ""; -?> diff --git a/web/theme.inc b/web/theme.inc index 1a91170d..4aea476f 100644 --- a/web/theme.inc +++ b/web/theme.inc @@ -10,4 +10,3 @@ require_once "config.inc.php"; require_once "Themes/default/styling.inc"; @include_once "Themes/$theme/styling.inc"; // overwrite the default with the specified styling if it exists -?> diff --git a/web/trailer.inc b/web/trailer.inc index ca29a683..fc1791fc 100644 --- a/web/trailer.inc +++ b/web/trailer.inc @@ -218,4 +218,3 @@ function output_trailer() print_footer(FALSE); } -?> diff --git a/web/upgrade.inc b/web/upgrade.inc index d59df87f..e8254388 100644 --- a/web/upgrade.inc +++ b/web/upgrade.inc @@ -95,4 +95,3 @@ function upgrade_database($local, $from, $to, $upgrade_handle) return TRUE; } -?> diff --git a/web/upgrade/13/post.inc b/web/upgrade/13/post.inc index f4d43b99..f05e3058 100644 --- a/web/upgrade/13/post.inc +++ b/web/upgrade/13/post.inc @@ -23,4 +23,3 @@ if ($res == -1) print "Failed to set default values for new columns in area table."; } -?> diff --git a/web/upgrade/15/post.inc b/web/upgrade/15/post.inc index b95a7ce7..54a23859 100644 --- a/web/upgrade/15/post.inc +++ b/web/upgrade/15/post.inc @@ -37,4 +37,3 @@ foreach ($fields as $field) } } -?> \ No newline at end of file diff --git a/web/upgrade/16/post.inc b/web/upgrade/16/post.inc index e5a23549..591c5557 100644 --- a/web/upgrade/16/post.inc +++ b/web/upgrade/16/post.inc @@ -16,4 +16,3 @@ if (sql_command("UPDATE $tbl_area SET enable_periods=$value WHERE enable_periods fatal_error(0, "Error updating table. " . sql_error()); } -?> diff --git a/web/upgrade/17/post.inc b/web/upgrade/17/post.inc index b0ecdee2..d3fdbf47 100644 --- a/web/upgrade/17/post.inc +++ b/web/upgrade/17/post.inc @@ -168,4 +168,3 @@ if ($res == -1) sql_mutex_unlock("$tbl_repeat"); -?> \ No newline at end of file diff --git a/web/upgrade/2/post.inc b/web/upgrade/2/post.inc index ad5eb757..c325b110 100644 --- a/web/upgrade/2/post.inc +++ b/web/upgrade/2/post.inc @@ -24,4 +24,3 @@ if ($res == -1) print "Failed to set default values for new columns in area table."; } -?> diff --git a/web/upgrade/21/post.inc b/web/upgrade/21/post.inc index 677d0901..e7fb83c8 100644 --- a/web/upgrade/21/post.inc +++ b/web/upgrade/21/post.inc @@ -35,4 +35,3 @@ foreach ($fields as $field) } } -?> \ No newline at end of file diff --git a/web/upgrade/24/post.inc b/web/upgrade/24/post.inc index f6047bd6..e6b54f57 100644 --- a/web/upgrade/24/post.inc +++ b/web/upgrade/24/post.inc @@ -217,4 +217,3 @@ if ($display_timing) echo " processed in $clock_diff seconds
\n"; } -?> \ No newline at end of file diff --git a/web/upgrade/32/post.inc b/web/upgrade/32/post.inc index 99eb7ebd..09ae7e36 100644 --- a/web/upgrade/32/post.inc +++ b/web/upgrade/32/post.inc @@ -49,4 +49,4 @@ foreach ($mods as $id => $month_absolute) // Restore the original timezone mrbs_default_timezone_set($old_tz); -?> \ No newline at end of file + diff --git a/web/upgrade/34/post.inc b/web/upgrade/34/post.inc index 783f97c5..16202148 100644 --- a/web/upgrade/34/post.inc +++ b/web/upgrade/34/post.inc @@ -54,4 +54,3 @@ foreach ($mods as $id => $month_relative) // Restore the original timezone mrbs_default_timezone_set($old_tz); -?> \ No newline at end of file diff --git a/web/upgrade/4/post.inc b/web/upgrade/4/post.inc index 8a8afadb..463970dd 100644 --- a/web/upgrade/4/post.inc +++ b/web/upgrade/4/post.inc @@ -26,4 +26,3 @@ if ($res == -1) print "Failed to set default values for new columns in area table."; } -?> diff --git a/web/upgrade/5/post.inc b/web/upgrade/5/post.inc index 2463d25a..ce8a8585 100644 --- a/web/upgrade/5/post.inc +++ b/web/upgrade/5/post.inc @@ -34,4 +34,3 @@ CREATE TABLE $tbl_users } } -?> diff --git a/web/upgrade/6/post.inc b/web/upgrade/6/post.inc index df36dbe0..05ede301 100644 --- a/web/upgrade/6/post.inc +++ b/web/upgrade/6/post.inc @@ -49,4 +49,3 @@ else sql_free($r, $admin_handle); } -?> diff --git a/web/upgrade/7/post.inc b/web/upgrade/7/post.inc index f8b6082d..123ddc80 100644 --- a/web/upgrade/7/post.inc +++ b/web/upgrade/7/post.inc @@ -30,4 +30,3 @@ if (sql_command("UPDATE $tbl_area SET private_override='$private_override' WHERE fatal_error(0, "Error updating table. " . sql_error()); } -?> diff --git a/web/upgrade/8/post.inc b/web/upgrade/8/post.inc index 47ec4a00..dc6863b4 100644 --- a/web/upgrade/8/post.inc +++ b/web/upgrade/8/post.inc @@ -11,4 +11,3 @@ if (sql_command("UPDATE $tbl_room SET sort_key=room_name") < 0) fatal_error(0, "Error updating table. " . sql_error()); } -?> diff --git a/web/version.inc b/web/version.inc index fb74774c..8dac8794 100644 --- a/web/version.inc +++ b/web/version.inc @@ -13,4 +13,3 @@ function get_mrbs_version() return $mrbs_version; } -?> diff --git a/web/view_entry.php b/web/view_entry.php index 319fd063..6f794a27 100644 --- a/web/view_entry.php +++ b/web/view_entry.php @@ -480,4 +480,4 @@ function generateTextArea($form_action, $id, $series, $action_type, $returl, $su + diff --git a/web/week.php b/web/week.php index 08e1caf7..d3184c39 100644 --- a/web/week.php +++ b/web/week.php @@ -115,4 +115,4 @@ } output_trailer(); -?> +