diff --git a/core/conf/i18n/default.php b/core/conf/i18n/default.php
index f320b14ff..9335eafd4 100644
--- a/core/conf/i18n/default.php
+++ b/core/conf/i18n/default.php
@@ -11,6 +11,4 @@
 define('PREFERRED_YEAR_DISPLAY',  '%Y');
 define('PHPWS_DATE_FORMAT',       'm/d/Y');
 define('PHPWS_DAY_START',         0); // 0 = Sunday, 1 = Monday
-define('PHPWS_TIME_DIFF',         0);
-
-?>
\ No newline at end of file
+define('PHPWS_TIME_DIFF',         0);
\ No newline at end of file
diff --git a/javascript/captcha/freecap/verify.php b/javascript/captcha/freecap/verify.php
index 82f31b4ea..62a4298a4 100644
--- a/javascript/captcha/freecap/verify.php
+++ b/javascript/captcha/freecap/verify.php
@@ -44,5 +44,4 @@ function verify($return_value=false)
     } else {
         return false;
     }
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/javascript/check_all/default.php b/javascript/check_all/default.php
index 2618fa03f..7663f3904 100644
--- a/javascript/check_all/default.php
+++ b/javascript/check_all/default.php
@@ -16,5 +16,4 @@
     default:
         $data['input_type'] = 'button';
         break;
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/javascript/flowplayer/default.php b/javascript/flowplayer/default.php
index 336e9177e..fd24579e3 100644
--- a/javascript/flowplayer/default.php
+++ b/javascript/flowplayer/default.php
@@ -1,3 +1,2 @@
 <?php
 javascript('jquery');
-?>
\ No newline at end of file
diff --git a/javascript/js_calendar/default.php b/javascript/js_calendar/default.php
index f448f5bd9..7407c4f6c 100644
--- a/javascript/js_calendar/default.php
+++ b/javascript/js_calendar/default.php
@@ -46,5 +46,3 @@
 }
 
 $data['alt'] = _('Pick date');
-
-?>
\ No newline at end of file
diff --git a/javascript/prompt/default.php b/javascript/prompt/default.php
index 81617569e..e477cb93c 100644
--- a/javascript/prompt/default.php
+++ b/javascript/prompt/default.php
@@ -20,5 +20,3 @@
     $data['answer'] = preg_replace("/([^\\\])'/", "\\1\'", $data['answer']);
     $data['answer'] = str_replace("&#039;", "\\'", $data['answer']);
 }
-
-?>
\ No newline at end of file
diff --git a/mod/access/class/Forms.php b/mod/access/class/Forms.php
index 409b87420..59f23cc51 100644
--- a/mod/access/class/Forms.php
+++ b/mod/access/class/Forms.php
@@ -291,5 +291,3 @@ public static function shortcut_menu()
     }
 
 }
-
-?>
\ No newline at end of file
diff --git a/mod/access/conf/config.php b/mod/access/conf/config.php
index f32cd6ae5..48c2b8efd 100644
--- a/mod/access/conf/config.php
+++ b/mod/access/conf/config.php
@@ -11,4 +11,3 @@
 define('DEFAULT_CONDITION', "RewriteCond %{REQUEST_FILENAME} !-f\nRewriteCond %{REQUEST_FILENAME} !-d");
 define('DEFAULT_REWRITE_1', 'RewriteRule ^([a-z0-9]+)/([a-z0-9]+)/?$ index.php?module=$1&id=$2 [L,NC]');
 define('DEFAULT_REWRITE_2', 'RewriteRule ^([a-z0-9]+)/([a-z0-9]+)/([a-z0-9]+)/?$ index.php?module=$1&id=$2&page=$3 [L,NC]');
-?>
\ No newline at end of file
diff --git a/mod/access/inc/close.php b/mod/access/inc/close.php
index 0cc85cdfd..336253be7 100644
--- a/mod/access/inc/close.php
+++ b/mod/access/inc/close.php
@@ -23,5 +23,3 @@
         Access::shortcut($key);
     }
 }
-
-?>
\ No newline at end of file
diff --git a/mod/addthis/boost/controlpanel.php b/mod/addthis/boost/controlpanel.php
index b136bcce1..e1821f007 100644
--- a/mod/addthis/boost/controlpanel.php
+++ b/mod/addthis/boost/controlpanel.php
@@ -31,4 +31,3 @@
         'tab'           => 'admin'
         );
 
-?>
diff --git a/mod/addthis/class/SettingsView.php b/mod/addthis/class/SettingsView.php
index 87b214862..1886d3211 100644
--- a/mod/addthis/class/SettingsView.php
+++ b/mod/addthis/class/SettingsView.php
@@ -51,4 +51,3 @@ public function show()
     }
 }
 
-?>
diff --git a/mod/block/inc/init.php b/mod/block/inc/init.php
index 66114fd72..cdf3ea7ac 100644
--- a/mod/block/inc/init.php
+++ b/mod/block/inc/init.php
@@ -7,5 +7,3 @@
 \phpws\PHPWS_Core::initModClass('block', 'Block.php');
 require_once PHPWS_SOURCE_DIR . 'mod/block/inc/parse.php';
 PHPWS_Text::addTag('block', 'view');
-
-?>
\ No newline at end of file
diff --git a/mod/blog/boost/uninstall.php b/mod/blog/boost/uninstall.php
index b7bc69b7c..cdc6abdeb 100644
--- a/mod/blog/boost/uninstall.php
+++ b/mod/blog/boost/uninstall.php
@@ -14,5 +14,3 @@ function blog_uninstall(&$content)
     return TRUE;
 }
 
-
-?>
diff --git a/mod/blog/class/Blog_Admin.php b/mod/blog/class/Blog_Admin.php
index 0bac6f8f7..297fb4a1d 100644
--- a/mod/blog/class/Blog_Admin.php
+++ b/mod/blog/class/Blog_Admin.php
@@ -434,4 +434,3 @@ public static function purgeEntries($date)
 
 }
 
-?>
diff --git a/mod/blog/class/Blog_XML.php b/mod/blog/class/Blog_XML.php
index c345d87b2..aa29e565d 100644
--- a/mod/blog/class/Blog_XML.php
+++ b/mod/blog/class/Blog_XML.php
@@ -172,5 +172,3 @@ public function getKeyId($id)
     }
 
 }
