From 90418d37d0e90c9958867afe744d6c436180c3d2 Mon Sep 17 00:00:00 2001
From: Jaime Perez <jaime.perez@uninett.no>
Date: Wed, 12 Mar 2014 14:29:18 +0100
Subject: [PATCH] Remove trailing PHP close tags. Closes #59.

---
 attributemap/addurnprefix.php                     |  2 --
 attributemap/feide-oid.php                        |  2 --
 attributemap/name2claim.php                       |  1 -
 attributemap/name2oid.php                         |  1 -
 attributemap/name2urn.php                         |  1 -
 attributemap/oid-feide.php                        |  2 --
 attributemap/oid2name.php                         |  1 -
 attributemap/oid2urn.php                          |  1 -
 attributemap/removeurnprefix.php                  |  2 --
 attributemap/test.php                             |  2 --
 attributemap/urn2name.php                         |  1 -
 attributemap/urn2oid.php                          |  1 -
 bin/memcacheSync.php                              |  2 --
 bin/translation.php                               |  2 --
 config-templates/authmemcookie.php                |  2 --
 config-templates/cas-ldap.php                     |  1 -
 config-templates/config-login-auto.php            |  3 ---
 config-templates/config-login-feide.php           |  2 --
 config-templates/ldap.php                         |  2 --
 config-templates/ldapmulti.php                    |  2 --
 config-templates/translation.php                  |  2 --
 lib/SimpleSAML/Auth/LDAP.php                      |  2 --
 lib/SimpleSAML/Auth/ProcessingFilter.php          |  2 --
 lib/SimpleSAML/Auth/Simple.php                    |  2 --
 lib/SimpleSAML/Auth/Source.php                    |  2 --
 lib/SimpleSAML/Auth/State.php                     |  2 --
 lib/SimpleSAML/AuthMemCookie.php                  |  2 --
 lib/SimpleSAML/Bindings/Shib13/HTTPPost.php       |  1 -
 lib/SimpleSAML/Error/AuthSource.php               |  2 --
 lib/SimpleSAML/Error/BadUserInnput.php            |  2 --
 lib/SimpleSAML/Error/Exception.php                |  2 --
 lib/SimpleSAML/Error/InvalidCredential.php        |  2 --
 lib/SimpleSAML/Error/NoPassive.php                |  2 --
 lib/SimpleSAML/Error/ProxyCountExceeded.php       |  2 --
 lib/SimpleSAML/Error/User.php                     |  2 --
 lib/SimpleSAML/Error/UserNotFound.php             |  2 --
 lib/SimpleSAML/Memcache.php                       |  1 -
 .../Metadata/MetaDataStorageHandlerFlatFile.php   |  2 --
 .../Metadata/MetaDataStorageHandlerSerialize.php  |  2 --
 .../Metadata/MetaDataStorageHandlerXML.php        |  2 --
 lib/SimpleSAML/Metadata/MetaDataStorageSource.php |  1 -
 lib/SimpleSAML/Metadata/Signer.php                |  2 --
 lib/SimpleSAML/Module.php                         |  2 --
 lib/SimpleSAML/XHTML/EMail.php                    |  2 --
 lib/SimpleSAML/XHTML/IdPDisco.php                 |  2 --
 lib/SimpleSAML/XHTML/Template.php                 |  2 --
 lib/SimpleSAML/XML/Errors.php                     |  2 --
 lib/SimpleSAML/XML/Parser.php                     |  2 --
 lib/SimpleSAML/XML/Shib13/AuthnRequest.php        |  2 --
 lib/SimpleSAML/XML/Shib13/AuthnResponse.php       |  1 -
 lib/SimpleSAML/XML/Signer.php                     |  2 --
 lib/SimpleSAML/XML/Validator.php                  |  2 --
 log/_placeholder.php                              |  1 -
 metadata-templates/adfs-idp-hosted.php            |  2 --
 metadata-templates/adfs-sp-remote.php             |  2 --
 .../config-template/config-login-infocard.php     |  3 ---
 modules/InfoCard/dictionaries/dict-InfoCard.php   |  3 ---
 modules/InfoCard/lib/Auth/Source/ICAuth.php       |  2 --
 modules/InfoCard/lib/RP/InfoCard.php              |  2 --
 modules/InfoCard/lib/STS.php                      |  2 --
 modules/InfoCard/lib/UserFunctions.php            |  1 -
 modules/InfoCard/lib/Utils.php                    |  1 -
 modules/InfoCard/templates/temp-getcardform.php   |  2 +-
 modules/InfoCard/templates/temp-login.php         |  2 +-
 modules/InfoCard/www/STS_card_issuer.php          |  3 ---
 modules/InfoCard/www/getcardform.php              |  1 -
 modules/InfoCard/www/login-infocard.php           |  1 -
 modules/InfoCard/www/mex.php                      | 15 ---------------
 modules/InfoCard/www/prueba.php                   |  3 +--
 modules/InfoCard/www/tokenservice.php             |  3 ---
 modules/InfoCard/www/x509.php                     |  2 --
 modules/adfs/www/idp/prp.php                      |  2 --
 modules/authX509/templates/X509error.php          |  1 -
 .../lib/Auth/Process/OTP2YubiPrefix.php           |  2 --
 modules/authYubiKey/lib/Auth/Source/YubiKey.php   |  2 --
 modules/authYubiKey/libextinc/Yubico.php          |  1 -
 modules/authYubiKey/templates/yubikeylogin.php    |  1 -
 modules/authYubiKey/www/yubikeylogin.php          |  3 ---
 modules/authfacebook/lib/Auth/Source/Facebook.php |  2 --
 modules/authfacebook/www/linkback.php             |  2 --
 modules/authorize/lib/Auth/Process/Authorize.php  |  2 --
 modules/authorize/templates/authorize_403.php     |  1 -
 modules/authorize/www/authorize_403.php           |  3 ---
 .../config-templates/module_casserver.php         |  2 --
 modules/casserver/www/cas.php                     |  2 --
 modules/casserver/www/proxy.php                   |  2 --
 modules/casserver/www/serviceValidate.php         |  2 --
 modules/casserver/www/tickets.php                 |  2 --
 modules/casserver/www/validate.php                |  1 -
 modules/consent/dictionaries/consent.php          |  3 ---
 modules/consentAdmin/hooks/hook_frontpage.php     |  1 -
 modules/consentAdmin/templates/consentadmin.php   |  2 +-
 .../consentAdmin/templates/consentadminajax.php   |  1 -
 modules/consentAdmin/www/consentAdmin.php         |  1 -
 .../consentSimpleAdmin/hooks/hook_frontpage.php   |  3 ---
 .../consentSimpleAdmin/hooks/hook_sanitycheck.php |  1 -
 .../consentSimpleAdmin/templates/consentadmin.php |  2 +-
 .../consentSimpleAdmin/templates/consentstats.php |  2 +-
 modules/consentSimpleAdmin/www/consentAdmin.php   |  1 -
 modules/consentSimpleAdmin/www/consentStats.php   |  1 -
 modules/core/hooks/hook_frontpage.php             |  1 -
 modules/core/hooks/hook_sanitycheck.php           |  1 -
 modules/core/lib/Auth/Process/AttributeAdd.php    |  2 --
 modules/core/lib/Auth/Process/AttributeCopy.php   |  2 --
 modules/core/lib/Auth/Process/AttributeMap.php    |  2 --
 modules/core/lib/Auth/Process/AttributeRealm.php  |  2 --
 modules/core/lib/Auth/Process/GenerateGroups.php  |  2 --
 modules/core/lib/Auth/Process/TargetedID.php      |  2 --
 .../lib/Auth/Process/WarnShortSSOInterval.php     |  2 --
 modules/core/lib/Auth/Source/AdminPassword.php    |  3 ---
 modules/core/lib/Auth/UserPassBase.php            |  2 --
 modules/core/lib/Auth/UserPassOrgBase.php         |  2 --
 modules/core/templates/authsource_list.tpl.php    |  1 -
 modules/core/templates/frontpage_auth.tpl.php     |  2 +-
 modules/core/templates/frontpage_config.tpl.php   |  2 +-
 .../core/templates/frontpage_federation.tpl.php   |  2 +-
 modules/core/templates/frontpage_welcome.tpl.php  |  2 +-
 modules/core/templates/loginuserpass.php          |  1 -
 modules/core/templates/logout-iframe.php          |  1 -
 modules/core/templates/short_sso_interval.php     |  1 -
 modules/core/www/postredirect.php                 |  2 --
 modules/core/www/short_sso_interval.php           |  3 ---
 modules/cron/config-templates/module_cron.php     |  2 --
 modules/cron/hooks/hook_cron.php                  |  1 -
 modules/cron/hooks/hook_frontpage.php             |  1 -
 modules/cron/templates/croninfo-result.php        |  1 -
 modules/cron/templates/croninfo-tpl.php           |  1 -
 modules/cron/www/cron.php                         |  2 --
 modules/cron/www/croninfo.php                     |  3 ---
 .../config-templates/module_discopower.php        |  2 --
 modules/discopower/templates/disco-tpl.php        |  2 +-
 modules/discopower/www/disco.php                  |  2 --
 .../exampleauth/lib/Auth/Process/RedirectTest.php |  2 --
 modules/exampleauth/lib/Auth/Source/Static.php    |  2 --
 modules/exampleauth/lib/Auth/Source/UserPass.php  |  2 --
 modules/exampleauth/www/redirecttest.php          |  2 --
 .../expirycheck/lib/Auth/Process/ExpiryDate.php   |  3 ---
 modules/expirycheck/templates/about2expire.php    |  1 -
 modules/expirycheck/templates/expired.php         |  1 -
 modules/expirycheck/www/about2expire.php          |  3 ---
 modules/expirycheck/www/expired.php               |  3 ---
 modules/ldap/lib/Auth/Source/LDAP.php             |  3 ---
 modules/ldap/lib/Auth/Source/LDAPMulti.php        |  3 ---
 .../logpeek/config-templates/module_logpeek.php   |  2 --
 modules/logpeek/hooks/hook_frontpage.php          |  1 -
 modules/logpeek/lib/File/reverseRead.php          |  1 -
 modules/logpeek/lib/Syslog/parseLine.php          |  1 -
 modules/logpeek/templates/logpeek.php             |  2 +-
 modules/logpeek/www/index.php                     |  1 -
 modules/memcacheMonitor/hooks/hook_frontpage.php  |  3 ---
 .../memcacheMonitor/hooks/hook_sanitycheck.php    |  3 ---
 .../templates/memcachestat.tpl.php                |  1 -
 modules/metaedit/hooks/hook_frontpage.php         |  1 -
 modules/metarefresh/hooks/hook_cron.php           |  1 -
 modules/metarefresh/hooks/hook_frontpage.php      |  1 -
 modules/metarefresh/lib/MetaLoader.php            |  2 --
 modules/metarefresh/templates/fetch.tpl.php       |  1 -
 modules/modinfo/hooks/hook_frontpage.php          |  1 -
 modules/modinfo/hooks/hook_moduleinfo.php         |  1 -
 modules/modinfo/templates/modlist.php             |  2 +-
 modules/modinfo/www/index.php                     |  2 --
 modules/multiauth/lib/Auth/Source/MultiAuth.php   |  2 --
 modules/multiauth/templates/selectsource.php      |  2 +-
 modules/multiauth/www/selectsource.php            |  2 --
 modules/negotiate/templates/disable.php           |  2 +-
 modules/negotiate/templates/enable.php            |  2 +-
 modules/oauth/hooks/hook_cron.php                 |  1 -
 modules/oauth/hooks/hook_frontpage.php            |  1 -
 modules/oauth/lib/OAuthSignatureMethodRSASHA1.php |  1 -
 modules/oauth/libextinc/OAuth.php                 |  2 --
 modules/oauth/templates/authorized.php            |  1 -
 modules/oauth/templates/consent.php               |  1 -
 modules/papi/lib/Auth/Source/PAPI.php             |  2 --
 modules/portal/config-templates/module_portal.php |  2 --
 .../preprodwarning/lib/Auth/Process/Warning.php   |  2 --
 modules/preprodwarning/templates/warning.php      |  1 -
 modules/preprodwarning/www/showwarning.php        |  3 ---
 modules/saml/lib/Error.php                        |  2 --
 modules/saml/www/idp/certs.php                    |  2 --
 modules/saml/www/sp/metadata.php                  |  1 -
 modules/saml/www/sp/saml1-acs.php                 |  2 --
 modules/saml2debug/hooks/hook_frontpage.php       |  3 ---
 modules/saml2debug/templates/debug.tpl.php        |  2 +-
 modules/saml2debug/www/debug.php                  |  2 --
 .../config-templates/config-sanitycheck.php       |  2 --
 modules/sanitycheck/hooks/hook_cron.php           |  1 -
 modules/sanitycheck/hooks/hook_frontpage.php      |  1 -
 modules/sanitycheck/hooks/hook_moduleinfo.php     |  1 -
 modules/sanitycheck/hooks/hook_sanitycheck.php    |  1 -
 .../lib/Auth/Process/SmartName.php                |  2 --
 .../lib/Auth/Process/SmartName.php                |  2 --
 modules/sqlauth/lib/Auth/Source/SQL.php           |  2 --
 modules/statistics/hooks/hook_cron.php            |  1 -
 modules/statistics/hooks/hook_frontpage.php       |  1 -
 modules/statistics/hooks/hook_sanitycheck.php     |  1 -
 modules/statistics/lib/Graph/GoogleCharts.php     |  2 --
 modules/statistics/lib/LogCleaner.php             |  2 --
 modules/statistics/lib/LogParser.php              |  2 --
 templates/attributequery.php                      |  2 +-
 templates/error.php                               |  2 +-
 templates/errorreport.php                         |  2 +-
 templates/login.php                               |  2 +-
 templates/logout.php                              |  2 --
 templates/metadata-converter.php                  |  1 -
 templates/metadata.php                            |  2 +-
 templates/selectidp-dropdown.php                  |  2 +-
 templates/selectidp-links.php                     |  2 +-
 templates/status.php                              |  2 +-
 208 files changed, 25 insertions(+), 360 deletions(-)

