WIP - Removing unneccessary closing tags to prevent potential issues. (…

…#223) * Part 1 Removing closing tags when no HTML or other output comes after the last PHP codeblock. * Further removals * nothing --------- Co-authored-by: slawkens <slawkens@gmail.com>
slawkens · Jun 15, 2023 · 76bfab1 · 76bfab1
1 parent 171c114
commit 76bfab1
Show file tree

Hide file tree

Showing 89 changed files with 11 additions and 144 deletions.
diff --git a/admin/includes/functions.php b/admin/includes/functions.php
@@ -1 +1,2 @@
-<?php// nothing yet here?>
+<?php
+// nothing yet here
diff --git a/admin/pages/pages.php b/admin/pages/pages.php
@@ -258,5 +258,3 @@ static public function toggleHidden($id, &$errors, &$status)
 		return !count($errors);
 	}
 }
-
-?>
diff --git a/admin/pages/statistics.php b/admin/pages/statistics.php
@@ -36,4 +36,3 @@
 	'account_type' => (USE_ACCOUNT_NAME ? 'name' : 'number'),
 	'points' => $points
 ));
-?>
diff --git a/admin/pages/version.php b/admin/pages/version.php
@@ -47,4 +47,3 @@ function version_revert($version)
 	$release = $version;
 	return $major . '.' . $minor . '.' . $release;
 }*/
-?>
diff --git a/admin/tools/phpinfo.php b/admin/tools/phpinfo.php
@@ -13,4 +13,3 @@
 	die('phpinfo() disabled on this web server.');
 
 phpinfo();
-?>
diff --git a/install/includes/config.php b/install/includes/config.php
@@ -38,4 +38,3 @@
 		$error = true;
 	}
 }
-?>
diff --git a/install/steps/2-license.php b/install/steps/2-license.php
@@ -5,4 +5,3 @@
 	'license' => file_get_contents(BASE . 'LICENSE'),
 	'buttons' => next_buttons()
 ));
-?>
diff --git a/install/steps/4-config.php b/install/steps/4-config.php
@@ -18,4 +18,3 @@
 	'errors' => isset($errors) ? $errors : null,
 	'buttons' => next_buttons()
 ));
-?>
diff --git a/system/counter.php b/system/counter.php
@@ -51,4 +51,3 @@
 		updateDatabaseConfig('views_counter', $views_counter); // update counter
 	}
 }
-?>
diff --git a/system/init.php b/system/init.php
@@ -122,7 +122,7 @@
 $config['data_path'] = $foundValue;
 unset($foundValue);
 
-// new config values for compability
+// new config values for compatibility
 if(!isset($config['highscores_ids_hidden']) || count($config['highscores_ids_hidden']) == 0) {
 	$config['highscores_ids_hidden'] = array(0);
 }

diff --git a/system/item.php b/system/item.php
@@ -58,4 +58,3 @@ function outputItem($id = 100, $count = 1)
 	$file_name = Items_Images::$outputDir . $file_name . '.gif';
 	readfile($file_name);
 }
-?>
diff --git a/system/libs/data.php b/system/libs/data.php
@@ -41,4 +41,3 @@ public function update($data, $where)
 		return $db->update($this->table, $data, $where);
 	}
 }
-?>
diff --git a/system/libs/pot/E_OTS_ErrorCode.php b/system/libs/pot/E_OTS_ErrorCode.php
@@ -32,5 +32,3 @@ public function __construct($code, $message = '')
 }
 
 /**#@-*/
-
-?>
diff --git a/system/libs/pot/E_OTS_Generic.php b/system/libs/pot/E_OTS_Generic.php
@@ -36,5 +36,3 @@ class E_OTS_Generic extends E_OTS_ErrorCode
 }
 
 /**#@-*/
-
-?>
diff --git a/system/libs/pot/E_OTS_NotAContainer.php b/system/libs/pot/E_OTS_NotAContainer.php
@@ -22,5 +22,3 @@ class E_OTS_NotAContainer extends Exception
 }
 
 /**#@-*/
-
-?>
diff --git a/system/libs/pot/E_OTS_OTBMError.php b/system/libs/pot/E_OTS_OTBMError.php
@@ -32,5 +32,3 @@ class E_OTS_OTBMError extends E_OTS_ErrorCode
 }
 
 /**#@-*/
-
-?>
diff --git a/system/libs/pot/E_OTS_ReadOnly.php b/system/libs/pot/E_OTS_ReadOnly.php
@@ -22,5 +22,3 @@ class E_OTS_ReadOnly extends Exception
 }
 
 /**#@-*/