-
-?>
\ No newline at end of file
diff --git a/mod/boost/boost/permission.php b/mod/boost/boost/permission.php
index 0a32acf1e..9b6543cbf 100644
--- a/mod/boost/boost/permission.php
+++ b/mod/boost/boost/permission.php
@@ -1,4 +1,3 @@
 <?php
 
 $use_permissions = TRUE;
-?>
\ No newline at end of file
diff --git a/mod/boost/conf/config.php b/mod/boost/conf/config.php
index 2a722b285..cb0f3b484 100644
--- a/mod/boost/conf/config.php
+++ b/mod/boost/conf/config.php
@@ -31,4 +31,3 @@
 define('BOOST_NO_REGISTER_FUNCTION', -7);
 define('BOOST_FAILED_BACKUP', -8);
 define('BOOST_FAILED_LOCAL_COPY', -9);
-?>
\ No newline at end of file
diff --git a/mod/calendar/boost/boost.php b/mod/calendar/boost/boost.php
index e6cedf04f..625cf7ddc 100644
--- a/mod/calendar/boost/boost.php
+++ b/mod/calendar/boost/boost.php
@@ -11,4 +11,4 @@
 $import_sql   = true;
 $about        = true;
 $dependency   = true;
-?>
+
diff --git a/mod/calendar/boost/update.php b/mod/calendar/boost/update.php
index 0d84ae722..8308dfbc2 100644
--- a/mod/calendar/boost/update.php
+++ b/mod/calendar/boost/update.php
@@ -323,5 +323,3 @@ function calendarUpdateFiles($files, &$content) {
     $content[] = '    ' . implode("\n    ", $files);
     $content[] = '';
 }
-
-?>
\ No newline at end of file
diff --git a/mod/calendar/class/Admin.php b/mod/calendar/class/Admin.php
index e7f74d8de..9fc4679c9 100644
--- a/mod/calendar/class/Admin.php
+++ b/mod/calendar/class/Admin.php
@@ -1589,5 +1589,3 @@ public function postBlog()
     }
 
 }
-
-?>
\ No newline at end of file
diff --git a/mod/calendar/inc/error_defines.php b/mod/calendar/inc/error_defines.php
index 4be0ee5c4..3e5493d61 100644
--- a/mod/calendar/inc/error_defines.php
+++ b/mod/calendar/inc/error_defines.php
@@ -8,6 +8,3 @@
 define('CAL_EVENT_TABLE_MISSING', 1);
 define('CAL_REPEAT_LIMIT_PASSED', 2);
 define('CAL_CANNOT_MAKE_EVENT_TABLE', 3);
-
-
-?>
\ No newline at end of file
diff --git a/mod/calendar/inc/runtime.php b/mod/calendar/inc/runtime.php
index e6d658a47..82d8882a0 100644
--- a/mod/calendar/inc/runtime.php
+++ b/mod/calendar/inc/runtime.php
@@ -24,4 +24,3 @@
     }
 }
 
-?>
diff --git a/mod/checkin/boost/uninstall.php b/mod/checkin/boost/uninstall.php
index b72f3ebe9..84dc79e44 100644
--- a/mod/checkin/boost/uninstall.php
+++ b/mod/checkin/boost/uninstall.php
@@ -13,6 +13,3 @@ function checkin_uninstall(&$content)
     PHPWS_DB::dropTable('checkin_rtos');
     return true;
 }
-
-
-?>
\ No newline at end of file
diff --git a/mod/checkin/class/Checkin.php b/mod/checkin/class/Checkin.php
index 74bf00e6d..93ce510e5 100644
--- a/mod/checkin/class/Checkin.php
+++ b/mod/checkin/class/Checkin.php
@@ -280,4 +280,4 @@ public static function timeWaiting($rel)
     }
 
 }
-?>
+
diff --git a/mod/checkin/class/Checkin_User.php b/mod/checkin/class/Checkin_User.php
index 0140156cb..9dce5e8e1 100644
--- a/mod/checkin/class/Checkin_User.php
+++ b/mod/checkin/class/Checkin_User.php
@@ -178,4 +178,3 @@ public function postCheckin()
 
 }
 
-?>
diff --git a/mod/checkin/inc/runtime.php b/mod/checkin/inc/runtime.php
index 2dd154812..37ca92015 100644
--- a/mod/checkin/inc/runtime.php
+++ b/mod/checkin/inc/runtime.php
@@ -16,5 +16,3 @@
     $checkin_admin = new Checkin_Admin;
     $checkin_admin->menu();
 }
-
-?>
\ No newline at end of file
diff --git a/mod/checkin/inc/settings.php b/mod/checkin/inc/settings.php
index e8ad83ea9..00b32269e 100644
--- a/mod/checkin/inc/settings.php
+++ b/mod/checkin/inc/settings.php
@@ -15,4 +15,4 @@
 $settings['email'] = 0;
 $settings['gender'] = 0;
 $settings['birthdate'] = 0;
-?>
+
diff --git a/mod/controlpanel/boost/permission.php b/mod/controlpanel/boost/permission.php
index a26e6587e..1bca86eda 100644
--- a/mod/controlpanel/boost/permission.php
+++ b/mod/controlpanel/boost/permission.php
@@ -11,5 +11,3 @@
 $permissions['move_link']  = dgettext('controlpanel', 'Move Link');
 
 $itemPermissions = FALSE;
-
-?>
\ No newline at end of file
diff --git a/mod/controlpanel/boost/register.php b/mod/controlpanel/boost/register.php
index 7a1a20f0d..e9227b60c 100644
--- a/mod/controlpanel/boost/register.php
+++ b/mod/controlpanel/boost/register.php
@@ -12,5 +12,3 @@ function controlpanel_register($module, &$content)
     $result = PHPWS_ControlPanel::registerModule($module, $content);
     return $result;
 }
-
-?>
\ No newline at end of file
diff --git a/mod/filecabinet/class/Cabinet.php b/mod/filecabinet/class/Cabinet.php
index 2cad2e33e..dd554075c 100644
--- a/mod/filecabinet/class/Cabinet.php
+++ b/mod/filecabinet/class/Cabinet.php
@@ -1368,4 +1368,3 @@ public static function setMessage($message)
 
 }
 