diff --git a/attributemap/addurnprefix.php b/attributemap/addurnprefix.php
index f06f9961d..7b9bc08f1 100644
--- a/attributemap/addurnprefix.php
+++ b/attributemap/addurnprefix.php
@@ -18,5 +18,3 @@ $attributemap = array(
 	'eduPersonOrgDN'			=> 'urn:mace:dir:attribute-def:eduPersonOrgDN',
 	'eduPersonOrgUnitDN'		=> 'urn:mace:dir:attribute-def:eduPersonOrgUnitDN',
 );
-
-?>
\ No newline at end of file
diff --git a/attributemap/feide-oid.php b/attributemap/feide-oid.php
index 30a6a9d39..34ee2d5e8 100644
--- a/attributemap/feide-oid.php
+++ b/attributemap/feide-oid.php
@@ -37,5 +37,3 @@ ShibMapAttribute urn:mace:switch.ch:attribute-def:swissEduPersonStudyLevel Shib-
 ShibMapAttribute urn:mace:switch.ch:attribute-def:swissEduPersonStaffCategory Shib-SwissEP-StaffCategory staffCategory
 
 */
-
-?>
\ No newline at end of file
diff --git a/attributemap/name2claim.php b/attributemap/name2claim.php
index ba32920ad..015a3d870 100644
--- a/attributemap/name2claim.php
+++ b/attributemap/name2claim.php
@@ -11,4 +11,3 @@ $attributemap = array(
 	'streetaddress' => 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/streetaddress',
 	'telephonenumber' => 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/otherphone',
 );
-?>
diff --git a/attributemap/name2oid.php b/attributemap/name2oid.php
index 5e3346869..50714509c 100644
--- a/attributemap/name2oid.php
+++ b/attributemap/name2oid.php
@@ -163,4 +163,3 @@ $attributemap = array(
 	'schacHomeOrganization' => 'urn:oid:1.3.6.1.4.1.25178.1.2.9',
 	'schacPersonalUniqueCode' => 'urn:oid:1.3.6.1.4.1.25178.1.2.14',
 );
-?>
\ No newline at end of file
diff --git a/attributemap/name2urn.php b/attributemap/name2urn.php
index 5ccc677c1..b9689d56e 100644
--- a/attributemap/name2urn.php
+++ b/attributemap/name2urn.php
@@ -160,4 +160,3 @@ $attributemap = array(
 	'x121Address' => 'urn:mace:dir:attribute-def:x121Address',
 	'x500UniqueIdentifier' => 'urn:mace:dir:attribute-def:x500UniqueIdentifier',
 );
-?>
\ No newline at end of file
diff --git a/attributemap/oid-feide.php b/attributemap/oid-feide.php
index 3319804dd..7d9c9d0d1 100644
--- a/attributemap/oid-feide.php
+++ b/attributemap/oid-feide.php
@@ -10,5 +10,3 @@ $attributemap = array(
 	'urn:oid:2.5.4.42' => 'givenName',
 	'urn:oid:2.16.756.1.2.5.1.1.1' => 'eduPerson',
 );
-
-?>
\ No newline at end of file
diff --git a/attributemap/oid2name.php b/attributemap/oid2name.php
index cfb813351..3422d0385 100644
--- a/attributemap/oid2name.php
+++ b/attributemap/oid2name.php
@@ -142,4 +142,3 @@ $attributemap = array(
 	'urn:oid:1.3.6.1.4.1.25178.1.2.9' => 'schacHomeOrganization',
 	'urn:oid:1.3.6.1.4.1.25178.1.2.14' => 'schacPersonalUniqueCode',
 );
-?>
\ No newline at end of file
diff --git a/attributemap/oid2urn.php b/attributemap/oid2urn.php
index f32d7df20..0a15e9ed5 100644
--- a/attributemap/oid2urn.php
+++ b/attributemap/oid2urn.php
@@ -139,4 +139,3 @@ $attributemap = array(
 	'urn:oid:2.5.4.8' => 'urn:mace:dir:attribute-def:st',
 	'urn:oid:2.5.4.9' => 'urn:mace:dir:attribute-def:street',
 );
-?>
\ No newline at end of file
diff --git a/attributemap/removeurnprefix.php b/attributemap/removeurnprefix.php
index a48ffe12b..db9f034ff 100644
--- a/attributemap/removeurnprefix.php
+++ b/attributemap/removeurnprefix.php
@@ -18,5 +18,3 @@ $attributemap = array(
 	'urn:mace:dir:attribute-def:eduPersonOrgDN' => 'eduPersonOrgDN',
 	'urn:mace:dir:attribute-def:eduPersonOrgUnitDN' => 'eduPersonOrgUnitDN',
 );
-
-?>
\ No newline at end of file
diff --git a/attributemap/test.php b/attributemap/test.php
index 41e55c959..65be84dcf 100644
--- a/attributemap/test.php
+++ b/attributemap/test.php
@@ -36,5 +36,3 @@ ShibMapAttribute urn:mace:switch.ch:attribute-def:swissEduPersonStudyLevel Shib-
 ShibMapAttribute urn:mace:switch.ch:attribute-def:swissEduPersonStaffCategory Shib-SwissEP-StaffCategory staffCategory
 
 */
-
-?>
\ No newline at end of file
diff --git a/attributemap/urn2name.php b/attributemap/urn2name.php
index 1933b105e..14d2d96aa 100644
--- a/attributemap/urn2name.php
+++ b/attributemap/urn2name.php
@@ -160,4 +160,3 @@ $attributemap = array(
 	'urn:mace:dir:attribute-def:x121Address' => 'x121Address',
 	'urn:mace:dir:attribute-def:x500UniqueIdentifier' => 'x500UniqueIdentifier',
 );
-?>
\ No newline at end of file
diff --git a/attributemap/urn2oid.php b/attributemap/urn2oid.php
index 720482495..d8f1179eb 100644
--- a/attributemap/urn2oid.php
+++ b/attributemap/urn2oid.php
@@ -160,4 +160,3 @@ $attributemap = array(
 	'urn:mace:dir:attribute-def:x121Address' => 'urn:oid:2.5.4.24',
 	'urn:mace:dir:attribute-def:x500UniqueIdentifier' => 'urn:oid:2.5.4.45',
 );
-?>
\ No newline at end of file
diff --git a/bin/memcacheSync.php b/bin/memcacheSync.php
index 26c9cf7cd..0090f9625 100755
--- a/bin/memcacheSync.php
+++ b/bin/memcacheSync.php
@@ -161,5 +161,3 @@ function getServerKeys($server) {
 
 	return $keys;
 }
-
-?>
\ No newline at end of file
diff --git a/bin/translation.php b/bin/translation.php
index e07f5d524..0ffc820b5 100755
--- a/bin/translation.php
+++ b/bin/translation.php
@@ -194,5 +194,3 @@ function json_format($data, $indentation = '') {
 
 	return $ret;
 }
-
-?>
diff --git a/config-templates/authmemcookie.php b/config-templates/authmemcookie.php
index 47509494c..b8e8df8f9 100644
--- a/config-templates/authmemcookie.php
+++ b/config-templates/authmemcookie.php
@@ -73,5 +73,3 @@ $config = array(
 	'memcache.port' => 11211,
 
 );
-
-?>
\ No newline at end of file
diff --git a/config-templates/cas-ldap.php b/config-templates/cas-ldap.php
index b60c71016..087ff2e66 100644
--- a/config-templates/cas-ldap.php
+++ b/config-templates/cas-ldap.php
@@ -36,4 +36,3 @@ $casldapconfig = array (
 	),
 
 );
-?>
\ No newline at end of file
diff --git a/config-templates/config-login-auto.php b/config-templates/config-login-auto.php
index 0248ba120..2412882f1 100644
--- a/config-templates/config-login-auto.php
+++ b/config-templates/config-login-auto.php
@@ -61,6 +61,3 @@ $config = array (
 	 */
 	'auth.auto.delay_login' => 0,
 );
-
-
-?>
\ No newline at end of file
diff --git a/config-templates/config-login-feide.php b/config-templates/config-login-feide.php
index 7c437a005..9625323ba 100644
--- a/config-templates/config-login-feide.php
+++ b/config-templates/config-login-feide.php
@@ -35,5 +35,3 @@ $config = array (
 		),
 	),
 );
-
-?>
diff --git a/config-templates/ldap.php b/config-templates/ldap.php
index 31673128f..0e997b609 100644
--- a/config-templates/ldap.php
+++ b/config-templates/ldap.php
@@ -40,5 +40,3 @@ $config = array (
 	'auth.ldap.search.password' => NULL,
 
 );
-
-?>
diff --git a/config-templates/ldapmulti.php b/config-templates/ldapmulti.php
index fbd2e0382..e7c8b0cf8 100644
--- a/config-templates/ldapmulti.php
+++ b/config-templates/ldapmulti.php
@@ -29,5 +29,3 @@ $ldapmulti = array (
 	)
 	
 );
-
-?>
diff --git a/config-templates/translation.php b/config-templates/translation.php
index 97178e93d..8149aacf6 100644
--- a/config-templates/translation.php
+++ b/config-templates/translation.php
@@ -12,5 +12,3 @@ $config = array (
 	'secret' => '_0e29f782d295bc9782112981f654f1db58174d19d7',
 
 );