-
-?>
diff --git a/system/libs/pot/IOTS_Cipher.php b/system/libs/pot/IOTS_Cipher.php
@@ -37,5 +37,3 @@ public function decrypt($message);
 }
 
 /**#@-*/
-
-?>
diff --git a/system/libs/pot/IOTS_DataDisplay.php b/system/libs/pot/IOTS_DataDisplay.php
@@ -89,5 +89,3 @@ public function displaySpellsList(OTS_SpellsList $spellsList);
 }
 
 /**#@-*/
-
-?>
diff --git a/system/libs/pot/IOTS_Display.php b/system/libs/pot/IOTS_Display.php
@@ -96,5 +96,3 @@ public function displayGuildRanksList(OTS_GuildRanks_List $guildRanksList);
 }
 
 /**#@-*/
-
-?>
diff --git a/system/libs/pot/IOTS_GuildAction.php b/system/libs/pot/IOTS_GuildAction.php
@@ -67,5 +67,3 @@ public function submitRequest(OTS_Player $player);
 }
 
 /**#@-*/
-
-?>
diff --git a/system/libs/pot/OTS_Account.php b/system/libs/pot/OTS_Account.php
@@ -1198,5 +1198,3 @@ public function __toString()
 }
 
 /**#@-*/
-
-?>
diff --git a/system/libs/pot/OTS_AccountBans_List.php b/system/libs/pot/OTS_AccountBans_List.php
@@ -34,5 +34,3 @@ public function __construct()
         $this->setFilter($filter);
     }
 }
-
-?>
diff --git a/system/libs/pot/OTS_Admin.php b/system/libs/pot/OTS_Admin.php
@@ -735,5 +735,3 @@ public function __wakeup()
 }
 
 /**#@-*/
-
-?>
diff --git a/system/libs/pot/OTS_Bans_List.php b/system/libs/pot/OTS_Bans_List.php
@@ -100,5 +100,3 @@ public function current()
         }
     }
 }
-
-?>
diff --git a/system/libs/pot/OTS_Base_DB.php b/system/libs/pot/OTS_Base_DB.php
@@ -265,5 +265,3 @@ public function getLog() {
 }
 
 /**#@-*/
-
-?>
diff --git a/system/libs/pot/OTS_BinaryTools.php b/system/libs/pot/OTS_BinaryTools.php
@@ -146,5 +146,3 @@ public static function int2Bin($number)
 }
 
 /**#@-*/
-
-?>
diff --git a/system/libs/pot/OTS_Container.php b/system/libs/pot/OTS_Container.php
@@ -149,5 +149,3 @@ public function __clone()
 }
 
 /**#@-*/
-
-?>
diff --git a/system/libs/pot/OTS_FileLoader.php b/system/libs/pot/OTS_FileLoader.php
@@ -357,5 +357,3 @@ public function __set($name, $value)
 }
 
 /**#@-*/
-
-?>
diff --git a/system/libs/pot/OTS_Group.php b/system/libs/pot/OTS_Group.php
@@ -671,5 +671,3 @@ public function __toString()
 }
 
 /**#@-*/
-
-?>
diff --git a/system/libs/pot/OTS_Guild.php b/system/libs/pot/OTS_Guild.php
@@ -837,5 +837,3 @@ public function __toString()
 }
 
 /**#@-*/
-
-?>
diff --git a/system/libs/pot/OTS_GuildRanks_List.php b/system/libs/pot/OTS_GuildRanks_List.php
@@ -72,5 +72,3 @@ public function __toString()
 }
 
 /**#@-*/
-
-?>
diff --git a/system/libs/pot/OTS_House.php b/system/libs/pot/OTS_House.php
@@ -529,5 +529,3 @@ public function __toString()
 }
 
 /**#@-*/
-
-?>
diff --git a/system/libs/pot/OTS_IPBans_List.php b/system/libs/pot/OTS_IPBans_List.php
@@ -34,5 +34,3 @@ public function __construct()
         $this->setFilter($filter);
     }
 }
-
-?>
diff --git a/system/libs/pot/OTS_InfoRespond.php b/system/libs/pot/OTS_InfoRespond.php
@@ -387,5 +387,3 @@ public function __toString()
 }
 
 /**#@-*/
-
-?>
diff --git a/system/libs/pot/OTS_ItemsList.php b/system/libs/pot/OTS_ItemsList.php
@@ -676,5 +676,3 @@ public function __toString()
 }
 
 /**#@-*/
-
-?>
diff --git a/system/libs/pot/OTS_MapCoords.php b/system/libs/pot/OTS_MapCoords.php
@@ -130,5 +130,3 @@ public function __get($name)
 }
 
 /**#@-*/