-?>
diff --git a/mod/filecabinet/class/File_Assoc.php b/mod/filecabinet/class/File_Assoc.php
index 2b20ebbd9..f49623084 100644
--- a/mod/filecabinet/class/File_Assoc.php
+++ b/mod/filecabinet/class/File_Assoc.php
@@ -574,5 +574,3 @@ public function setMediaDimensions()
     }
 
 }
-
-?>
\ No newline at end of file
diff --git a/mod/filecabinet/class/File_Common.php b/mod/filecabinet/class/File_Common.php
index ed0a8999d..1a91e5d30 100644
--- a/mod/filecabinet/class/File_Common.php
+++ b/mod/filecabinet/class/File_Common.php
@@ -622,5 +622,3 @@ public function ckButtons()
     }
 
 }
-
-?>
\ No newline at end of file
diff --git a/mod/filecabinet/class/Folder.php b/mod/filecabinet/class/Folder.php
index 970baf039..38815da0d 100644
--- a/mod/filecabinet/class/Folder.php
+++ b/mod/filecabinet/class/Folder.php
@@ -556,5 +556,3 @@ public function tallyItems()
     }
 
 }
-
-?>
\ No newline at end of file
diff --git a/mod/filecabinet/class/Forms.php b/mod/filecabinet/class/Forms.php
index c5b4c977d..3a6d9e789 100644
--- a/mod/filecabinet/class/Forms.php
+++ b/mod/filecabinet/class/Forms.php
@@ -844,4 +844,3 @@ public function postAllowedFiles()
 
 }
 
-?>
diff --git a/mod/filecabinet/class/Multimedia_Manager.php b/mod/filecabinet/class/Multimedia_Manager.php
index c79d99972..737e7c8a8 100644
--- a/mod/filecabinet/class/Multimedia_Manager.php
+++ b/mod/filecabinet/class/Multimedia_Manager.php
@@ -308,5 +308,3 @@ public function loadFolder($folder_id = 0)
     }
 
 }
-
-?>
\ No newline at end of file
diff --git a/mod/filecabinet/inc/init.php b/mod/filecabinet/inc/init.php
index abc9a2f90..495d98805 100644
--- a/mod/filecabinet/inc/init.php
+++ b/mod/filecabinet/inc/init.php
@@ -8,5 +8,3 @@
 \phpws\PHPWS_Core::requireInc('filecabinet', 'parse.php');
 \phpws\PHPWS_Core::requireInc('filecabinet', 'defines.php');
 \phpws\PHPWS_Core::initModClass('filecabinet', 'Cabinet.php');
-
-?>
\ No newline at end of file
diff --git a/mod/filecabinet/index.php b/mod/filecabinet/index.php
index fd0196a26..e9b0b444f 100644
--- a/mod/filecabinet/index.php
+++ b/mod/filecabinet/index.php
@@ -40,5 +40,3 @@
         $cabinet->download($_GET['id']);
     }
 }
-
-?>
\ No newline at end of file
diff --git a/mod/filecabinet/javascript/update_file/default.php b/mod/filecabinet/javascript/update_file/default.php
index f2d7d5ed9..0689f37fe 100644
--- a/mod/filecabinet/javascript/update_file/default.php
+++ b/mod/filecabinet/javascript/update_file/default.php
@@ -5,5 +5,3 @@
  */
 
 javascript('jquery');
-
-?>
\ No newline at end of file
diff --git a/mod/filecabinet/templates/filters/media/filter.php b/mod/filecabinet/templates/filters/media/filter.php
index e8347ae15..9ad79c46c 100644
--- a/mod/filecabinet/templates/filters/media/filter.php
+++ b/mod/filecabinet/templates/filters/media/filter.php
@@ -11,4 +11,3 @@
     $tpl['HEIGHT'] = 20;
     $tpl['WIDTH'] = 260;
 }
-?>
\ No newline at end of file
diff --git a/mod/layout/boost/boost.php b/mod/layout/boost/boost.php
index 6c3c5344e..c7dc16306 100644
--- a/mod/layout/boost/boost.php
+++ b/mod/layout/boost/boost.php
@@ -14,4 +14,4 @@
 $priority    = 999;
 $about       = true;
 $dependency  = true;
-?>
+
diff --git a/mod/layout/boost/update.php b/mod/layout/boost/update.php
index d52c4ba0f..460a618cf 100644
--- a/mod/layout/boost/update.php
+++ b/mod/layout/boost/update.php
@@ -267,5 +267,3 @@ function layoutUpdateFiles($files, &$content)
     }
     $content[] = "     " . implode("\n     ", $files);
 }
-
-?>
\ No newline at end of file
diff --git a/mod/layout/class/Layout.php b/mod/layout/class/Layout.php
index a9f5359e1..d3e6c3402 100644
--- a/mod/layout/class/Layout.php
+++ b/mod/layout/class/Layout.php
@@ -1094,4 +1094,3 @@ public static function keyDescriptions()
 
 }
 
-?>
diff --git a/mod/layout/class/Layout_Settings.php b/mod/layout/class/Layout_Settings.php
index e3c2bc873..4b7100e3b 100644
--- a/mod/layout/class/Layout_Settings.php
+++ b/mod/layout/class/Layout_Settings.php
@@ -289,5 +289,3 @@ public function loadKeyStyle($key_id)
     }
 
 }
-
-?>
\ No newline at end of file
diff --git a/mod/layout/inc/close.php b/mod/layout/inc/close.php
index 6c0791255..936c0312d 100644
--- a/mod/layout/inc/close.php
+++ b/mod/layout/inc/close.php
@@ -12,4 +12,3 @@
     check_cookie();
 }
 echo Layout::display();
-?>
\ No newline at end of file
diff --git a/mod/layout/inc/settings.php b/mod/layout/inc/settings.php
index 8cde0f998..76bf7e44b 100644
--- a/mod/layout/inc/settings.php
+++ b/mod/layout/inc/settings.php
@@ -7,5 +7,3 @@
 
 $settings['use_key_summaries'] = 0;
 $settings['include_css_order'] = 1;