-
-?>
diff --git a/lib/SimpleSAML/Auth/LDAP.php b/lib/SimpleSAML/Auth/LDAP.php
index 2a3370efc..24e0a2828 100644
--- a/lib/SimpleSAML/Auth/LDAP.php
+++ b/lib/SimpleSAML/Auth/LDAP.php
@@ -704,5 +704,3 @@ class SimpleSAML_Auth_LDAP {
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/Auth/ProcessingFilter.php b/lib/SimpleSAML/Auth/ProcessingFilter.php
index 4e4664e0e..9a408428a 100644
--- a/lib/SimpleSAML/Auth/ProcessingFilter.php
+++ b/lib/SimpleSAML/Auth/ProcessingFilter.php
@@ -64,5 +64,3 @@ abstract class SimpleSAML_Auth_ProcessingFilter {
 	abstract public function process(&$request);
 
 }
-
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/Auth/Simple.php b/lib/SimpleSAML/Auth/Simple.php
index 26f702c92..da0881d48 100644
--- a/lib/SimpleSAML/Auth/Simple.php
+++ b/lib/SimpleSAML/Auth/Simple.php
@@ -325,5 +325,3 @@ class SimpleSAML_Auth_Simple {
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/Auth/Source.php b/lib/SimpleSAML/Auth/Source.php
index f6da3e0fa..fb90d99c8 100644
--- a/lib/SimpleSAML/Auth/Source.php
+++ b/lib/SimpleSAML/Auth/Source.php
@@ -349,5 +349,3 @@ abstract class SimpleSAML_Auth_Source {
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/Auth/State.php b/lib/SimpleSAML/Auth/State.php
index 3aec57179..1fe4ebf60 100644
--- a/lib/SimpleSAML/Auth/State.php
+++ b/lib/SimpleSAML/Auth/State.php
@@ -338,5 +338,3 @@ class SimpleSAML_Auth_State {
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/AuthMemCookie.php b/lib/SimpleSAML/AuthMemCookie.php
index 80fd00a50..dc1348fd8 100644
--- a/lib/SimpleSAML/AuthMemCookie.php
+++ b/lib/SimpleSAML/AuthMemCookie.php
@@ -144,5 +144,3 @@ class SimpleSAML_AuthMemCookie {
 		self::getInstance()->doLogout();
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/Bindings/Shib13/HTTPPost.php b/lib/SimpleSAML/Bindings/Shib13/HTTPPost.php
index 945206047..f9f5d8afc 100644
--- a/lib/SimpleSAML/Bindings/Shib13/HTTPPost.php
+++ b/lib/SimpleSAML/Bindings/Shib13/HTTPPost.php
@@ -119,4 +119,3 @@ class SimpleSAML_Bindings_Shib13_HTTPPost {
 
 }
 
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/Error/AuthSource.php b/lib/SimpleSAML/Error/AuthSource.php
index efcd5f5b6..0dda8ad8b 100644
--- a/lib/SimpleSAML/Error/AuthSource.php
+++ b/lib/SimpleSAML/Error/AuthSource.php
@@ -64,5 +64,3 @@ class SimpleSAML_Error_AuthSource extends SimpleSAML_Error_Error {
 
 	
 }
-
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/Error/BadUserInnput.php b/lib/SimpleSAML/Error/BadUserInnput.php
index 40891e838..aa0b8e064 100644
--- a/lib/SimpleSAML/Error/BadUserInnput.php
+++ b/lib/SimpleSAML/Error/BadUserInnput.php
@@ -9,5 +9,3 @@
 class SimpleSAML_Error_BadUserInnput extends SimpleSAML_Error_User{
 	
 }
-
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/Error/Exception.php b/lib/SimpleSAML/Error/Exception.php
index b0dca28dd..55689a27d 100644
--- a/lib/SimpleSAML/Error/Exception.php
+++ b/lib/SimpleSAML/Error/Exception.php
@@ -244,5 +244,3 @@ class SimpleSAML_Error_Exception extends Exception {
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/Error/InvalidCredential.php b/lib/SimpleSAML/Error/InvalidCredential.php
index 9b2160a53..00b975031 100644
--- a/lib/SimpleSAML/Error/InvalidCredential.php
+++ b/lib/SimpleSAML/Error/InvalidCredential.php
@@ -9,5 +9,3 @@
 class SimpleSAML_Error_InvalidCredential extends SimpleSAML_Error_User{
 	
 }
-
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/Error/NoPassive.php b/lib/SimpleSAML/Error/NoPassive.php
index 860833d14..73b5cd833 100644
--- a/lib/SimpleSAML/Error/NoPassive.php
+++ b/lib/SimpleSAML/Error/NoPassive.php
@@ -4,5 +4,3 @@
 class SimpleSAML_Error_NoPassive extends SimpleSAML_Error_Exception {
 
 }
-
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/Error/ProxyCountExceeded.php b/lib/SimpleSAML/Error/ProxyCountExceeded.php
index 624a1f8ff..bebe09321 100644
--- a/lib/SimpleSAML/Error/ProxyCountExceeded.php
+++ b/lib/SimpleSAML/Error/ProxyCountExceeded.php
@@ -4,5 +4,3 @@
 class SimpleSAML_Error_ProxyCountExceeded extends SimpleSAML_Error_Exception {
 
 }
-
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/Error/User.php b/lib/SimpleSAML/Error/User.php
index e46c7c6d7..c915790c2 100644
--- a/lib/SimpleSAML/Error/User.php
+++ b/lib/SimpleSAML/Error/User.php
@@ -11,5 +11,3 @@
 class SimpleSAML_Error_User extends SimpleSAML_Error_Exception{
 	
 }
-
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/Error/UserNotFound.php b/lib/SimpleSAML/Error/UserNotFound.php
index 557fdc356..e8b3ed039 100644
--- a/lib/SimpleSAML/Error/UserNotFound.php
+++ b/lib/SimpleSAML/Error/UserNotFound.php
@@ -10,5 +10,3 @@
 class SimpleSAML_Error_UserNotFound extends SimpleSAML_Error_User{
 	
 }
-
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/Memcache.php b/lib/SimpleSAML/Memcache.php
index 60d55a1ba..33d458457 100644
--- a/lib/SimpleSAML/Memcache.php
+++ b/lib/SimpleSAML/Memcache.php
@@ -430,4 +430,3 @@ class SimpleSAML_Memcache {
 	}
 
 }
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/Metadata/MetaDataStorageHandlerFlatFile.php b/lib/SimpleSAML/Metadata/MetaDataStorageHandlerFlatFile.php
index 6281314a9..22688c297 100644
--- a/lib/SimpleSAML/Metadata/MetaDataStorageHandlerFlatFile.php
+++ b/lib/SimpleSAML/Metadata/MetaDataStorageHandlerFlatFile.php
@@ -133,5 +133,3 @@ class SimpleSAML_Metadata_MetaDataStorageHandlerFlatFile extends SimpleSAML_Meta
 
 
 }
-
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/Metadata/MetaDataStorageHandlerSerialize.php b/lib/SimpleSAML/Metadata/MetaDataStorageHandlerSerialize.php
index 4cc25f531..3415cd5cc 100644
--- a/lib/SimpleSAML/Metadata/MetaDataStorageHandlerSerialize.php
+++ b/lib/SimpleSAML/Metadata/MetaDataStorageHandlerSerialize.php
@@ -254,5 +254,3 @@ class SimpleSAML_Metadata_MetaDataStorageHandlerSerialize extends SimpleSAML_Met
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/Metadata/MetaDataStorageHandlerXML.php b/lib/SimpleSAML/Metadata/MetaDataStorageHandlerXML.php
index 96a268224..9cfdb0c87 100644
--- a/lib/SimpleSAML/Metadata/MetaDataStorageHandlerXML.php
+++ b/lib/SimpleSAML/Metadata/MetaDataStorageHandlerXML.php
@@ -100,5 +100,3 @@ class SimpleSAML_Metadata_MetaDataStorageHandlerXML extends SimpleSAML_Metadata_
 		return array();
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/Metadata/MetaDataStorageSource.php b/lib/SimpleSAML/Metadata/MetaDataStorageSource.php
index 5a4ebf238..076271f42 100644
--- a/lib/SimpleSAML/Metadata/MetaDataStorageSource.php
+++ b/lib/SimpleSAML/Metadata/MetaDataStorageSource.php
@@ -223,4 +223,3 @@ abstract class SimpleSAML_Metadata_MetaDataStorageSource {
 	}
 
 }
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/Metadata/Signer.php b/lib/SimpleSAML/Metadata/Signer.php
index 5d595912e..51c29d315 100644
--- a/lib/SimpleSAML/Metadata/Signer.php
+++ b/lib/SimpleSAML/Metadata/Signer.php
@@ -197,5 +197,3 @@ class SimpleSAML_Metadata_Signer {
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/Module.php b/lib/SimpleSAML/Module.php
index 78683f305..b5d8f0245 100644
--- a/lib/SimpleSAML/Module.php
+++ b/lib/SimpleSAML/Module.php
@@ -196,5 +196,3 @@ class SimpleSAML_Module {
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/XHTML/EMail.php b/lib/SimpleSAML/XHTML/EMail.php
index 275295ade..67989b121 100644
--- a/lib/SimpleSAML/XHTML/EMail.php
+++ b/lib/SimpleSAML/XHTML/EMail.php
@@ -97,5 +97,3 @@ Content-Transfer-Encoding: 8bit
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/XHTML/IdPDisco.php b/lib/SimpleSAML/XHTML/IdPDisco.php
index 30c66da5d..87e7db3d3 100644
--- a/lib/SimpleSAML/XHTML/IdPDisco.php
+++ b/lib/SimpleSAML/XHTML/IdPDisco.php
@@ -528,5 +528,3 @@ class SimpleSAML_XHTML_IdPDisco {
 		$t->show();
 	}
 }
-
-?>
diff --git a/lib/SimpleSAML/XHTML/Template.php b/lib/SimpleSAML/XHTML/Template.php
index 667033a72..4186eb97f 100644
--- a/lib/SimpleSAML/XHTML/Template.php
+++ b/lib/SimpleSAML/XHTML/Template.php
@@ -716,5 +716,3 @@ class SimpleSAML_XHTML_Template {
 	}
 
 }
-
-?>
diff --git a/lib/SimpleSAML/XML/Errors.php b/lib/SimpleSAML/XML/Errors.php
index ed6cbd31f..bc2a06c00 100644
--- a/lib/SimpleSAML/XML/Errors.php
+++ b/lib/SimpleSAML/XML/Errors.php
@@ -130,5 +130,3 @@ class SimpleSAML_XML_Errors {
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/XML/Parser.php b/lib/SimpleSAML/XML/Parser.php
index 65a509132..b3096660c 100644
--- a/lib/SimpleSAML/XML/Parser.php
+++ b/lib/SimpleSAML/XML/Parser.php
@@ -65,5 +65,3 @@ class SimpleSAML_XML_Parser  {
 	}
 	
 }
-
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/XML/Shib13/AuthnRequest.php b/lib/SimpleSAML/XML/Shib13/AuthnRequest.php
index 651b87512..0d91446b1 100644
--- a/lib/SimpleSAML/XML/Shib13/AuthnRequest.php
+++ b/lib/SimpleSAML/XML/Shib13/AuthnRequest.php
@@ -44,5 +44,3 @@ class SimpleSAML_XML_Shib13_AuthnRequest {
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/XML/Shib13/AuthnResponse.php b/lib/SimpleSAML/XML/Shib13/AuthnResponse.php
index 1296cb271..12e6c6dcf 100644
--- a/lib/SimpleSAML/XML/Shib13/AuthnResponse.php
+++ b/lib/SimpleSAML/XML/Shib13/AuthnResponse.php
@@ -429,4 +429,3 @@ class SimpleSAML_XML_Shib13_AuthnResponse {
 
 }
 
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/XML/Signer.php b/lib/SimpleSAML/XML/Signer.php
index 7c569033d..15bf719e4 100644
--- a/lib/SimpleSAML/XML/Signer.php
+++ b/lib/SimpleSAML/XML/Signer.php
@@ -266,5 +266,3 @@ class SimpleSAML_XML_Signer {
 		$objXMLSecDSig->insertSignature($insertInto, $insertBefore);
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/XML/Validator.php b/lib/SimpleSAML/XML/Validator.php
index 50876ebc4..c9736363b 100644
--- a/lib/SimpleSAML/XML/Validator.php
+++ b/lib/SimpleSAML/XML/Validator.php
@@ -293,5 +293,3 @@ class SimpleSAML_XML_Validator {
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/log/_placeholder.php b/log/_placeholder.php
index 3af98a1ab..67c9ac072 100644
--- a/log/_placeholder.php
+++ b/log/_placeholder.php
@@ -1,3 +1,2 @@
 <?php
 /* this file can be deleted */
-?>
\ No newline at end of file
diff --git a/metadata-templates/adfs-idp-hosted.php b/metadata-templates/adfs-idp-hosted.php
index 4360c04ce..cace17d0c 100644
--- a/metadata-templates/adfs-idp-hosted.php
+++ b/metadata-templates/adfs-idp-hosted.php
@@ -10,5 +10,3 @@ $metadata['__DYNAMIC:1__'] = array(
 		100 => array('class' => 'core:AttributeMap', 'name2claim'),
 	),
 );
-
-?>
diff --git a/metadata-templates/adfs-sp-remote.php b/metadata-templates/adfs-sp-remote.php
index 373a6689f..8b627ee4b 100644
--- a/metadata-templates/adfs-sp-remote.php
+++ b/metadata-templates/adfs-sp-remote.php
@@ -10,5 +10,3 @@ $metadata['urn:federation:localhost'] = array(
 		),
 	),
 );
-
-?>
diff --git a/modules/InfoCard/config-template/config-login-infocard.php b/modules/InfoCard/config-template/config-login-infocard.php
index 3259851ef..fd6154a39 100644
--- a/modules/InfoCard/config-template/config-login-infocard.php
+++ b/modules/InfoCard/config-template/config-login-infocard.php
@@ -198,6 +198,3 @@ $config = array (
 	'debugDir' => '/tmp',
 
 );
- 
-
-?>
\ No newline at end of file
diff --git a/modules/InfoCard/dictionaries/dict-InfoCard.php b/modules/InfoCard/dictionaries/dict-InfoCard.php
index 82d6f7a07..f5c8171e0 100644
--- a/modules/InfoCard/dictionaries/dict-InfoCard.php
+++ b/modules/InfoCard/dictionaries/dict-InfoCard.php
@@ -451,6 +451,3 @@ $lang = array(
 	),
 
 );
-
-
-?>
\ No newline at end of file
diff --git a/modules/InfoCard/lib/Auth/Source/ICAuth.php b/modules/InfoCard/lib/Auth/Source/ICAuth.php
index bfefdabfc..83aafb348 100644
--- a/modules/InfoCard/lib/Auth/Source/ICAuth.php
+++ b/modules/InfoCard/lib/Auth/Source/ICAuth.php
@@ -94,5 +94,3 @@ class sspmod_InfoCard_Auth_Source_ICAuth extends SimpleSAML_Auth_Source {
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/modules/InfoCard/lib/RP/InfoCard.php b/modules/InfoCard/lib/RP/InfoCard.php
index 8cc7fb800..d0515110b 100644
--- a/modules/InfoCard/lib/RP/InfoCard.php
+++ b/modules/InfoCard/lib/RP/InfoCard.php
@@ -345,5 +345,3 @@ SimpleSAML_Logger::debug('IC: secureToken');
     return $decrypted;
   }
 }
-
-?>
diff --git a/modules/InfoCard/lib/STS.php b/modules/InfoCard/lib/STS.php
index 0ba0e14dc..4f14c8555 100644
--- a/modules/InfoCard/lib/STS.php
+++ b/modules/InfoCard/lib/STS.php
@@ -380,5 +380,3 @@ class sspmod_InfoCard_STS {
 	
 
 }
-
-?>
diff --git a/modules/InfoCard/lib/UserFunctions.php b/modules/InfoCard/lib/UserFunctions.php
index 73b8da64a..e9a522920 100644
--- a/modules/InfoCard/lib/UserFunctions.php
+++ b/modules/InfoCard/lib/UserFunctions.php
@@ -110,4 +110,3 @@ class sspmod_InfoCard_UserFunctions {
 	}
 
 }
-?>
\ No newline at end of file
diff --git a/modules/InfoCard/lib/Utils.php b/modules/InfoCard/lib/Utils.php
index 0df026495..1119349fb 100644
--- a/modules/InfoCard/lib/Utils.php
+++ b/modules/InfoCard/lib/Utils.php
@@ -105,4 +105,3 @@ class sspmod_InfoCard_Utils {
 
 
 }