-
-?>
diff --git a/system/libs/pot/OTS_MonstersList.php b/system/libs/pot/OTS_MonstersList.php
@@ -299,5 +299,3 @@ public function __toString()
 }
 
 /**#@-*/
-
-?>
diff --git a/system/libs/pot/OTS_Player.php b/system/libs/pot/OTS_Player.php
@@ -3627,5 +3627,3 @@ public function __toString()
 }
 
 /**#@-*/
-
-?>
diff --git a/system/libs/pot/OTS_PlayerBans_List.php b/system/libs/pot/OTS_PlayerBans_List.php
@@ -34,5 +34,3 @@ public function __construct()
         $this->setFilter($filter);
     }
 }
-
-?>
diff --git a/system/libs/pot/OTS_Row_DAO.php b/system/libs/pot/OTS_Row_DAO.php
@@ -75,5 +75,3 @@ abstract public function find($name);
 }
 
 /**#@-*/
-
-?>
diff --git a/system/libs/pot/OTS_SQLField.php b/system/libs/pot/OTS_SQLField.php
@@ -121,5 +121,3 @@ public function __toString()
 }
 
 /**#@-*/
-
-?>
diff --git a/system/libs/pot/OTS_ServerInfo.php b/system/libs/pot/OTS_ServerInfo.php
@@ -227,5 +227,3 @@ public function __get($name)
 }
 
 /**#@-*/
-
-?>
diff --git a/system/libs/pot/OTS_Spell.php b/system/libs/pot/OTS_Spell.php
@@ -482,5 +482,3 @@ public function __toString()
 }
 
 /**#@-*/
-
-?>
diff --git a/system/libs/pot/OTS_Toolbox.php b/system/libs/pot/OTS_Toolbox.php
@@ -113,5 +113,3 @@ public static function bannedAccounts()
 }
 
 /**#@-*/
-
-?>
diff --git a/system/libs/pot/OTS_XTEA.php b/system/libs/pot/OTS_XTEA.php
@@ -151,5 +151,3 @@ public function decrypt($message)
 }
 
 /**#@-*/
-
-?>
diff --git a/system/libs/rfc6238.php b/system/libs/rfc6238.php
@@ -282,4 +282,3 @@ private static function oath_truncate($hash, $length = 6, $debug=false) {
 		return $result;
 	}
 }
-?>
diff --git a/system/libs/validator.php b/system/libs/validator.php
@@ -451,4 +451,3 @@ public static function getLastError() {
 		return self::$lastError;
 	}
 }
-?>
diff --git a/system/locale/de/admin.php b/system/locale/de/admin.php
@@ -6,4 +6,3 @@
  * @author Slawkens <slawkens@gmail.com>
  */
 $locale['title'] = 'MyAAC Admin';
-?>
diff --git a/system/locale/de/main.php b/system/locale/de/main.php
@@ -11,5 +11,4 @@
 $locale['direction']= 'ltr';
 
 $locale['error404'] = 'Diese Seite konnte nicht gefunden werden.';
-$locale['news'] = 'Neuesten Nachrichten';
-?>
+$locale['news'] = 'Neuesten Nachrichten';
diff --git a/system/locale/en/install.php b/system/locale/en/install.php
@@ -131,4 +131,3 @@
 $locale['step_finish_desc'] = 'Congratulations! <b>MyAAC</b> is ready to use!<br/>You can now login to $ADMIN_PANEL$, or visit $HOMEPAGE$.<br/><br/>
 <span style="color: red">Please delete install/ directory.</span><br/><br/>
 Post bugs and suggestions at $LINK$, thanks!';
-?>
diff --git a/system/locale/pl/admin.php b/system/locale/pl/admin.php
@@ -6,4 +6,3 @@
  * @author Slawkens <slawkens@gmail.com>
  */
 $locale['title'] = 'MyAAC Admin';
-?>
diff --git a/system/locale/pl/main.php b/system/locale/pl/main.php
@@ -12,4 +12,4 @@
 
 $locale['error404'] = 'Strona nie została odnaleziona.';
 $locale['news'] = 'Ostatnie newsy';
-$locale['loaded_in_ms'] = 'w $TIME$ ms';
+$locale['loaded_in_ms'] = 'w $TIME$ ms';
diff --git a/system/locale/pt_br/install.php b/system/locale/pt_br/install.php
@@ -118,4 +118,3 @@
 $locale['step_finish_title'] = 'Instalação terminada!';
 $locale['step_finish_desc'] = 'Parabéns! <b>MyAAC</b> está pronto para uso!<br/>Agora você pode fazer login em $ADMIN_PANEL$ ou visitar $HOMEPAGE$.<br/><br/>
 <span style = "color: red">Por favor remova a pasta install/.</span><br/><br/>Postar bugs e sugestões em $LINK$, obrigado!';