-
-?>
\ No newline at end of file
diff --git a/mod/likebox/boost/boost.php b/mod/likebox/boost/boost.php
index 03b893d8f..5880316bb 100644
--- a/mod/likebox/boost/boost.php
+++ b/mod/likebox/boost/boost.php
@@ -30,4 +30,3 @@
 $image_dir    = false;
 $file_dir     = false;
 
-?>
diff --git a/mod/likebox/class/LikeboxView.php b/mod/likebox/class/LikeboxView.php
index 7f3911243..43663b699 100644
--- a/mod/likebox/class/LikeboxView.php
+++ b/mod/likebox/class/LikeboxView.php
@@ -76,4 +76,4 @@ public function view()
         Layout::add($content, 'likebox', 'view');
     }
 }
-?>
+
diff --git a/mod/menu/boost/update.php b/mod/menu/boost/update.php
index 774574db3..783edebe8 100644
--- a/mod/menu/boost/update.php
+++ b/mod/menu/boost/update.php
@@ -409,4 +409,3 @@ function menuUpdateFiles($files, &$content)
     }
 }
 
-?>
diff --git a/mod/menu/inc/key.php b/mod/menu/inc/key.php
index 20e2f524b..6739768a8 100644
--- a/mod/menu/inc/key.php
+++ b/mod/menu/inc/key.php
@@ -40,5 +40,3 @@ function menu_unregister_key(Key $key)
 
     return true;
 }
-
-?>
\ No newline at end of file
diff --git a/mod/notification/class/NotificationQueue.php b/mod/notification/class/NotificationQueue.php
index f582cba38..aef83fc61 100644
--- a/mod/notification/class/NotificationQueue.php
+++ b/mod/notification/class/NotificationQueue.php
@@ -33,4 +33,4 @@ public function isEmpty()
         return empty($this->queue);
     }
 }
-?>
+
diff --git a/mod/notification/inc/runtime.php b/mod/notification/inc/runtime.php
index 0a42f3dfc..5311adc81 100644
--- a/mod/notification/inc/runtime.php
+++ b/mod/notification/inc/runtime.php
@@ -3,5 +3,3 @@
 \phpws\PHPWS_Core::initModClass('notification', 'NQ.php');
 
 NQ::init();
-
-?>
\ No newline at end of file
diff --git a/mod/pagesmith/boost/permission.php b/mod/pagesmith/boost/permission.php
index c58bc35fb..770dda26b 100644
--- a/mod/pagesmith/boost/permission.php
+++ b/mod/pagesmith/boost/permission.php
@@ -10,5 +10,3 @@
 $permissions['edit_page']   = dgettext('pagesmith', 'Edit page');
 $permissions['delete_page'] = dgettext('pagesmith', 'Delete page');
 $permissions['settings'] = dgettext('pagesmith', 'Change settings (Unrestricted only)');
-
-?>
\ No newline at end of file
diff --git a/mod/pagesmith/boost/update.php b/mod/pagesmith/boost/update.php
index b9a5a7bf8..5d36e5a06 100644
--- a/mod/pagesmith/boost/update.php
+++ b/mod/pagesmith/boost/update.php
@@ -524,4 +524,3 @@ function pagesmithSearchIndex()
     return true;
 }
 
-?>
diff --git a/mod/pagesmith/class/PS_Page.php b/mod/pagesmith/class/PS_Page.php
index edce95eec..f631b7e4d 100644
--- a/mod/pagesmith/class/PS_Page.php
+++ b/mod/pagesmith/class/PS_Page.php
@@ -680,4 +680,3 @@ public static function purgeRows($rows)
 
 }
 
-?>
diff --git a/mod/pagesmith/class/PS_Text.php b/mod/pagesmith/class/PS_Text.php
index 5ed5c8447..780e71522 100644
--- a/mod/pagesmith/class/PS_Text.php
+++ b/mod/pagesmith/class/PS_Text.php
@@ -86,5 +86,3 @@ public function save($key_id)
     }
 
 }
-
-?>
\ No newline at end of file
diff --git a/mod/pagesmith/conf/config.php b/mod/pagesmith/conf/config.php
index 06c0d7dd9..81f8a401a 100644
--- a/mod/pagesmith/conf/config.php
+++ b/mod/pagesmith/conf/config.php
@@ -19,5 +19,3 @@
  * change the below to false. Do so at your own risk.
  */
 define('PS_CHECK_CHAR_LENGTH', true);
-
-?>
\ No newline at end of file
diff --git a/mod/pagesmith/conf/error.php b/mod/pagesmith/conf/error.php
index 0412b22ce..4b5557f18 100644
--- a/mod/pagesmith/conf/error.php
+++ b/mod/pagesmith/conf/error.php
@@ -9,4 +9,3 @@
 $errors[PS_TPL_NO_TN]       = dgettext('pagesmith', 'Page template is missing a thumbnail.');
 $errors[PS_TPL_NO_SECTIONS] = dgettext('pagesmith', 'Page template did not contain any sections.');
 $errors[PS_PG_TPL_ERROR]    = dgettext('pagesmith', 'An error occurred when trying to load the page template.');
-?>
\ No newline at end of file
diff --git a/mod/pagesmith/javascript/confirm_delete/default.php b/mod/pagesmith/javascript/confirm_delete/default.php
index b66908f75..dd0aaa5b9 100644
--- a/mod/pagesmith/javascript/confirm_delete/default.php
+++ b/mod/pagesmith/javascript/confirm_delete/default.php
@@ -5,5 +5,3 @@
  */
 
 $data['question'] = dgettext('pagesmith', 'Are you sure you want to delete this page template?');
-
-?>
\ No newline at end of file
diff --git a/mod/pagesmith/javascript/update/default.php b/mod/pagesmith/javascript/update/default.php
index c597174a4..ef289432b 100644
--- a/mod/pagesmith/javascript/update/default.php
+++ b/mod/pagesmith/javascript/update/default.php
@@ -6,4 +6,4 @@
  */
 
 javascript('jquery');
-?>
+
diff --git a/mod/phatform/boost/boost.php b/mod/phatform/boost/boost.php
index bcbfdc238..710fc5049 100644
--- a/mod/phatform/boost/boost.php
+++ b/mod/phatform/boost/boost.php
@@ -10,4 +10,3 @@
 $version_http = 'http://phpwebsite.appstate.edu/downloads/modules/phatform/check.xml';
 $about = true;
 $dependency = true;