-?>
\ No newline at end of file
diff --git a/modules/InfoCard/templates/temp-getcardform.php b/modules/InfoCard/templates/temp-getcardform.php
index f2bcf4031..70d31c271 100644
--- a/modules/InfoCard/templates/temp-getcardform.php
+++ b/modules/InfoCard/templates/temp-getcardform.php
@@ -66,4 +66,4 @@
 			echo "<p><a href='".$this->data['help_desk_email_URL']."'>".$this->t('help_desk_email')."</a></p>";
 	?>
 	
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?> 
+<?php $this->includeAtTemplateBase('includes/footer.php');
diff --git a/modules/InfoCard/templates/temp-login.php b/modules/InfoCard/templates/temp-login.php
index 099e61a94..407830b7a 100644
--- a/modules/InfoCard/templates/temp-login.php
+++ b/modules/InfoCard/templates/temp-login.php
@@ -79,4 +79,4 @@
 			echo "<p><a href='".$this->data['help_desk_email_URL']."'>".$this->t('help_desk_email')."</a></p>";
 	?>
 	
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
\ No newline at end of file
+<?php $this->includeAtTemplateBase('includes/footer.php');
diff --git a/modules/InfoCard/www/STS_card_issuer.php b/modules/InfoCard/www/STS_card_issuer.php
index 8847f5bdb..dcd901520 100644
--- a/modules/InfoCard/www/STS_card_issuer.php
+++ b/modules/InfoCard/www/STS_card_issuer.php
@@ -283,6 +283,3 @@ if ( (strcmp($_GET['ident'],'RADIUS')==0) && (($configuredIP == null) || ($_SERV
 		throw new SimpleSAML_Error_NotFound('The URL wasn\'t found in the module.');
 	}
 }
-
-
-?>
diff --git a/modules/InfoCard/www/getcardform.php b/modules/InfoCard/www/getcardform.php
index 76f4690c3..bcc4546d4 100644
--- a/modules/InfoCard/www/getcardform.php
+++ b/modules/InfoCard/www/getcardform.php
@@ -150,4 +150,3 @@ $t->data['password']=$password;
 
 $t->show();
 exit();
-?>
\ No newline at end of file
diff --git a/modules/InfoCard/www/login-infocard.php b/modules/InfoCard/www/login-infocard.php
index 97a399b5e..d34c36993 100644
--- a/modules/InfoCard/www/login-infocard.php
+++ b/modules/InfoCard/www/login-infocard.php
@@ -61,4 +61,3 @@ $t->data['contact_info_URL'] = $contact_info_URL;
 $t->data['error'] = $error;
 $t->show();
 exit();
-?>
diff --git a/modules/InfoCard/www/mex.php b/modules/InfoCard/www/mex.php
index 43c6554c6..030b8b8d9 100644
--- a/modules/InfoCard/www/mex.php
+++ b/modules/InfoCard/www/mex.php
@@ -240,18 +240,3 @@ $buf .= '</S:Envelope>';
 
 
 print($buf);
-
-?>
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/modules/InfoCard/www/prueba.php b/modules/InfoCard/www/prueba.php
index 34b8d27d4..6d38edb39 100644
--- a/modules/InfoCard/www/prueba.php
+++ b/modules/InfoCard/www/prueba.php
@@ -158,5 +158,4 @@ pg_close($dbconn);
 //  print base64_encode(calculate_PPID('urn:uuid:bbe3ecf5-900b-d249-b9a7-e7c261fdf189', $certificates));
 // 
 // // 	print base64_encode(pack('H*','0939625DA3A93E44F52D72AE4246EE54DE265D84'));
-//  	
-?>
+//
diff --git a/modules/InfoCard/www/tokenservice.php b/modules/InfoCard/www/tokenservice.php
index 081ac21b6..413d093a8 100644
--- a/modules/InfoCard/www/tokenservice.php
+++ b/modules/InfoCard/www/tokenservice.php
@@ -134,6 +134,3 @@ if ($debugDir!=null){
 	fwrite($handle,$response);
 	fclose($handle);
 }
-
-
-?>
\ No newline at end of file
diff --git a/modules/InfoCard/www/x509.php b/modules/InfoCard/www/x509.php
index 2b9416a7c..50b1d5c43 100644
--- a/modules/InfoCard/www/x509.php
+++ b/modules/InfoCard/www/x509.php
@@ -2,5 +2,3 @@
 <?php
 
 print 'x509';
-
-?>
\ No newline at end of file
diff --git a/modules/adfs/www/idp/prp.php b/modules/adfs/www/idp/prp.php
index 3bfc076d8..b11c95637 100644
--- a/modules/adfs/www/idp/prp.php
+++ b/modules/adfs/www/idp/prp.php
@@ -26,5 +26,3 @@ if (isset($_GET['wa'])) {
 	$logoutError = NULL; /* NULL on success, or an instance of a SimpleSAML_Error_Exception on failure. */
 	$idp->handleLogoutResponse($assocId, $relayState, $logoutError);
 }
-
-?>
diff --git a/modules/authX509/templates/X509error.php b/modules/authX509/templates/X509error.php
index 96b93046c..90e2dbd54 100644
--- a/modules/authX509/templates/X509error.php
+++ b/modules/authX509/templates/X509error.php
@@ -39,4 +39,3 @@ if(!empty($this->data['links'])) {
 
 
 $this->includeAtTemplateBase('includes/footer.php');
-?>
diff --git a/modules/authYubiKey/lib/Auth/Process/OTP2YubiPrefix.php b/modules/authYubiKey/lib/Auth/Process/OTP2YubiPrefix.php
index 3c98e9ee2..0527fb7ac 100644
--- a/modules/authYubiKey/lib/Auth/Process/OTP2YubiPrefix.php
+++ b/modules/authYubiKey/lib/Auth/Process/OTP2YubiPrefix.php
@@ -74,5 +74,3 @@ class sspmod_authYubiKey_Auth_Process_OTP2YubiPrefix extends SimpleSAML_Auth_Pro
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/modules/authYubiKey/lib/Auth/Source/YubiKey.php b/modules/authYubiKey/lib/Auth/Source/YubiKey.php
index 07482dbc4..a6227c060 100644
--- a/modules/authYubiKey/lib/Auth/Source/YubiKey.php
+++ b/modules/authYubiKey/lib/Auth/Source/YubiKey.php
@@ -207,5 +207,3 @@ class sspmod_authYubiKey_Auth_Source_YubiKey extends SimpleSAML_Auth_Source {
 	}
 
 }
-
-?>
diff --git a/modules/authYubiKey/libextinc/Yubico.php b/modules/authYubiKey/libextinc/Yubico.php
index 67e4374cf..9cdd51cb0 100644
--- a/modules/authYubiKey/libextinc/Yubico.php
+++ b/modules/authYubiKey/libextinc/Yubico.php
@@ -160,4 +160,3 @@ class Auth_Yubico
 		return true;
 	}
 }
-?>
diff --git a/modules/authYubiKey/templates/yubikeylogin.php b/modules/authYubiKey/templates/yubikeylogin.php
index eb3dce691..72e805d80 100644
--- a/modules/authYubiKey/templates/yubikeylogin.php
+++ b/modules/authYubiKey/templates/yubikeylogin.php
@@ -45,4 +45,3 @@ foreach ($this->data['stateparams'] as $name => $value) {
 <?php
 
 $this->includeAtTemplateBase('includes/footer.php');
-?>
\ No newline at end of file
diff --git a/modules/authYubiKey/www/yubikeylogin.php b/modules/authYubiKey/www/yubikeylogin.php
index fd6e0a70f..09c2796da 100644
--- a/modules/authYubiKey/www/yubikeylogin.php
+++ b/modules/authYubiKey/www/yubikeylogin.php
@@ -33,6 +33,3 @@ $t->data['stateparams'] = array('AuthState' => $authStateId);
 $t->data['errorcode'] = $errorCode;
 $t->show();
 exit();
-
-
-?>
\ No newline at end of file
diff --git a/modules/authfacebook/lib/Auth/Source/Facebook.php b/modules/authfacebook/lib/Auth/Source/Facebook.php
index 72696c813..7e6b9525e 100644
--- a/modules/authfacebook/lib/Auth/Source/Facebook.php
+++ b/modules/authfacebook/lib/Auth/Source/Facebook.php
@@ -125,5 +125,3 @@ class sspmod_authfacebook_Auth_Source_Facebook extends SimpleSAML_Auth_Source {
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/modules/authfacebook/www/linkback.php b/modules/authfacebook/www/linkback.php
index 879e3d222..0ab3656c2 100644
--- a/modules/authfacebook/www/linkback.php
+++ b/modules/authfacebook/www/linkback.php
@@ -42,5 +42,3 @@ try {
 }
 
 SimpleSAML_Auth_Source::completeAuth($state);
-
-?>
\ No newline at end of file
diff --git a/modules/authorize/lib/Auth/Process/Authorize.php b/modules/authorize/lib/Auth/Process/Authorize.php
index b73ad37a1..2fe62922c 100644
--- a/modules/authorize/lib/Auth/Process/Authorize.php
+++ b/modules/authorize/lib/Auth/Process/Authorize.php
@@ -131,5 +131,3 @@ class sspmod_authorize_Auth_Process_Authorize extends SimpleSAML_Auth_Processing
 		SimpleSAML_Utilities::redirectTrustedURL($url, array('StateId' => $id));
 	}
 }
-
-?>
diff --git a/modules/authorize/templates/authorize_403.php b/modules/authorize/templates/authorize_403.php
index fa947d71b..7aee2b8aa 100644
--- a/modules/authorize/templates/authorize_403.php
+++ b/modules/authorize/templates/authorize_403.php
@@ -26,4 +26,3 @@ if (isset($this->data['LogoutURL'])) {
 ?>
 <?php
 $this->includeAtTemplateBase('includes/footer.php');
-?>
diff --git a/modules/authorize/www/authorize_403.php b/modules/authorize/www/authorize_403.php
index 330b23500..4342e0a6a 100644
--- a/modules/authorize/www/authorize_403.php
+++ b/modules/authorize/www/authorize_403.php
@@ -26,6 +26,3 @@ if (isset($state['Source']['auth'])) {
 }
 header('HTTP/1.0 403 Forbidden');
 $t->show();
-
-
-?>
diff --git a/modules/casserver/config-templates/module_casserver.php b/modules/casserver/config-templates/module_casserver.php
index 0695bd599..fab96fbbf 100644
--- a/modules/casserver/config-templates/module_casserver.php
+++ b/modules/casserver/config-templates/module_casserver.php
@@ -19,5 +19,3 @@ $config = array (
 	#'attributes' => TRUE, // enable transfer of attributes
 	
 );
-
-?>
diff --git a/modules/casserver/www/cas.php b/modules/casserver/www/cas.php
index 1da904b24..5b9d16bad 100644
--- a/modules/casserver/www/cas.php
+++ b/modules/casserver/www/cas.php
@@ -32,5 +32,3 @@ if (!isset($validFunctions[$function])) {
 }
 
 include($validFunctions[$function].".php");
-
-?>
diff --git a/modules/casserver/www/proxy.php b/modules/casserver/www/proxy.php
index 0d21cfd77..c55f61979 100644
--- a/modules/casserver/www/proxy.php
+++ b/modules/casserver/www/proxy.php
@@ -51,5 +51,3 @@ print <<<eox
 </cas:serviceResponse>
 eox;
 }
-
-?>
\ No newline at end of file
diff --git a/modules/casserver/www/serviceValidate.php b/modules/casserver/www/serviceValidate.php
index b3b5c7256..71e9fdce8 100644
--- a/modules/casserver/www/serviceValidate.php
+++ b/modules/casserver/www/serviceValidate.php
@@ -97,5 +97,3 @@ function returnResponse($value, $function, $usrname = '', $attributes = array(),
 		}
 	}
 }
-
-?>
diff --git a/modules/casserver/www/tickets.php b/modules/casserver/www/tickets.php
index 165bcc77c..79498b108 100644
--- a/modules/casserver/www/tickets.php
+++ b/modules/casserver/www/tickets.php
@@ -39,5 +39,3 @@ function checkServiceURL($service, array $legal_service_urls) {
 	}
 	return FALSE;
 }
-
-?>
\ No newline at end of file
diff --git a/modules/casserver/www/validate.php b/modules/casserver/www/validate.php
index e9ac02680..b57c74469 100644
--- a/modules/casserver/www/validate.php
+++ b/modules/casserver/www/validate.php
@@ -1,4 +1,3 @@
 <?php
 $function = 'validate';
 include("serviceValidate.php");
-?>
\ No newline at end of file
diff --git a/modules/consent/dictionaries/consent.php b/modules/consent/dictionaries/consent.php
index 091172512..34c63552d 100644
--- a/modules/consent/dictionaries/consent.php
+++ b/modules/consent/dictionaries/consent.php
@@ -386,6 +386,3 @@ $lang = array(
 	),
 
 );
-
-
-?>
\ No newline at end of file
diff --git a/modules/consentAdmin/hooks/hook_frontpage.php b/modules/consentAdmin/hooks/hook_frontpage.php
index a87fb1e07..8be7bc163 100644
--- a/modules/consentAdmin/hooks/hook_frontpage.php
+++ b/modules/consentAdmin/hooks/hook_frontpage.php
@@ -13,4 +13,3 @@ function consentAdmin_hook_frontpage(&$links) {
 		'text' => '{consentAdmin:consentadmin:consentadmin_header}',
 	);
 }
-?>
diff --git a/modules/consentAdmin/templates/consentadmin.php b/modules/consentAdmin/templates/consentadmin.php
index 31075be1e..a07cd2286 100644
--- a/modules/consentAdmin/templates/consentadmin.php
+++ b/modules/consentAdmin/templates/consentadmin.php
@@ -134,4 +134,4 @@ TRSTART;
 
 			<p><a href="<?php echo SimpleSAML_Utilities::selfURL() . '?logout'; ?>">Logout</a></p>
 		
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
+<?php $this->includeAtTemplateBase('includes/footer.php');
diff --git a/modules/consentAdmin/templates/consentadminajax.php b/modules/consentAdmin/templates/consentadminajax.php
index 6897ad172..605542896 100644
--- a/modules/consentAdmin/templates/consentadminajax.php
+++ b/modules/consentAdmin/templates/consentadminajax.php
@@ -1,3 +1,2 @@
 <?php 
 print $this->t($this->data['res']);