-?>
diff --git a/system/locale/sv/admin.php b/system/locale/sv/admin.php
@@ -6,4 +6,3 @@
  * @author Sizaro <sizaro@live.se>
  */
 $locale['title'] = 'MyAAC Admin';
-?>
diff --git a/system/locale/sv/main.php b/system/locale/sv/main.php
@@ -12,4 +12,3 @@
 
 $locale['error404'] = 'Sidan kunde inte hittas.';
 $locale['news'] = 'Senaste nyheterna';
-?>
diff --git a/system/migrations/11.php b/system/migrations/11.php
@@ -17,4 +17,3 @@
 			'thumb' => str_replace('/screenshots/', '/gallery/', $item['thumb']),
 		), array('id' => $item['id']));
 	}
-?>
diff --git a/system/migrations/13.php b/system/migrations/13.php
@@ -1,4 +1,3 @@
 <?php
 	if($db->hasColumn(TABLE_PREFIX . 'spells', 'spell'))
-		$db->query("ALTER TABLE `" . TABLE_PREFIX . "spells` DROP COLUMN `spell`;");
-?>
+		$db->query("ALTER TABLE `" . TABLE_PREFIX . "spells` DROP COLUMN `spell`;");
diff --git a/system/migrations/15.php b/system/migrations/15.php
@@ -8,4 +8,3 @@
 if(!$db->hasColumn(TABLE_PREFIX . 'forum_boards', 'access')) {
 	$db->query("ALTER TABLE `" . TABLE_PREFIX . "forum_boards` ADD `access` TINYINT(1) NOT NULL DEFAULT 0 AFTER `guild`;");
 }
-?>
diff --git a/system/migrations/17.php b/system/migrations/17.php
@@ -86,4 +86,3 @@
 INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Shop History', 'gifts/history', 6, 2);
 	");
 }
-?>
diff --git a/system/migrations/19.php b/system/migrations/19.php
@@ -1,3 +1,2 @@
 <?php
-// this migration has been removed, but file kept for compability
-?>
+// this migration has been removed, but file kept for compatibility
diff --git a/system/migrations/2.php b/system/migrations/2.php
@@ -3,4 +3,3 @@
 	$db->query("ALTER TABLE `" . TABLE_PREFIX . "movies` MODIFY `title` VARCHAR(100) NOT NULL DEFAULT '';");
 	$db->query("ALTER TABLE `" . TABLE_PREFIX . "news` MODIFY `title` VARCHAR(100) NOT NULL DEFAULT '';");
 	$db->query("ALTER TABLE `" . TABLE_PREFIX . "news` MODIFY `body` TEXT NOT NULL DEFAULT '';");
-?>
diff --git a/system/migrations/20.php b/system/migrations/20.php
@@ -45,4 +45,3 @@ function databaseMigration20(&$content = '') {
 	file_put_contents($config_file, $content, FILE_APPEND);
 	return true;
 }
-?>
diff --git a/system/migrations/4.php b/system/migrations/4.php
@@ -1,4 +1,3 @@
 <?php
 	if(!$db->hasColumn(TABLE_PREFIX . 'monsters', 'id'))
-		$db->query("ALTER TABLE `" . TABLE_PREFIX . "monsters` ADD `id` int(11) NOT NULL AUTO_INCREMENT primary key FIRST;");
-?>
+		$db->query("ALTER TABLE `" . TABLE_PREFIX . "monsters` ADD `id` int(11) NOT NULL AUTO_INCREMENT primary key FIRST;");
diff --git a/system/migrations/6.php b/system/migrations/6.php
@@ -1,4 +1,3 @@
 <?php
 	if(!$db->hasColumn(TABLE_PREFIX . 'hooks', 'enabled'))
-		$db->query("ALTER TABLE `" . TABLE_PREFIX . "hooks` ADD `enabled` INT(1) NOT NULL DEFAULT 1;");
-?>
+		$db->query("ALTER TABLE `" . TABLE_PREFIX . "hooks` ADD `enabled` INT(1) NOT NULL DEFAULT 1;");
diff --git a/system/migrations/8.php b/system/migrations/8.php
@@ -14,5 +14,4 @@
 
 		foreach($boards as $id => $board)
 			$db->query('UPDATE `' . TABLE_PREFIX . 'forum_boards` SET `ordering` = ' . $id . ' WHERE `name` = ' . $db->quote($board));
-	}
-?>
+	}