-?>
\ No newline at end of file
diff --git a/mod/phatform/class/Pager.php b/mod/phatform/class/Pager.php
index 88f1e75e9..35233698c 100644
--- a/mod/phatform/class/Pager.php
+++ b/mod/phatform/class/Pager.php
@@ -361,5 +361,3 @@ function cleanUp() {
         unset($this->returnData);
     }
 } // END CLASS PHPWS_Pager
-
-?>
\ No newline at end of file
diff --git a/mod/phatform/class/Textfield.php b/mod/phatform/class/Textfield.php
index 919056b2e..a44d4ead9 100644
--- a/mod/phatform/class/Textfield.php
+++ b/mod/phatform/class/Textfield.php
@@ -176,5 +176,3 @@ function save() {
         }
     } // END FUNC save
 } // END CLASS PHAT_Textfield
-
-?>
\ No newline at end of file
diff --git a/mod/phatform/conf/manager.php b/mod/phatform/conf/manager.php
index 694dab52e..36fedd5a5 100644
--- a/mod/phatform/conf/manager.php
+++ b/mod/phatform/conf/manager.php
@@ -126,5 +126,3 @@
 $optionsExtraLabels = array('actions_label'=>$actions,
 			    'delete_label' =>$delete,
 			    'edit_label'   =>$edit);
-
-?>
\ No newline at end of file
diff --git a/mod/phatform/inc/Archive.php b/mod/phatform/inc/Archive.php
index b9dc21c03..90cbe41a8 100644
--- a/mod/phatform/inc/Archive.php
+++ b/mod/phatform/inc/Archive.php
@@ -69,5 +69,3 @@ function archive($formId = NULL) {
         system($goCode);
     }
 }
-
-?>
\ No newline at end of file
diff --git a/mod/phatform/inc/Export.php b/mod/phatform/inc/Export.php
index f3f21a7ff..fac8452f5 100644
--- a/mod/phatform/inc/Export.php
+++ b/mod/phatform/inc/Export.php
@@ -90,5 +90,3 @@ function export($formId = NULL) {
 	readfile($filepath);
 	exit();
 }
-
-?>
\ No newline at end of file
diff --git a/mod/properties/boost/boost.php b/mod/properties/boost/boost.php
index 521a702ff..f556a021a 100644
--- a/mod/properties/boost/boost.php
+++ b/mod/properties/boost/boost.php
@@ -28,4 +28,3 @@
 $priority     = 50;
 $dependency   = false;
 $image_dir    = true;
-?>
\ No newline at end of file
diff --git a/mod/properties/class/Base.php b/mod/properties/class/Base.php
index 5f4fa820d..908d11fc3 100644
--- a/mod/properties/class/Base.php
+++ b/mod/properties/class/Base.php
@@ -117,5 +117,3 @@ protected function propertiesList($contact_id=null)
     }
 
 }
-
-?>
\ No newline at end of file
diff --git a/mod/properties/class/Contact.php b/mod/properties/class/Contact.php
index fef1fe91b..a426cb96e 100644
--- a/mod/properties/class/Contact.php
+++ b/mod/properties/class/Contact.php
@@ -523,5 +523,3 @@ public function checkKey()
     }
 
 }
-
-?>
\ No newline at end of file
diff --git a/mod/properties/class/Photo.php b/mod/properties/class/Photo.php
index 26511ed4c..d4f883c72 100644
--- a/mod/properties/class/Photo.php
+++ b/mod/properties/class/Photo.php
@@ -293,5 +293,3 @@ public function makeMain()
     }
 
 }
-
-?>
\ No newline at end of file
diff --git a/mod/properties/class/Roommate_User.php b/mod/properties/class/Roommate_User.php
index b9427e08b..363fabdfb 100644
--- a/mod/properties/class/Roommate_User.php
+++ b/mod/properties/class/Roommate_User.php
@@ -879,5 +879,3 @@ private function amenityTranslate($abbr)
     }
 
 }
-
-?>
\ No newline at end of file
diff --git a/mod/properties/conf/defines.php b/mod/properties/conf/defines.php
index efbc83576..c3fddaafa 100644
--- a/mod/properties/conf/defines.php
+++ b/mod/properties/conf/defines.php
@@ -77,4 +77,3 @@
 
 define('NONSMOKER', 1);
 define('SMOKER', 2);
-?>
\ No newline at end of file
diff --git a/mod/properties/index.php b/mod/properties/index.php
index 87f764e55..a2f1d370a 100644
--- a/mod/properties/index.php
+++ b/mod/properties/index.php
@@ -71,4 +71,3 @@
         \PHPWS_Core::errorPage('404');
     }
 }
-?>
\ No newline at end of file
diff --git a/mod/pulse/boost/boost.php b/mod/pulse/boost/boost.php
index dac5a25de..9eec55ab8 100644
--- a/mod/pulse/boost/boost.php
+++ b/mod/pulse/boost/boost.php
@@ -15,4 +15,3 @@
 $dependency   = true;
 $image_dir    = false;
 
-?>
diff --git a/mod/rss/boost/uninstall.php b/mod/rss/boost/uninstall.php
index a3bd2656a..53fb91522 100644
--- a/mod/rss/boost/uninstall.php
+++ b/mod/rss/boost/uninstall.php
@@ -12,4 +12,3 @@ function rss_uninstall()
     return TRUE;
 }
 
-?>
diff --git a/mod/rss/inc/settings.php b/mod/rss/inc/settings.php
index 6fc848034..26b406fb5 100644
--- a/mod/rss/inc/settings.php
+++ b/mod/rss/inc/settings.php
@@ -9,6 +9,3 @@
 $settings['editor'] = null;
 $settings['webmaster'] = null;
 $settings['copyright'] = sprintf('Copyright %s', date('Y'));
-
-
-?>
\ No newline at end of file
diff --git a/mod/search/class/Admin.php b/mod/search/class/Admin.php
index af995f2e8..ccdbb4bf8 100644
--- a/mod/search/class/Admin.php
+++ b/mod/search/class/Admin.php
@@ -406,5 +406,3 @@ public static function saveSettings()
         PHPWS_Settings::save('search');
     }
 }