-?>
diff --git a/modules/consentAdmin/www/consentAdmin.php b/modules/consentAdmin/www/consentAdmin.php
index 34ef2221a..efc2c1968 100644
--- a/modules/consentAdmin/www/consentAdmin.php
+++ b/modules/consentAdmin/www/consentAdmin.php
@@ -263,4 +263,3 @@ $et->data['header'] = 'Consent Administration';
 $et->data['spList'] = $sp_list;
 $et->data['showDescription'] = $cA_config->getValue('showDescription');
 $et->show();
-?>
diff --git a/modules/consentSimpleAdmin/hooks/hook_frontpage.php b/modules/consentSimpleAdmin/hooks/hook_frontpage.php
index 432fdcb36..0c3658ce9 100644
--- a/modules/consentSimpleAdmin/hooks/hook_frontpage.php
+++ b/modules/consentSimpleAdmin/hooks/hook_frontpage.php
@@ -18,6 +18,3 @@ function consentSimpleAdmin_hook_frontpage(&$links) {
 	);
 	
 }
-
-
-?>
diff --git a/modules/consentSimpleAdmin/hooks/hook_sanitycheck.php b/modules/consentSimpleAdmin/hooks/hook_sanitycheck.php
index 1cd997b38..5f829c8d0 100644
--- a/modules/consentSimpleAdmin/hooks/hook_sanitycheck.php
+++ b/modules/consentSimpleAdmin/hooks/hook_sanitycheck.php
@@ -30,4 +30,3 @@ function consentSimpleAdmin_hook_sanitycheck(&$hookinfo) {
 	}
 	
 }
-?>
\ No newline at end of file
diff --git a/modules/consentSimpleAdmin/templates/consentadmin.php b/modules/consentSimpleAdmin/templates/consentadmin.php
index 3bf4c727c..a19f6dfe4 100644
--- a/modules/consentSimpleAdmin/templates/consentadmin.php
+++ b/modules/consentSimpleAdmin/templates/consentadmin.php
@@ -31,4 +31,4 @@ echo '<p>' . $this->t('{consentSimpleAdmin:consentsimpleadmin:info}') . '</p>';
 </form>
 <!--  Withdraw all consent given -->
 
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
+<?php $this->includeAtTemplateBase('includes/footer.php');
diff --git a/modules/consentSimpleAdmin/templates/consentstats.php b/modules/consentSimpleAdmin/templates/consentstats.php
index 731a689f6..1c8094080 100644
--- a/modules/consentSimpleAdmin/templates/consentstats.php
+++ b/modules/consentSimpleAdmin/templates/consentstats.php
@@ -17,4 +17,4 @@ echo '<p>' . $this->t('{consentSimpleAdmin:consentsimpleadmin:statservices}', ar
 ?></p>
 
 
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
+<?php $this->includeAtTemplateBase('includes/footer.php');
diff --git a/modules/consentSimpleAdmin/www/consentAdmin.php b/modules/consentSimpleAdmin/www/consentAdmin.php
index ed1eaad03..f1c1d0816 100644
--- a/modules/consentSimpleAdmin/www/consentAdmin.php
+++ b/modules/consentSimpleAdmin/www/consentAdmin.php
@@ -89,4 +89,3 @@ $t->data['consents'] = count($user_consent_list);
 
 
 $t->show();
-?>
diff --git a/modules/consentSimpleAdmin/www/consentStats.php b/modules/consentSimpleAdmin/www/consentStats.php
index 5e753f5c0..92240e10b 100644
--- a/modules/consentSimpleAdmin/www/consentStats.php
+++ b/modules/consentSimpleAdmin/www/consentStats.php
@@ -29,4 +29,3 @@ $t->data['stats'] = $stats;
 
 
 $t->show();
-?>
diff --git a/modules/core/hooks/hook_frontpage.php b/modules/core/hooks/hook_frontpage.php
index 54ec267cc..ad4922150 100644
--- a/modules/core/hooks/hook_frontpage.php
+++ b/modules/core/hooks/hook_frontpage.php
@@ -30,4 +30,3 @@ function core_hook_frontpage(&$links) {
 	);
 
 }
-?>
\ No newline at end of file
diff --git a/modules/core/hooks/hook_sanitycheck.php b/modules/core/hooks/hook_sanitycheck.php
index d5b5084d7..d81ef25bc 100644
--- a/modules/core/hooks/hook_sanitycheck.php
+++ b/modules/core/hooks/hook_sanitycheck.php
@@ -49,4 +49,3 @@ function core_hook_sanitycheck(&$hookinfo) {
 	}
 	
 }
-?>
\ No newline at end of file
diff --git a/modules/core/lib/Auth/Process/AttributeAdd.php b/modules/core/lib/Auth/Process/AttributeAdd.php
index 32a4c2e83..fd3828a69 100644
--- a/modules/core/lib/Auth/Process/AttributeAdd.php
+++ b/modules/core/lib/Auth/Process/AttributeAdd.php
@@ -87,5 +87,3 @@ class sspmod_core_Auth_Process_AttributeAdd extends SimpleSAML_Auth_ProcessingFi
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/modules/core/lib/Auth/Process/AttributeCopy.php b/modules/core/lib/Auth/Process/AttributeCopy.php
index 73a3ca84c..8e46d976f 100644
--- a/modules/core/lib/Auth/Process/AttributeCopy.php
+++ b/modules/core/lib/Auth/Process/AttributeCopy.php
@@ -68,5 +68,3 @@ class sspmod_core_Auth_Process_AttributeCopy extends SimpleSAML_Auth_ProcessingF
 
 	}
 }
-
-?>
diff --git a/modules/core/lib/Auth/Process/AttributeMap.php b/modules/core/lib/Auth/Process/AttributeMap.php
index 4dda80c74..5ac7b44ea 100644
--- a/modules/core/lib/Auth/Process/AttributeMap.php
+++ b/modules/core/lib/Auth/Process/AttributeMap.php
@@ -118,5 +118,3 @@ class sspmod_core_Auth_Process_AttributeMap extends SimpleSAML_Auth_ProcessingFi
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/modules/core/lib/Auth/Process/AttributeRealm.php b/modules/core/lib/Auth/Process/AttributeRealm.php
index 44479d632..3c5415f79 100644
--- a/modules/core/lib/Auth/Process/AttributeRealm.php
+++ b/modules/core/lib/Auth/Process/AttributeRealm.php
@@ -52,5 +52,3 @@ class sspmod_core_Auth_Process_AttributeRealm extends SimpleSAML_Auth_Processing
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/modules/core/lib/Auth/Process/GenerateGroups.php b/modules/core/lib/Auth/Process/GenerateGroups.php
index 86a265323..406e8c72a 100644
--- a/modules/core/lib/Auth/Process/GenerateGroups.php
+++ b/modules/core/lib/Auth/Process/GenerateGroups.php
@@ -140,5 +140,3 @@ class sspmod_core_Auth_Process_GenerateGroups extends SimpleSAML_Auth_Processing
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/modules/core/lib/Auth/Process/TargetedID.php b/modules/core/lib/Auth/Process/TargetedID.php
index 069a3233b..aafdd2364 100644
--- a/modules/core/lib/Auth/Process/TargetedID.php
+++ b/modules/core/lib/Auth/Process/TargetedID.php
@@ -176,5 +176,3 @@ class sspmod_core_Auth_Process_TargetedID extends SimpleSAML_Auth_ProcessingFilt
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/modules/core/lib/Auth/Process/WarnShortSSOInterval.php b/modules/core/lib/Auth/Process/WarnShortSSOInterval.php
index 731809bda..1a731e3e6 100644
--- a/modules/core/lib/Auth/Process/WarnShortSSOInterval.php
+++ b/modules/core/lib/Auth/Process/WarnShortSSOInterval.php
@@ -50,5 +50,3 @@ class sspmod_core_Auth_Process_WarnShortSSOInterval extends SimpleSAML_Auth_Proc
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/modules/core/lib/Auth/Source/AdminPassword.php b/modules/core/lib/Auth/Source/AdminPassword.php
index e289759a0..adab5d60d 100644
--- a/modules/core/lib/Auth/Source/AdminPassword.php
+++ b/modules/core/lib/Auth/Source/AdminPassword.php
@@ -62,6 +62,3 @@ class sspmod_core_Auth_Source_AdminPassword extends sspmod_core_Auth_UserPassBas
 	}
 
 }