-
-?>
\ No newline at end of file
diff --git a/mod/search/conf/config.php b/mod/search/conf/config.php
index 3b438509e..49fbfe284 100644
--- a/mod/search/conf/config.php
+++ b/mod/search/conf/config.php
@@ -14,5 +14,3 @@
  * The text will disappear if the search box is clicked.
  */
 define('SEARCH_DEFAULT', NULL);
-
-?>
\ No newline at end of file
diff --git a/mod/search/inc/close.php b/mod/search/inc/close.php
index 0d2629efb..5de8e7b7c 100644
--- a/mod/search/inc/close.php
+++ b/mod/search/inc/close.php
@@ -13,5 +13,3 @@
     \phpws\PHPWS_Core::initModClass('search', 'Admin.php');
     Search_Admin::miniAdmin();
 }
-
-?>
\ No newline at end of file
diff --git a/mod/search/inc/settings.php b/mod/search/inc/settings.php
index 559280478..31e9fb8db 100644
--- a/mod/search/inc/settings.php
+++ b/mod/search/inc/settings.php
@@ -6,5 +6,3 @@
  */
 
 $settings['show_alternates'] = 0;
-
-?>
\ No newline at end of file
diff --git a/mod/signup/boost/permission.php b/mod/signup/boost/permission.php
index 7522dd2cd..04ab8200c 100644
--- a/mod/signup/boost/permission.php
+++ b/mod/signup/boost/permission.php
@@ -9,5 +9,3 @@
 $permissions['edit_sheet'] = dgettext('signup', 'Edit sheets');
 
 $item_permissions = true;
-
-?>
\ No newline at end of file
diff --git a/mod/signup/class/Slots.php b/mod/signup/class/Slots.php
index 15701797b..f61a98f00 100644
--- a/mod/signup/class/Slots.php
+++ b/mod/signup/class/Slots.php
@@ -379,4 +379,3 @@ public function currentOpenings()
 
 }
 
-?>
diff --git a/mod/signup/conf/config.php b/mod/signup/conf/config.php
index 95d036820..77756c9c0 100644
--- a/mod/signup/conf/config.php
+++ b/mod/signup/conf/config.php
@@ -10,5 +10,3 @@
  * Number of seconds before an applicant's slot submission expires
  */
 define('SIGNUP_WINDOW', 3600);
-
-?>
\ No newline at end of file
diff --git a/mod/signup/index.php b/mod/signup/index.php
index d24251e49..e19b42fe6 100644
--- a/mod/signup/index.php
+++ b/mod/signup/index.php
@@ -20,5 +20,3 @@
 } else {
     \phpws\PHPWS_Core::home();
 }
-
-?>
\ No newline at end of file
diff --git a/mod/users/boost/boost.php b/mod/users/boost/boost.php
index 5bf06607d..a3d7f001f 100644
--- a/mod/users/boost/boost.php
+++ b/mod/users/boost/boost.php
@@ -13,5 +13,3 @@
 $about        = TRUE;
 $priority     = 10;
 $dependency   = TRUE;
-
-?>
\ No newline at end of file
diff --git a/mod/users/conf/languages.php b/mod/users/conf/languages.php
index 83e22c565..d0af034af 100644
--- a/mod/users/conf/languages.php
+++ b/mod/users/conf/languages.php
@@ -144,4 +144,3 @@
 // $languages['yo_YO'] = 'Yoruba';
 // $languages['zh_ZH'] = 'Chinese';
 // $languages['zu_ZU'] = 'Zulu';
-?>
\ No newline at end of file
diff --git a/mod/users/inc/error.php b/mod/users/inc/error.php
index a5b25f945..1bb803480 100644
--- a/mod/users/inc/error.php
+++ b/mod/users/inc/error.php
@@ -41,4 +41,3 @@
 USER_DEACTIVATED          => dgettext('users', 'User account deactivated.'),
 USER_PASSWORD_BLANK       => dgettext('users', 'Password was blank')
 );
-?>
\ No newline at end of file
diff --git a/mod/users/inc/init.php b/mod/users/inc/init.php
index e19bcbf51..44b66ba98 100644
--- a/mod/users/inc/init.php
+++ b/mod/users/inc/init.php
@@ -14,4 +14,3 @@
 \phpws\PHPWS_Core::configRequireOnce('users', 'tags.php');
 \phpws\PHPWS_Core::initModClass('users', 'Current_User.php');
 
-?>
diff --git a/mod/users/scripts/local.php b/mod/users/scripts/local.php
index a6420b286..fad301d99 100644
--- a/mod/users/scripts/local.php
+++ b/mod/users/scripts/local.php
@@ -82,4 +82,3 @@ public function logout()
 
 }
 
-?>
diff --git a/mod/whatsnew/index.php b/mod/whatsnew/index.php
index 40a937e7b..042d6efd8 100644
--- a/mod/whatsnew/index.php
+++ b/mod/whatsnew/index.php
@@ -45,6 +45,3 @@
 } else {
     \phpws\PHPWS_Core::home();
 }
-
-
-?>
\ No newline at end of file
diff --git a/setup/welcome.php b/setup/welcome.php
index 307fafd0c..e0028aa3d 100644
--- a/setup/welcome.php
+++ b/setup/welcome.php
@@ -25,4 +25,3 @@
 
 ";
 
-?>
diff --git a/src/phpws/src/DB/DB_Group_In.php b/src/phpws/src/DB/DB_Group_In.php
index 219ba0dac..7e5020490 100644
--- a/src/phpws/src/DB/DB_Group_In.php
+++ b/src/phpws/src/DB/DB_Group_In.php
@@ -46,4 +46,3 @@ public function buildSQL($first = false)
 
 }
 
-?>
diff --git a/src/phpws/src/PHPWS_DB.php b/src/phpws/src/PHPWS_DB.php
index f98e6e15a..c3452a21f 100644
--- a/src/phpws/src/PHPWS_DB.php
+++ b/src/phpws/src/PHPWS_DB.php
@@ -2924,4 +2924,3 @@ public function setSubselectAs($ssa)
 }
 
 // END PHPWS_DB_Where
-?>
\ No newline at end of file
diff --git a/src/phpws/src/PHPWS_Time.php b/src/phpws/src/PHPWS_Time.php
index 599cf10d7..b9ee4826f 100644
--- a/src/phpws/src/PHPWS_Time.php
+++ b/src/phpws/src/PHPWS_Time.php
@@ -229,5 +229,3 @@ public static function relativeTime($timestamp, $format='%c')
 		}
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/src/phpws/src/Template.php b/src/phpws/src/Template.php
index 240e69086..4f5e969fa 100644
--- a/src/phpws/src/Template.php
+++ b/src/phpws/src/Template.php
@@ -304,4 +304,3 @@ public static function processTemplate($template, $module, $file, $defaultTpl=tr
     }
 }
 
-?>
diff --git a/src/phpws/src/XMLParser.php b/src/phpws/src/XMLParser.php
index 6a75639b5..decd2bf91 100644
--- a/src/phpws/src/XMLParser.php
+++ b/src/phpws/src/XMLParser.php
@@ -182,4 +182,3 @@ public function subformat($foo)
     }
 
 }
-?>
\ No newline at end of file
diff --git a/src/phpws/src/jsmin.php b/src/phpws/src/jsmin.php
index c3bdd15c8..230a44173 100644
--- a/src/phpws/src/jsmin.php
+++ b/src/phpws/src/jsmin.php
@@ -289,4 +289,3 @@ protected function peek() {
 
 // -- Exceptions ---------------------------------------------------------------
 class JSMinException extends \Exception {}
-?>
\ No newline at end of file
diff --git a/src/phpws/src/xmlrpc.php b/src/phpws/src/xmlrpc.php
index 61f6f19cf..521fd5857 100644
--- a/src/phpws/src/xmlrpc.php
+++ b/src/phpws/src/xmlrpc.php
@@ -449,5 +449,3 @@ function record($file, $info, $append = true)
                 strftime('%T') . ' ' . $info . "\n");
     }
 }
-
-?>
\ No newline at end of file
diff --git a/src/phpws/version.php b/src/phpws/version.php
index 28467fd82..0a78eb105 100644
--- a/src/phpws/version.php
+++ b/src/phpws/version.php
@@ -7,4 +7,4 @@
  */
 
 $version = '1.10.0';
-?>
+
diff --git a/src/phpws2/src/Database/Constraint.php b/src/phpws2/src/Database/Constraint.php
index 3bac88f23..ff859e619 100644
--- a/src/phpws2/src/Database/Constraint.php
+++ b/src/phpws2/src/Database/Constraint.php
@@ -149,4 +149,3 @@ public function add()
 
 }
 
-?>
diff --git a/src/phpws2/src/Database/Datatype/Smallint.php b/src/phpws2/src/Database/Datatype/Smallint.php
index 20b71203d..7b60a4c3f 100644
--- a/src/phpws2/src/Database/Datatype/Smallint.php
+++ b/src/phpws2/src/Database/Datatype/Smallint.php
@@ -26,4 +26,3 @@ class Smallint extends \phpws2\Database\Datatype\Integer {
 
 }
 
-?>
diff --git a/src/phpws2/src/Database/Datatype/Timestamp.php b/src/phpws2/src/Database/Datatype/Timestamp.php
index 6414eb0a7..6c5bf550f 100644
--- a/src/phpws2/src/Database/Datatype/Timestamp.php
+++ b/src/phpws2/src/Database/Datatype/Timestamp.php
@@ -27,4 +27,3 @@ protected function loadDefault()
 
 }
 
-?>
diff --git a/src/phpws2/src/Database/Engine/mysql/Datatype/Mediumtext.php b/src/phpws2/src/Database/Engine/mysql/Datatype/Mediumtext.php
index 4846a4bbc..dc2b7cff3 100644
--- a/src/phpws2/src/Database/Engine/mysql/Datatype/Mediumtext.php
+++ b/src/phpws2/src/Database/Engine/mysql/Datatype/Mediumtext.php
@@ -19,4 +19,3 @@
 
 class Mediumtext extends \phpws2\Database\Datatype\Text {}
 
-?>
diff --git a/src/phpws2/src/Database/Engine/pgsql/Group.php b/src/phpws2/src/Database/Engine/pgsql/Group.php
index a31c33745..31d4c1f7f 100644
--- a/src/phpws2/src/Database/Engine/pgsql/Group.php
+++ b/src/phpws2/src/Database/Engine/pgsql/Group.php
@@ -45,4 +45,3 @@ public function __toString()
 
 }
 
-?>
diff --git a/src/phpws2/src/Database/TableCreateConstraint.php b/src/phpws2/src/Database/TableCreateConstraint.php
index e4866f3c4..567fc0f40 100644
--- a/src/phpws2/src/Database/TableCreateConstraint.php
+++ b/src/phpws2/src/Database/TableCreateConstraint.php
@@ -21,4 +21,3 @@ interface TableCreateConstraint {
     public function getConstraintType();
 }
 
-?>
diff --git a/src/phpws2/src/Form/Input/Checkbox.php b/src/phpws2/src/Form/Input/Checkbox.php
index 8e14034b2..9da04f48c 100644
--- a/src/phpws2/src/Form/Input/Checkbox.php
+++ b/src/phpws2/src/Form/Input/Checkbox.php
@@ -46,5 +46,3 @@ public function setChecked($checked)
     }
 
 }
-
-?>
\ No newline at end of file
diff --git a/src/phpws2/src/Form/Input/Email.php b/src/phpws2/src/Form/Input/Email.php
index 1b0b01bd7..4a8d923ae 100644
--- a/src/phpws2/src/Form/Input/Email.php
+++ b/src/phpws2/src/Form/Input/Email.php
@@ -10,5 +10,3 @@
  * @license http://opensource.org/licenses/lgpl-3.0.html
  */
 class Email extends Text {}
-
-?>
\ No newline at end of file
diff --git a/src/phpws2/src/Form/Input/Password.php b/src/phpws2/src/Form/Input/Password.php
index 7c0f9b35b..d727e76cc 100644
--- a/src/phpws2/src/Form/Input/Password.php
+++ b/src/phpws2/src/Form/Input/Password.php
@@ -12,5 +12,3 @@
 class Password extends Text {
 
 }