-
-
-?>
\ No newline at end of file
diff --git a/modules/core/lib/Auth/UserPassBase.php b/modules/core/lib/Auth/UserPassBase.php
index 0d7318c4f..de79c1f19 100644
--- a/modules/core/lib/Auth/UserPassBase.php
+++ b/modules/core/lib/Auth/UserPassBase.php
@@ -273,5 +273,3 @@ abstract class sspmod_core_Auth_UserPassBase extends SimpleSAML_Auth_Source {
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/modules/core/lib/Auth/UserPassOrgBase.php b/modules/core/lib/Auth/UserPassOrgBase.php
index 8ed4b7d85..1ffdb53ba 100644
--- a/modules/core/lib/Auth/UserPassOrgBase.php
+++ b/modules/core/lib/Auth/UserPassOrgBase.php
@@ -286,5 +286,3 @@ abstract class sspmod_core_Auth_UserPassOrgBase extends SimpleSAML_Auth_Source {
 		return $source->getOrganizations();
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/modules/core/templates/authsource_list.tpl.php b/modules/core/templates/authsource_list.tpl.php
index 0f075e8a4..db0a7cede 100644
--- a/modules/core/templates/authsource_list.tpl.php
+++ b/modules/core/templates/authsource_list.tpl.php
@@ -18,4 +18,3 @@ foreach ($this->data['sources'] as $id) {
 
 <?php
 $this->includeAtTemplateBase('includes/footer.php');
-?>
diff --git a/modules/core/templates/frontpage_auth.tpl.php b/modules/core/templates/frontpage_auth.tpl.php
index aa6037960..f0594948f 100644
--- a/modules/core/templates/frontpage_auth.tpl.php
+++ b/modules/core/templates/frontpage_auth.tpl.php
@@ -31,4 +31,4 @@ if ($this->data['isadmin']) {
 	
 
 		
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
\ No newline at end of file
+<?php $this->includeAtTemplateBase('includes/footer.php');
diff --git a/modules/core/templates/frontpage_config.tpl.php b/modules/core/templates/frontpage_config.tpl.php
index 9b32275ea..bef803521 100644
--- a/modules/core/templates/frontpage_config.tpl.php
+++ b/modules/core/templates/frontpage_config.tpl.php
@@ -94,4 +94,4 @@ if ($this->data['isadmin']) {
 	
 
 		
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
\ No newline at end of file
+<?php $this->includeAtTemplateBase('includes/footer.php');
diff --git a/modules/core/templates/frontpage_federation.tpl.php b/modules/core/templates/frontpage_federation.tpl.php
index e4f382765..489188567 100644
--- a/modules/core/templates/frontpage_federation.tpl.php
+++ b/modules/core/templates/frontpage_federation.tpl.php
@@ -163,4 +163,4 @@ if ($this->data['isadmin']) {
 	
 
 		
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
\ No newline at end of file
+<?php $this->includeAtTemplateBase('includes/footer.php');
diff --git a/modules/core/templates/frontpage_welcome.tpl.php b/modules/core/templates/frontpage_welcome.tpl.php
index 6a145c099..33d5ff251 100644
--- a/modules/core/templates/frontpage_welcome.tpl.php
+++ b/modules/core/templates/frontpage_welcome.tpl.php
@@ -33,4 +33,4 @@ if ($this->data['isadmin']) {
 
 
 		
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
\ No newline at end of file
+<?php $this->includeAtTemplateBase('includes/footer.php');
diff --git a/modules/core/templates/loginuserpass.php b/modules/core/templates/loginuserpass.php
index 98a778a4f..a0ccb0061 100644
--- a/modules/core/templates/loginuserpass.php
+++ b/modules/core/templates/loginuserpass.php
@@ -149,4 +149,3 @@ echo('<h2 class="logintext">' . $this->t('{login:help_header}') . '</h2>');
 echo('<p class="logintext">' . $this->t('{login:help_text}') . '</p>');
 
 $this->includeAtTemplateBase('includes/footer.php');
-?>
diff --git a/modules/core/templates/logout-iframe.php b/modules/core/templates/logout-iframe.php
index 02291f72d..473068895 100644
--- a/modules/core/templates/logout-iframe.php
+++ b/modules/core/templates/logout-iframe.php
@@ -213,4 +213,3 @@ if ($type === 'embed') {
 } else {
 	$this->includeAtTemplateBase('includes/footer.php');
 }
-?>
diff --git a/modules/core/templates/short_sso_interval.php b/modules/core/templates/short_sso_interval.php
index e99385191..7310c40ad 100644
--- a/modules/core/templates/short_sso_interval.php
+++ b/modules/core/templates/short_sso_interval.php
@@ -38,4 +38,3 @@ $this->includeAtTemplateBase('includes/header.php');
 
 <?php
 $this->includeAtTemplateBase('includes/footer.php');
-?>
diff --git a/modules/core/www/postredirect.php b/modules/core/www/postredirect.php
index df31a4ae9..9180bdfc4 100644
--- a/modules/core/www/postredirect.php
+++ b/modules/core/www/postredirect.php
@@ -50,5 +50,3 @@ $p->data['destination'] = $postData['url'];
 $p->data['post'] = $postData['post'];
 $p->show();
 exit(0);
-
-?>
\ No newline at end of file
diff --git a/modules/core/www/short_sso_interval.php b/modules/core/www/short_sso_interval.php
index 1949c7e76..6536631ab 100644
--- a/modules/core/www/short_sso_interval.php
+++ b/modules/core/www/short_sso_interval.php
@@ -32,6 +32,3 @@ $t->data['target'] = SimpleSAML_Module::getModuleURL('core/short_sso_interval.ph
 $t->data['params'] = array('StateId' => $id);
 $t->data['trackId'] = $session->getTrackID();
 $t->show();
-
-
-?>
\ No newline at end of file
diff --git a/modules/cron/config-templates/module_cron.php b/modules/cron/config-templates/module_cron.php
index 64daae484..32d5c28e7 100644
--- a/modules/cron/config-templates/module_cron.php
+++ b/modules/cron/config-templates/module_cron.php
@@ -11,5 +11,3 @@ $config = array (
 	'sendemail' => TRUE,
 
 );
-
-?>
diff --git a/modules/cron/hooks/hook_cron.php b/modules/cron/hooks/hook_cron.php
index 27488d023..62f6a4cb9 100644
--- a/modules/cron/hooks/hook_cron.php
+++ b/modules/cron/hooks/hook_cron.php
@@ -17,4 +17,3 @@ function cron_hook_cron(&$croninfo) {
 	}
 
 }
-?>
\ No newline at end of file
diff --git a/modules/cron/hooks/hook_frontpage.php b/modules/cron/hooks/hook_frontpage.php
index 76738b818..71a737429 100644
--- a/modules/cron/hooks/hook_frontpage.php
+++ b/modules/cron/hooks/hook_frontpage.php
@@ -14,4 +14,3 @@ function cron_hook_frontpage(&$links) {
 	);
 
 }
-?>
\ No newline at end of file
diff --git a/modules/cron/templates/croninfo-result.php b/modules/cron/templates/croninfo-result.php
index 89f9d5d29..489cd5d51 100644
--- a/modules/cron/templates/croninfo-result.php
+++ b/modules/cron/templates/croninfo-result.php
@@ -17,4 +17,3 @@ $this->includeAtTemplateBase('includes/header.php');
 
 <?php
 $this->includeAtTemplateBase('includes/footer.php');
-?>
diff --git a/modules/cron/templates/croninfo-tpl.php b/modules/cron/templates/croninfo-tpl.php
index c10c78302..49aa3131e 100644
--- a/modules/cron/templates/croninfo-tpl.php
+++ b/modules/cron/templates/croninfo-tpl.php
@@ -35,4 +35,3 @@ $run_text = $this->t('run_text');
 
 <?php
 $this->includeAtTemplateBase('includes/footer.php');
-?>
\ No newline at end of file
diff --git a/modules/cron/www/cron.php b/modules/cron/www/cron.php
index ac5390a8f..3180ca5d5 100644
--- a/modules/cron/www/cron.php
+++ b/modules/cron/www/cron.php
@@ -58,5 +58,3 @@ if (isset($_REQUEST['output']) && $_REQUEST['output'] == "xhtml") {
 	$t->data['summary'] = $summary;
 	$t->show();
 }
-
-?>
\ No newline at end of file
diff --git a/modules/cron/www/croninfo.php b/modules/cron/www/croninfo.php
index a0ecd68d9..6be04ebf6 100644
--- a/modules/cron/www/croninfo.php
+++ b/modules/cron/www/croninfo.php
@@ -39,6 +39,3 @@ foreach ($tags AS $tag) {
 $t = new SimpleSAML_XHTML_Template($config, 'cron:croninfo-tpl.php', 'cron:cron');
 $t->data['urls'] = $urls;
 $t->show();
-
-
-?>
\ No newline at end of file
diff --git a/modules/discopower/config-templates/module_discopower.php b/modules/discopower/config-templates/module_discopower.php
index b2e780c0b..4a17e1f7b 100644
--- a/modules/discopower/config-templates/module_discopower.php
+++ b/modules/discopower/config-templates/module_discopower.php
@@ -44,5 +44,3 @@ $config = array (
 	'cdc.lifetime' => NULL,
 
 );
-
-?>
diff --git a/modules/discopower/templates/disco-tpl.php b/modules/discopower/templates/disco-tpl.php
index 916cb16dd..f3c981412 100644
--- a/modules/discopower/templates/disco-tpl.php
+++ b/modules/discopower/templates/disco-tpl.php
@@ -210,4 +210,4 @@ foreach( $this->data['idplist'] AS $tab => $slist) {
 </div>
 
 		
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
+<?php $this->includeAtTemplateBase('includes/footer.php');
diff --git a/modules/discopower/www/disco.php b/modules/discopower/www/disco.php
index 2b21d4551..5e8b82d1e 100644
--- a/modules/discopower/www/disco.php
+++ b/modules/discopower/www/disco.php
@@ -13,5 +13,3 @@ try {
 	/* An error here should be caused by metadata. */
 	throw new SimpleSAML_Error_Error('METADATA', $exception);
 }
-
-?>
\ No newline at end of file
diff --git a/modules/exampleauth/lib/Auth/Process/RedirectTest.php b/modules/exampleauth/lib/Auth/Process/RedirectTest.php
index 1ed810394..79e5293e0 100644
--- a/modules/exampleauth/lib/Auth/Process/RedirectTest.php
+++ b/modules/exampleauth/lib/Auth/Process/RedirectTest.php
@@ -26,5 +26,3 @@ class sspmod_exampleauth_Auth_Process_RedirectTest extends SimpleSAML_Auth_Proce
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/modules/exampleauth/lib/Auth/Source/Static.php b/modules/exampleauth/lib/Auth/Source/Static.php
index 8328fabd3..68ddf5769 100644
--- a/modules/exampleauth/lib/Auth/Source/Static.php
+++ b/modules/exampleauth/lib/Auth/Source/Static.php
@@ -55,5 +55,3 @@ class sspmod_exampleauth_Auth_Source_Static extends SimpleSAML_Auth_Source {
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/modules/exampleauth/lib/Auth/Source/UserPass.php b/modules/exampleauth/lib/Auth/Source/UserPass.php
index c1af28533..f34bc33c7 100644
--- a/modules/exampleauth/lib/Auth/Source/UserPass.php
+++ b/modules/exampleauth/lib/Auth/Source/UserPass.php
@@ -88,5 +88,3 @@ class sspmod_exampleauth_Auth_Source_UserPass extends sspmod_core_Auth_UserPassB
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/modules/exampleauth/www/redirecttest.php b/modules/exampleauth/www/redirecttest.php
index d8d8d26f7..03ed359e3 100644
--- a/modules/exampleauth/www/redirecttest.php
+++ b/modules/exampleauth/www/redirecttest.php
@@ -24,5 +24,3 @@ $state = SimpleSAML_Auth_State::loadState($id, 'exampleauth:redirectfilter-test'
 $state['Attributes']['RedirectTest2'] = array('OK');
 
 SimpleSAML_Auth_ProcessingChain::resumeProcessing($state);
-
-?>
\ No newline at end of file
diff --git a/modules/expirycheck/lib/Auth/Process/ExpiryDate.php b/modules/expirycheck/lib/Auth/Process/ExpiryDate.php
index 30df1bac6..45a371903 100644
--- a/modules/expirycheck/lib/Auth/Process/ExpiryDate.php
+++ b/modules/expirycheck/lib/Auth/Process/ExpiryDate.php
@@ -155,6 +155,3 @@ class sspmod_expirycheck_Auth_Process_ExpiryDate extends SimpleSAML_Auth_Process
 
 
 }
-
-
-?>
diff --git a/modules/expirycheck/templates/about2expire.php b/modules/expirycheck/templates/about2expire.php
index 2fe6f8647..6b7752dab 100644
--- a/modules/expirycheck/templates/about2expire.php
+++ b/modules/expirycheck/templates/about2expire.php
@@ -89,4 +89,3 @@ $this->includeAtTemplateBase('includes/header.php');
 <?php
 
 $this->includeAtTemplateBase('includes/footer.php');
-?>
diff --git a/modules/expirycheck/templates/expired.php b/modules/expirycheck/templates/expired.php
index 817589f5d..2095d8099 100644
--- a/modules/expirycheck/templates/expired.php
+++ b/modules/expirycheck/templates/expired.php
@@ -9,4 +9,3 @@ $this->includeAtTemplateBase('includes/header.php');
 		<p><?php echo $this->t('{expirycheck:expwarning:contact_home}');?></p>
 <?php
 $this->includeAtTemplateBase('includes/footer.php');
-?>
diff --git a/modules/expirycheck/www/about2expire.php b/modules/expirycheck/www/about2expire.php
index f42406056..551a18c56 100644
--- a/modules/expirycheck/www/about2expire.php
+++ b/modules/expirycheck/www/about2expire.php
@@ -37,6 +37,3 @@ $t->data['daysleft'] = $state['daysleft'];
 $t->data['expireOnDate'] = $state['expireOnDate'];
 $t->data['netId'] = $state['netId'];
 $t->show();
-
-
-?>
diff --git a/modules/expirycheck/www/expired.php b/modules/expirycheck/www/expired.php
index 68523d868..69fb16dc8 100644
--- a/modules/expirycheck/www/expired.php
+++ b/modules/expirycheck/www/expired.php
@@ -28,6 +28,3 @@ $t = new SimpleSAML_XHTML_Template($globalConfig, 'expirycheck:expired.php');
 $t->data['expireOnDate'] = $state['expireOnDate'];
 $t->data['netId'] = $state['netId'];
 $t->show();
-
-
-?>
diff --git a/modules/ldap/lib/Auth/Source/LDAP.php b/modules/ldap/lib/Auth/Source/LDAP.php
index 4d81e638d..4ac9aece3 100644
--- a/modules/ldap/lib/Auth/Source/LDAP.php
+++ b/modules/ldap/lib/Auth/Source/LDAP.php
@@ -52,6 +52,3 @@ class sspmod_ldap_Auth_Source_LDAP extends sspmod_core_Auth_UserPassBase {
 	}
 
 }
-
-
-?>
\ No newline at end of file
diff --git a/modules/ldap/lib/Auth/Source/LDAPMulti.php b/modules/ldap/lib/Auth/Source/LDAPMulti.php
index 0533324a6..a879cc539 100644
--- a/modules/ldap/lib/Auth/Source/LDAPMulti.php
+++ b/modules/ldap/lib/Auth/Source/LDAPMulti.php
@@ -119,6 +119,3 @@ class sspmod_ldap_Auth_Source_LDAPMulti extends sspmod_core_Auth_UserPassOrgBase
 	}
 
 }
-
-
-?>
\ No newline at end of file
diff --git a/modules/logpeek/config-templates/module_logpeek.php b/modules/logpeek/config-templates/module_logpeek.php
index bc8cf0ad5..40d4693a4 100644
--- a/modules/logpeek/config-templates/module_logpeek.php
+++ b/modules/logpeek/config-templates/module_logpeek.php
@@ -9,5 +9,3 @@ $config = array (
 	// Read block size. 8192 is max, limited by fread.
 	'blocksz'	=> 8192,
 );
-
-?>
diff --git a/modules/logpeek/hooks/hook_frontpage.php b/modules/logpeek/hooks/hook_frontpage.php
index c92e43bee..6b850d3ff 100644
--- a/modules/logpeek/hooks/hook_frontpage.php
+++ b/modules/logpeek/hooks/hook_frontpage.php
@@ -14,4 +14,3 @@ function logpeek_hook_frontpage(&$links) {
 	);
 
 }
-?>
\ No newline at end of file
diff --git a/modules/logpeek/lib/File/reverseRead.php b/modules/logpeek/lib/File/reverseRead.php
index 99ceac57a..26a1ac1ce 100644
--- a/modules/logpeek/lib/File/reverseRead.php
+++ b/modules/logpeek/lib/File/reverseRead.php
@@ -221,4 +221,3 @@ class sspmod_logpeek_File_reverseRead{
 	}
 	
 }
-?>
\ No newline at end of file
diff --git a/modules/logpeek/lib/Syslog/parseLine.php b/modules/logpeek/lib/Syslog/parseLine.php
index be354b3f2..e2d56f922 100644
--- a/modules/logpeek/lib/Syslog/parseLine.php
+++ b/modules/logpeek/lib/Syslog/parseLine.php
@@ -22,4 +22,3 @@ class sspmod_logpeek_Syslog_parseLine{
 		return strtotime($time);
 	}
 }
-?>
\ No newline at end of file
diff --git a/modules/logpeek/templates/logpeek.php b/modules/logpeek/templates/logpeek.php
index 848ce87cb..2b25e282d 100644
--- a/modules/logpeek/templates/logpeek.php
+++ b/modules/logpeek/templates/logpeek.php
@@ -24,4 +24,4 @@ if (!empty($this->data['results'])) {
 }
 ?>
 </pre>
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
\ No newline at end of file
+<?php $this->includeAtTemplateBase('includes/footer.php');
diff --git a/modules/logpeek/www/index.php b/modules/logpeek/www/index.php
index 3ae3e7099..9c763571e 100644
--- a/modules/logpeek/www/index.php
+++ b/modules/logpeek/www/index.php
@@ -51,4 +51,3 @@ $t->data['endtime'] = date(DATE_RFC822, $lastTimeEpoch);
 $t->data['filesize'] = $fileSize;
 
 $t->show();
-?>
\ No newline at end of file
diff --git a/modules/memcacheMonitor/hooks/hook_frontpage.php b/modules/memcacheMonitor/hooks/hook_frontpage.php
index 048cc6d91..64c084344 100644
--- a/modules/memcacheMonitor/hooks/hook_frontpage.php
+++ b/modules/memcacheMonitor/hooks/hook_frontpage.php
@@ -14,6 +14,3 @@ function memcacheMonitor_hook_frontpage(&$links) {
 	);
 	
 }
-
-
-?>
diff --git a/modules/memcacheMonitor/hooks/hook_sanitycheck.php b/modules/memcacheMonitor/hooks/hook_sanitycheck.php
index 88df04646..b5b28d250 100644
--- a/modules/memcacheMonitor/hooks/hook_sanitycheck.php
+++ b/modules/memcacheMonitor/hooks/hook_sanitycheck.php
@@ -33,6 +33,3 @@ function memcacheMonitor_hook_sanitycheck(&$hookinfo) {
 		$hookinfo['info'][] = '[memcacheMonitor] All servers responding.';
 	}
 }
-
-
-?>
\ No newline at end of file
diff --git a/modules/memcacheMonitor/templates/memcachestat.tpl.php b/modules/memcacheMonitor/templates/memcachestat.tpl.php
index 1bd523bb5..a3e2d1081 100644
--- a/modules/memcacheMonitor/templates/memcachestat.tpl.php
+++ b/modules/memcacheMonitor/templates/memcachestat.tpl.php
@@ -99,4 +99,3 @@ if (array_key_exists('bytes', $this->data['statsraw']) && array_key_exists('limi
 
 <?php
 $this->includeAtTemplateBase('includes/footer.php');
-?>
\ No newline at end of file
diff --git a/modules/metaedit/hooks/hook_frontpage.php b/modules/metaedit/hooks/hook_frontpage.php
index 9c9a6646f..f62fcf884 100644
--- a/modules/metaedit/hooks/hook_frontpage.php
+++ b/modules/metaedit/hooks/hook_frontpage.php
@@ -15,4 +15,3 @@ function metaedit_hook_frontpage(&$links) {
 	);
 
 }
-?>
\ No newline at end of file
diff --git a/modules/metarefresh/hooks/hook_cron.php b/modules/metarefresh/hooks/hook_cron.php
index ce9be0c9d..f1a0512c7 100644
--- a/modules/metarefresh/hooks/hook_cron.php
+++ b/modules/metarefresh/hooks/hook_cron.php
@@ -95,4 +95,3 @@ function metarefresh_hook_cron(&$croninfo) {
 		$croninfo['summary'][] = 'Error during metarefresh: ' . $e->getMessage();
 	}
 }
-?>
\ No newline at end of file
diff --git a/modules/metarefresh/hooks/hook_frontpage.php b/modules/metarefresh/hooks/hook_frontpage.php
index 311cbc8d3..9114ea808 100644
--- a/modules/metarefresh/hooks/hook_frontpage.php
+++ b/modules/metarefresh/hooks/hook_frontpage.php
@@ -14,4 +14,3 @@ function metarefresh_hook_frontpage(&$links) {
 	);
 
 }