-
-?>
\ No newline at end of file
diff --git a/src/phpws2/src/Form/Input/Search.php b/src/phpws2/src/Form/Input/Search.php
index 92df885dd..0762f0f7e 100644
--- a/src/phpws2/src/Form/Input/Search.php
+++ b/src/phpws2/src/Form/Input/Search.php
@@ -12,5 +12,3 @@
 class Search extends Text {
 
 }
-
-?>
\ No newline at end of file
diff --git a/src/phpws2/src/Form/Input/Telephone.php b/src/phpws2/src/Form/Input/Telephone.php
index 33a0409cc..b3045ef58 100644
--- a/src/phpws2/src/Form/Input/Telephone.php
+++ b/src/phpws2/src/Form/Input/Telephone.php
@@ -12,5 +12,3 @@
 class Telephone extends Text {
 
 }
-
-?>
\ No newline at end of file
diff --git a/src/phpws2/src/Form/Input/Textarea.php b/src/phpws2/src/Form/Input/Textarea.php
index e3d99064e..f1be07911 100644
--- a/src/phpws2/src/Form/Input/Textarea.php
+++ b/src/phpws2/src/Form/Input/Textarea.php
@@ -35,5 +35,3 @@ public function setPlaceholder($placeholder)
     }
 
 }
-
-?>
\ No newline at end of file
diff --git a/src/phpws2/src/Form/Input/Url.php b/src/phpws2/src/Form/Input/Url.php
index fbb5b25b8..fa0b5f5bf 100644
--- a/src/phpws2/src/Form/Input/Url.php
+++ b/src/phpws2/src/Form/Input/Url.php
@@ -12,5 +12,3 @@
 class Url extends Text {
 
 }
-
-?>
\ No newline at end of file
diff --git a/src/phpws2/src/Http/MovedPermanentlyResponse.php b/src/phpws2/src/Http/MovedPermanentlyResponse.php
index ec5cd1991..7b52ff689 100644
--- a/src/phpws2/src/Http/MovedPermanentlyResponse.php
+++ b/src/phpws2/src/Http/MovedPermanentlyResponse.php
@@ -12,5 +12,3 @@ protected function getHttpResponseCode()
         return 301;
     }
 }
-
-?>
diff --git a/src/phpws2/src/Http/NotAcceptableResponse.php b/src/phpws2/src/Http/NotAcceptableResponse.php
index fe56d3197..c1663c57a 100644
--- a/src/phpws2/src/Http/NotAcceptableResponse.php
+++ b/src/phpws2/src/Http/NotAcceptableResponse.php
@@ -14,5 +14,3 @@ protected function getHttpResponseCode()
         return 406;
     }
 }
-
-?>
diff --git a/src/phpws2/src/PackageManager.php b/src/phpws2/src/PackageManager.php
index 97c3f60a3..3868e0935 100644
--- a/src/phpws2/src/PackageManager.php
+++ b/src/phpws2/src/PackageManager.php
@@ -34,5 +34,3 @@ public static function loadPackage($module)
     }
 
 }
-
-?>
diff --git a/src/phpws2/src/Register.php b/src/phpws2/src/Register.php
index ba7f8fa3a..8afb10652 100644
--- a/src/phpws2/src/Register.php
+++ b/src/phpws2/src/Register.php
@@ -33,4 +33,3 @@ protected function setRegistrant(Module $registrant)
         $this->registrant = $registrant;
     }
 }
-?>
diff --git a/src/phpws2/src/Session.php b/src/phpws2/src/Session.php
index 46a008f30..3fff24161 100644
--- a/src/phpws2/src/Session.php
+++ b/src/phpws2/src/Session.php
@@ -237,5 +237,3 @@ public function reset()
     }
 
 }
-
-?>
\ No newline at end of file
diff --git a/src/phpws2/src/Variable/Alphanumeric.php b/src/phpws2/src/Variable/Alphanumeric.php
index 1b31d066c..99e7fa2d9 100644
--- a/src/phpws2/src/Variable/Alphanumeric.php
+++ b/src/phpws2/src/Variable/Alphanumeric.php
@@ -16,4 +16,3 @@ class Alphanumeric extends \Variable\String {
 
 }
 
-?>
diff --git a/src/phpws2/src/Variable/Double.php b/src/phpws2/src/Variable/Double.php
index ea350b849..8bb824440 100644
--- a/src/phpws2/src/Variable/Double.php
+++ b/src/phpws2/src/Variable/Double.php
@@ -26,5 +26,3 @@ protected function verifyValue($value)
         return true;
     }
 }
-
-?>
\ No newline at end of file
diff --git a/src/phpws2/src/Variable/Integer.php b/src/phpws2/src/Variable/Integer.php
index d6a4a8ba4..5b79edf92 100644
--- a/src/phpws2/src/Variable/Integer.php
+++ b/src/phpws2/src/Variable/Integer.php
@@ -167,5 +167,3 @@ public function increase()
     }
 
 }
-
-?>
\ No newline at end of file
diff --git a/src/phpws2/src/Variable/Url.php b/src/phpws2/src/Variable/Url.php
index 6ad6a9774..918a1540f 100644
--- a/src/phpws2/src/Variable/Url.php
+++ b/src/phpws2/src/Variable/Url.php
@@ -38,5 +38,3 @@ public function __construct($value = null, $varname = null)
     }
 
 }
-
-?>
\ No newline at end of file
diff --git a/src/phpws2/src/Variable/Version.php b/src/phpws2/src/Variable/Version.php
index 45ddf3e57..500a5d67c 100644
--- a/src/phpws2/src/Variable/Version.php
+++ b/src/phpws2/src/Variable/Version.php
@@ -20,4 +20,3 @@ class Version extends String {
 
 }
 
-?>
diff --git a/src/phpws2/src/View/JsonErrorView.php b/src/phpws2/src/View/JsonErrorView.php
index 19c531f0d..865afce0f 100644
--- a/src/phpws2/src/View/JsonErrorView.php
+++ b/src/phpws2/src/View/JsonErrorView.php
@@ -57,4 +57,3 @@ private function displayError($error)
 
 }
 
-?>