-?>
\ No newline at end of file
diff --git a/modules/metarefresh/lib/MetaLoader.php b/modules/metarefresh/lib/MetaLoader.php
index f34b58f0c..86e68b02f 100644
--- a/modules/metarefresh/lib/MetaLoader.php
+++ b/modules/metarefresh/lib/MetaLoader.php
@@ -444,5 +444,3 @@ class sspmod_metarefresh_MetaLoader {
 	}
 
 }
-
-?>
diff --git a/modules/metarefresh/templates/fetch.tpl.php b/modules/metarefresh/templates/fetch.tpl.php
index 6a1066cbc..512f6f429 100644
--- a/modules/metarefresh/templates/fetch.tpl.php
+++ b/modules/metarefresh/templates/fetch.tpl.php
@@ -20,4 +20,3 @@ if (!empty($this->data['logentries'])) {
 
 
 $this->includeAtTemplateBase('includes/footer.php');
-?>
\ No newline at end of file
diff --git a/modules/modinfo/hooks/hook_frontpage.php b/modules/modinfo/hooks/hook_frontpage.php
index 8e66d32a0..12aaa6d1a 100644
--- a/modules/modinfo/hooks/hook_frontpage.php
+++ b/modules/modinfo/hooks/hook_frontpage.php
@@ -14,4 +14,3 @@ function modinfo_hook_frontpage(&$links) {
 		);
 
 }
-?>
\ No newline at end of file
diff --git a/modules/modinfo/hooks/hook_moduleinfo.php b/modules/modinfo/hooks/hook_moduleinfo.php
index 3518f7012..2436715ea 100644
--- a/modules/modinfo/hooks/hook_moduleinfo.php
+++ b/modules/modinfo/hooks/hook_moduleinfo.php
@@ -18,4 +18,3 @@ function modinfo_hook_moduleinfo(&$moduleinfo) {
 	);
 
 }
-?>
\ No newline at end of file
diff --git a/modules/modinfo/templates/modlist.php b/modules/modinfo/templates/modlist.php
index 26c7a3f5a..f3c157ccc 100644
--- a/modules/modinfo/templates/modlist.php
+++ b/modules/modinfo/templates/modlist.php
@@ -61,4 +61,4 @@ foreach($this->data['modules'] as $id => $info) {
 }
 ?>
 </table>
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
\ No newline at end of file
+<?php $this->includeAtTemplateBase('includes/footer.php');
diff --git a/modules/modinfo/www/index.php b/modules/modinfo/www/index.php
index d8b4547fc..9e431d889 100644
--- a/modules/modinfo/www/index.php
+++ b/modules/modinfo/www/index.php
@@ -27,5 +27,3 @@ $config = SimpleSAML_Configuration::getInstance();
 $t = new SimpleSAML_XHTML_Template($config, 'modinfo:modlist.php');
 $t->data['modules'] = $modinfo;
 $t->show();
-
-?>
\ No newline at end of file
diff --git a/modules/multiauth/lib/Auth/Source/MultiAuth.php b/modules/multiauth/lib/Auth/Source/MultiAuth.php
index d4dd83cd3..de7fcd4b0 100644
--- a/modules/multiauth/lib/Auth/Source/MultiAuth.php
+++ b/modules/multiauth/lib/Auth/Source/MultiAuth.php
@@ -226,5 +226,3 @@ class sspmod_multiauth_Auth_Source_MultiAuth extends SimpleSAML_Auth_Source {
 		}
 	}
 }
-
-?>
diff --git a/modules/multiauth/templates/selectsource.php b/modules/multiauth/templates/selectsource.php
index 1f16f31a7..f5eaba07e 100644
--- a/modules/multiauth/templates/selectsource.php
+++ b/modules/multiauth/templates/selectsource.php
@@ -28,4 +28,4 @@ foreach($this->data['sources'] as $source) {
 ?>
 </ul>
 </form>
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
+<?php $this->includeAtTemplateBase('includes/footer.php');
diff --git a/modules/multiauth/www/selectsource.php b/modules/multiauth/www/selectsource.php
index b085baaa4..ecd762115 100644
--- a/modules/multiauth/www/selectsource.php
+++ b/modules/multiauth/www/selectsource.php
@@ -65,5 +65,3 @@ if ($as !== NULL) {
 }
 $t->show();
 exit();
-
-?>
\ No newline at end of file
diff --git a/modules/negotiate/templates/disable.php b/modules/negotiate/templates/disable.php
index 8022d8acf..28acd0933 100644
--- a/modules/negotiate/templates/disable.php
+++ b/modules/negotiate/templates/disable.php
@@ -17,4 +17,4 @@ $url = SimpleSAML_Module::getModuleURL('negotiate/enable.php');
 
 <?php echo $this->t('{negotiate:negotiate:info_post}'); ?>
 
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
+<?php $this->includeAtTemplateBase('includes/footer.php');
diff --git a/modules/negotiate/templates/enable.php b/modules/negotiate/templates/enable.php
index e4bd77c33..ff07e65f6 100644
--- a/modules/negotiate/templates/enable.php
+++ b/modules/negotiate/templates/enable.php
@@ -18,4 +18,4 @@ $url = SimpleSAML_Module::getModuleURL('negotiate/disable.php');
 
 <?php echo $this->t('{negotiate:negotiate:info_post}'); ?>
 
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
+<?php $this->includeAtTemplateBase('includes/footer.php');
diff --git a/modules/oauth/hooks/hook_cron.php b/modules/oauth/hooks/hook_cron.php
index 60483082b..9b27aafef 100644
--- a/modules/oauth/hooks/hook_cron.php
+++ b/modules/oauth/hooks/hook_cron.php
@@ -27,4 +27,3 @@ function oauth_hook_cron(&$croninfo) {
 		$croninfo['summary'][] = $message;
 	}
 }
-?>
\ No newline at end of file
diff --git a/modules/oauth/hooks/hook_frontpage.php b/modules/oauth/hooks/hook_frontpage.php
index a9733b1af..5112bc2e9 100644
--- a/modules/oauth/hooks/hook_frontpage.php
+++ b/modules/oauth/hooks/hook_frontpage.php
@@ -15,4 +15,3 @@ function oauth_hook_frontpage(&$links) {
 	);
 
 }
-?>
\ No newline at end of file
diff --git a/modules/oauth/lib/OAuthSignatureMethodRSASHA1.php b/modules/oauth/lib/OAuthSignatureMethodRSASHA1.php
index 8c2e0449e..a29d68ef1 100644
--- a/modules/oauth/lib/OAuthSignatureMethodRSASHA1.php
+++ b/modules/oauth/lib/OAuthSignatureMethodRSASHA1.php
@@ -29,4 +29,3 @@ class sspmod_oauth_OAuthSignatureMethodRSASHA1 extends OAuthSignatureMethod_RSA_
 		return $oConsumer->secret;
 	}
 }
-?>
\ No newline at end of file
diff --git a/modules/oauth/libextinc/OAuth.php b/modules/oauth/libextinc/OAuth.php
index f02fccd6c..a4c438f8a 100644
--- a/modules/oauth/libextinc/OAuth.php
+++ b/modules/oauth/libextinc/OAuth.php
@@ -891,5 +891,3 @@ class OAuthUtil {
     return implode('&', $pairs);
   }
 }
-
-?>
diff --git a/modules/oauth/templates/authorized.php b/modules/oauth/templates/authorized.php
index 264751a0d..7ce806d56 100644
--- a/modules/oauth/templates/authorized.php
+++ b/modules/oauth/templates/authorized.php
@@ -17,4 +17,3 @@ $this->includeAtTemplateBase('includes/header.php');
 
 <?php
 $this->includeAtTemplateBase('includes/footer.php');
-?>
\ No newline at end of file
diff --git a/modules/oauth/templates/consent.php b/modules/oauth/templates/consent.php
index c82af245d..efb883df6 100644
--- a/modules/oauth/templates/consent.php
+++ b/modules/oauth/templates/consent.php
@@ -16,4 +16,3 @@ $this->includeAtTemplateBase('includes/header.php');
 
 <?php
 $this->includeAtTemplateBase('includes/footer.php');
-?>
\ No newline at end of file
diff --git a/modules/papi/lib/Auth/Source/PAPI.php b/modules/papi/lib/Auth/Source/PAPI.php
index 10ffd0eef..37ea144b6 100644
--- a/modules/papi/lib/Auth/Source/PAPI.php
+++ b/modules/papi/lib/Auth/Source/PAPI.php
@@ -183,5 +183,3 @@ class sspmod_papi_Auth_Source_PAPI extends SimpleSAML_Auth_Source {
 	}
 
 }
-
-?>
diff --git a/modules/portal/config-templates/module_portal.php b/modules/portal/config-templates/module_portal.php
index b7b817315..bff5d9ac6 100644
--- a/modules/portal/config-templates/module_portal.php
+++ b/modules/portal/config-templates/module_portal.php
@@ -11,5 +11,3 @@ $config = array (
 	),
 	
 );
-
-?>
diff --git a/modules/preprodwarning/lib/Auth/Process/Warning.php b/modules/preprodwarning/lib/Auth/Process/Warning.php
index 0f25527ae..1c734091e 100644
--- a/modules/preprodwarning/lib/Auth/Process/Warning.php
+++ b/modules/preprodwarning/lib/Auth/Process/Warning.php
@@ -34,5 +34,3 @@ class sspmod_preprodwarning_Auth_Process_Warning extends SimpleSAML_Auth_Process
 
 
 }
-
-?>
\ No newline at end of file
diff --git a/modules/preprodwarning/templates/warning.php b/modules/preprodwarning/templates/warning.php
index da4ccf52d..ea01ceaf2 100644
--- a/modules/preprodwarning/templates/warning.php
+++ b/modules/preprodwarning/templates/warning.php
@@ -42,4 +42,3 @@ $this->includeAtTemplateBase('includes/header.php');
 <?php
 
 $this->includeAtTemplateBase('includes/footer.php');
-?>
diff --git a/modules/preprodwarning/www/showwarning.php b/modules/preprodwarning/www/showwarning.php
index 79466e8bd..43a07cff0 100644
--- a/modules/preprodwarning/www/showwarning.php
+++ b/modules/preprodwarning/www/showwarning.php
@@ -38,6 +38,3 @@ $t = new SimpleSAML_XHTML_Template($globalConfig, 'preprodwarning:warning.php');
 $t->data['yesTarget'] = SimpleSAML_Module::getModuleURL('preprodwarning/showwarning.php');
 $t->data['yesData'] = array('StateId' => $id);
 $t->show();
-
-
-?>
\ No newline at end of file
diff --git a/modules/saml/lib/Error.php b/modules/saml/lib/Error.php
index 19d05933e..a920e124c 100644
--- a/modules/saml/lib/Error.php
+++ b/modules/saml/lib/Error.php
@@ -191,5 +191,3 @@ class sspmod_saml_Error extends SimpleSAML_Error_Exception {
 		return $status;
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/modules/saml/www/idp/certs.php b/modules/saml/www/idp/certs.php
index a26da3379..328cda4d2 100644
--- a/modules/saml/www/idp/certs.php
+++ b/modules/saml/www/idp/certs.php
@@ -33,5 +33,3 @@ header('Content-Disposition: attachment; filename='.substr($_SERVER['PATH_INFO']
 header('Content-Type: application/x-x509-ca-cert');
 echo $certInfo['PEM'];
 exit(0);
-
-?>
diff --git a/modules/saml/www/sp/metadata.php b/modules/saml/www/sp/metadata.php
index 80033a782..647192a9a 100644
--- a/modules/saml/www/sp/metadata.php
+++ b/modules/saml/www/sp/metadata.php
@@ -229,4 +229,3 @@ if (array_key_exists('output', $_REQUEST) && $_REQUEST['output'] == 'xhtml') {
 	header('Content-Type: application/samlmetadata+xml');
 	echo($xml);
 }
-?>
diff --git a/modules/saml/www/sp/saml1-acs.php b/modules/saml/www/sp/saml1-acs.php
index fcfd5a073..de98e3491 100644
--- a/modules/saml/www/sp/saml1-acs.php
+++ b/modules/saml/www/sp/saml1-acs.php
@@ -91,5 +91,3 @@ $state['LogoutState'] = $logoutState;
 
 $source->handleResponse($state, $responseIssuer, $attributes);
 assert('FALSE');
-
-?>
diff --git a/modules/saml2debug/hooks/hook_frontpage.php b/modules/saml2debug/hooks/hook_frontpage.php
index a59ae67e7..dfc913ff7 100644
--- a/modules/saml2debug/hooks/hook_frontpage.php
+++ b/modules/saml2debug/hooks/hook_frontpage.php
@@ -14,6 +14,3 @@ function saml2debug_hook_frontpage(&$links) {
 	);
 	
 }
-
-
-?>
diff --git a/modules/saml2debug/templates/debug.tpl.php b/modules/saml2debug/templates/debug.tpl.php
index 47849ab35..05ce4aa8c 100644
--- a/modules/saml2debug/templates/debug.tpl.php
+++ b/modules/saml2debug/templates/debug.tpl.php
@@ -65,4 +65,4 @@ $this->includeAtTemplateBase('includes/header.php');
 
 
 
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
\ No newline at end of file
+<?php $this->includeAtTemplateBase('includes/footer.php');
diff --git a/modules/saml2debug/www/debug.php b/modules/saml2debug/www/debug.php
index 391b1b805..644e600cf 100644
--- a/modules/saml2debug/www/debug.php
+++ b/modules/saml2debug/www/debug.php
@@ -64,5 +64,3 @@ $t->data['encoded'] = $encoded;
 $t->data['decoded'] = $decoded;
 $t->data['activeTab'] = $activeTab;
 $t->show();
-
-?>
\ No newline at end of file
diff --git a/modules/sanitycheck/config-templates/config-sanitycheck.php b/modules/sanitycheck/config-templates/config-sanitycheck.php
index ad607479f..78635c5da 100644
--- a/modules/sanitycheck/config-templates/config-sanitycheck.php
+++ b/modules/sanitycheck/config-templates/config-sanitycheck.php
@@ -14,5 +14,3 @@ $config = array (
 	'cron_tag' => 'hourly',
 
 );
-
-?>
\ No newline at end of file
diff --git a/modules/sanitycheck/hooks/hook_cron.php b/modules/sanitycheck/hooks/hook_cron.php
index 049447e3a..7b779a1fe 100644
--- a/modules/sanitycheck/hooks/hook_cron.php
+++ b/modules/sanitycheck/hooks/hook_cron.php
@@ -40,4 +40,3 @@ function sanitycheck_hook_cron(&$croninfo) {
 	}
 
 }
-?>
\ No newline at end of file
diff --git a/modules/sanitycheck/hooks/hook_frontpage.php b/modules/sanitycheck/hooks/hook_frontpage.php
index 57b3cfce0..f76e482c5 100644
--- a/modules/sanitycheck/hooks/hook_frontpage.php
+++ b/modules/sanitycheck/hooks/hook_frontpage.php
@@ -15,4 +15,3 @@ function sanitycheck_hook_frontpage(&$links) {
 	);
 
 }
-?>
\ No newline at end of file
diff --git a/modules/sanitycheck/hooks/hook_moduleinfo.php b/modules/sanitycheck/hooks/hook_moduleinfo.php
index ff9642df5..c18672711 100644
--- a/modules/sanitycheck/hooks/hook_moduleinfo.php
+++ b/modules/sanitycheck/hooks/hook_moduleinfo.php
@@ -17,4 +17,3 @@ function sanitycheck_hook_moduleinfo(&$moduleinfo) {
 	);
 
 }
-?>
\ No newline at end of file
diff --git a/modules/sanitycheck/hooks/hook_sanitycheck.php b/modules/sanitycheck/hooks/hook_sanitycheck.php
index dbba1bec7..c15f1c68f 100644
--- a/modules/sanitycheck/hooks/hook_sanitycheck.php
+++ b/modules/sanitycheck/hooks/hook_sanitycheck.php
@@ -12,4 +12,3 @@ function sanitycheck_hook_sanitycheck(&$hookinfo) {
 	$hookinfo['info'][] = '[sanitycheck] At least the sanity check itself is working :)';	
 	
 }
-?>
diff --git a/modules/smartattributes/lib/Auth/Process/SmartName.php b/modules/smartattributes/lib/Auth/Process/SmartName.php
index 3c97bf1c5..035d28a1e 100644
--- a/modules/smartattributes/lib/Auth/Process/SmartName.php
+++ b/modules/smartattributes/lib/Auth/Process/SmartName.php
@@ -74,5 +74,3 @@ class sspmod_smartattribute_Auth_Process_SmartName extends SimpleSAML_Auth_Proce
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/modules/smartnameattribute/lib/Auth/Process/SmartName.php b/modules/smartnameattribute/lib/Auth/Process/SmartName.php
index 48c177e97..498715c39 100644
--- a/modules/smartnameattribute/lib/Auth/Process/SmartName.php
+++ b/modules/smartnameattribute/lib/Auth/Process/SmartName.php
@@ -76,5 +76,3 @@ class sspmod_smartnameattribute_Auth_Process_SmartName extends SimpleSAML_Auth_P
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/modules/sqlauth/lib/Auth/Source/SQL.php b/modules/sqlauth/lib/Auth/Source/SQL.php
index cac7e4821..3279fbe0e 100644
--- a/modules/sqlauth/lib/Auth/Source/SQL.php
+++ b/modules/sqlauth/lib/Auth/Source/SQL.php
@@ -191,5 +191,3 @@ class sspmod_sqlauth_Auth_Source_SQL extends sspmod_core_Auth_UserPassBase {
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/modules/statistics/hooks/hook_cron.php b/modules/statistics/hooks/hook_cron.php
index c97141feb..1e608d3df 100644
--- a/modules/statistics/hooks/hook_cron.php
+++ b/modules/statistics/hooks/hook_cron.php
@@ -33,4 +33,3 @@ function statistics_hook_cron(&$croninfo) {
 		$croninfo['summary'][] = $message;
 	}
 }
-?>
\ No newline at end of file
diff --git a/modules/statistics/hooks/hook_frontpage.php b/modules/statistics/hooks/hook_frontpage.php
index b6a2f73eb..825917320 100644
--- a/modules/statistics/hooks/hook_frontpage.php
+++ b/modules/statistics/hooks/hook_frontpage.php
@@ -20,4 +20,3 @@ function statistics_hook_frontpage(&$links) {
 	);
 
 }
-?>
\ No newline at end of file
diff --git a/modules/statistics/hooks/hook_sanitycheck.php b/modules/statistics/hooks/hook_sanitycheck.php
index ab10ea381..236802c48 100644
--- a/modules/statistics/hooks/hook_sanitycheck.php
+++ b/modules/statistics/hooks/hook_sanitycheck.php
@@ -36,4 +36,3 @@ function statistics_hook_sanitycheck(&$hookinfo) {
 		$hookinfo['errors'][] = '[statistics] Input file [' . $inputfile . '] does not exists';
 	}
 }
-?>
\ No newline at end of file
diff --git a/modules/statistics/lib/Graph/GoogleCharts.php b/modules/statistics/lib/Graph/GoogleCharts.php
index df36bb172..385068ef8 100644
--- a/modules/statistics/lib/Graph/GoogleCharts.php
+++ b/modules/statistics/lib/Graph/GoogleCharts.php
@@ -180,5 +180,3 @@ class sspmod_statistics_Graph_GoogleCharts {
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/modules/statistics/lib/LogCleaner.php b/modules/statistics/lib/LogCleaner.php
index ed55ad98b..55c7493e5 100644
--- a/modules/statistics/lib/LogCleaner.php
+++ b/modules/statistics/lib/LogCleaner.php
@@ -173,5 +173,3 @@ class sspmod_statistics_LogCleaner {
 
 
 }
-
-?>
\ No newline at end of file
diff --git a/modules/statistics/lib/LogParser.php b/modules/statistics/lib/LogParser.php
index b9a88805e..d0d54ca07 100644
--- a/modules/statistics/lib/LogParser.php
+++ b/modules/statistics/lib/LogParser.php
@@ -68,5 +68,3 @@ class sspmod_statistics_LogParser {
 
 
 }
-
-?>
\ No newline at end of file
diff --git a/templates/attributequery.php b/templates/attributequery.php
index 9eb276be8..fc1459071 100644
--- a/templates/attributequery.php
+++ b/templates/attributequery.php
@@ -78,4 +78,4 @@ if ($attributes !== NULL) {
 }
 ?>
 
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
\ No newline at end of file
+<?php $this->includeAtTemplateBase('includes/footer.php');
diff --git a/templates/error.php b/templates/error.php
index b4358af42..d8e7b38cb 100644
--- a/templates/error.php
+++ b/templates/error.php
@@ -69,4 +69,4 @@ if (isset($this->data['errorReportAddress'])) {
 <p><?php echo $this->t('howto_text'); ?></p>
 
 
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
\ No newline at end of file
+<?php $this->includeAtTemplateBase('includes/footer.php');
diff --git a/templates/errorreport.php b/templates/errorreport.php
index c6d22cc7f..278d48385 100644
--- a/templates/errorreport.php
+++ b/templates/errorreport.php
@@ -6,4 +6,4 @@
 
 <h2><?php echo $this->t('errorreport_header'); ?></h2>
 <p><?php echo $this->t('errorreport_text'); ?></p>
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
\ No newline at end of file
+<?php $this->includeAtTemplateBase('includes/footer.php');
diff --git a/templates/login.php b/templates/login.php
index 83dacd246..cd4aaa644 100644
--- a/templates/login.php
+++ b/templates/login.php
@@ -68,4 +68,4 @@
 	<p class="logintext"><?php echo $this->t('help_text'); ?></p>
 	
 
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
+<?php $this->includeAtTemplateBase('includes/footer.php');
diff --git a/templates/logout.php b/templates/logout.php
index 8ce3f71b5..885f3a54b 100644
--- a/templates/logout.php
+++ b/templates/logout.php
@@ -16,5 +16,3 @@ echo('<p>[ <a href="' . htmlspecialchars($this->data['link']) . '">' .
 	htmlspecialchars($this->data['text']) . '</a> ]</p>');
 
 $this->includeAtTemplateBase('includes/footer.php');
-
-?>
\ No newline at end of file
diff --git a/templates/metadata-converter.php b/templates/metadata-converter.php
index f8b17c114..ae95982b2 100644
--- a/templates/metadata-converter.php
+++ b/templates/metadata-converter.php
@@ -40,4 +40,3 @@ if($output !== NULL) {
 
 <?php
 $this->includeAtTemplateBase('includes/footer.php');
-?>
\ No newline at end of file
diff --git a/templates/metadata.php b/templates/metadata.php
index 3d2ca520f..e4f9471cb 100644
--- a/templates/metadata.php
+++ b/templates/metadata.php
@@ -48,4 +48,4 @@ if(array_key_exists('available_certs', $this->data)) {	?>
 		
 
 
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
\ No newline at end of file
+<?php $this->includeAtTemplateBase('includes/footer.php');
diff --git a/templates/selectidp-dropdown.php b/templates/selectidp-dropdown.php
index 3d8e24a00..e967353c2 100644
--- a/templates/selectidp-dropdown.php
+++ b/templates/selectidp-dropdown.php
@@ -60,4 +60,4 @@ foreach ($this->data['idplist'] AS $idpentry) {
 		</form>
 
 		
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
+<?php $this->includeAtTemplateBase('includes/footer.php');
diff --git a/templates/selectidp-links.php b/templates/selectidp-links.php
index 85aa3ca8b..c513838fb 100644
--- a/templates/selectidp-links.php
+++ b/templates/selectidp-links.php
@@ -83,4 +83,4 @@ foreach ($this->data['idplist'] AS $idpentry) {
 		?>
 		</form>
 		
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
+<?php $this->includeAtTemplateBase('includes/footer.php');
diff --git a/templates/status.php b/templates/status.php
index b3bd0e367..e4046d651 100644
--- a/templates/status.php
+++ b/templates/status.php
@@ -124,4 +124,4 @@ if (isset($this->data['logouturl'])) {
 	<h2><?php echo $this->t('{core:frontpage:about_header}'); ?></h2>
 	<p><?php echo $this->t('{core:frontpage:about_text}'); ?></p>
 	
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
\ No newline at end of file
+<?php $this->includeAtTemplateBase('includes/footer.php');
-- 
GitLab