瀏覽代碼

Merge pull request #105 from jdarwood007/no-closing-php

Removed closing PHP line endings
Michael Eshom 11 年之前
父節點
當前提交
404fd53479
共有 100 個文件被更改,包括 11 次插入201 次删除
  1. 0 0
      .gitignore
  2. 0 2
      Packages/backups/index.php
  3. 0 2
      Packages/index.php
  4. 0 2
      SSI.php
  5. 0 2
      Smileys/aaron/index.php
  6. 0 2
      Smileys/akyhne/index.php
  7. 0 2
      Smileys/default/index.php
  8. 0 2
      Smileys/fugue/index.php
  9. 0 2
      Smileys/index.php
  10. 0 2
      Sources/Admin.php
  11. 0 2
      Sources/BoardIndex.php
  12. 0 2
      Sources/Calendar.php
  13. 0 1
      Sources/Class-CurlFetchWeb.php
  14. 0 2
      Sources/Class-Graphics.php
  15. 0 2
      Sources/Class-Package.php
  16. 0 2
      Sources/DbExtra-mysql.php
  17. 0 2
      Sources/DbExtra-postgresql.php
  18. 0 2
      Sources/DbExtra-sqlite.php
  19. 0 2
      Sources/DbPackages-mysql.php
  20. 0 2
      Sources/DbPackages-postgresql.php
  21. 0 2
      Sources/DbPackages-sqlite.php
  22. 0 2
      Sources/DbSearch-mysql.php
  23. 0 2
      Sources/DbSearch-postgresql.php
  24. 0 2
      Sources/DbSearch-sqlite.php
  25. 0 2
      Sources/Display.php
  26. 0 2
      Sources/DumpDatabase.php
  27. 0 2
      Sources/Errors.php
  28. 0 2
      Sources/Groups.php
  29. 0 2
      Sources/Help.php
  30. 0 2
      Sources/Karma.php
  31. 1 3
      Sources/Load.php
  32. 0 2
      Sources/LogInOut.php
  33. 1 3
      Sources/Logging.php
  34. 0 1
      Sources/ManageAttachments.php
  35. 0 2
      Sources/ManageBans.php
  36. 0 1
      Sources/ManageBoards.php
  37. 0 2
      Sources/ManageCalendar.php
  38. 0 2
      Sources/ManageErrors.php
  39. 0 2
      Sources/ManageLanguages.php
  40. 0 2
      Sources/ManageMail.php
  41. 0 2
      Sources/ManageMaintenance.php
  42. 0 2
      Sources/ManageMembergroups.php
  43. 0 2
      Sources/ManageMembers.php
  44. 0 1
      Sources/ManageNews.php
  45. 0 2
      Sources/ManagePaid.php
  46. 0 2
      Sources/ManagePermissions.php
  47. 0 2
      Sources/ManagePosts.php
  48. 0 2
      Sources/ManageRegistration.php
  49. 0 2
      Sources/ManageScheduledTasks.php
  50. 0 2
      Sources/ManageSearch.php
  51. 0 2
      Sources/ManageSearchEngines.php
  52. 0 2
      Sources/ManageServer.php
  53. 0 2
      Sources/ManageSettings.php
  54. 0 1
      Sources/ManageSmileys.php
  55. 0 2
      Sources/Memberlist.php
  56. 0 2
      Sources/MessageIndex.php
  57. 0 2
      Sources/ModerationCenter.php
  58. 0 2
      Sources/Modlog.php
  59. 0 2
      Sources/MoveTopic.php
  60. 0 2
      Sources/News.php
  61. 0 2
      Sources/Notify.php
  62. 0 2
      Sources/PackageGet.php
  63. 0 2
      Sources/Packages.php
  64. 0 2
      Sources/PersonalMessage.php
  65. 0 2
      Sources/Poll.php
  66. 0 2
      Sources/Post.php
  67. 0 1
      Sources/PostModeration.php
  68. 0 2
      Sources/Printpage.php
  69. 0 2
      Sources/Profile-Actions.php
  70. 0 2
      Sources/Profile-Modify.php
  71. 0 2
      Sources/Profile-View.php
  72. 0 2
      Sources/Profile.php
  73. 0 2
      Sources/QueryString.php
  74. 0 2
      Sources/Recent.php
  75. 0 2
      Sources/Register.php
  76. 0 2
      Sources/Reminder.php
  77. 0 2
      Sources/RemoveTopic.php
  78. 0 2
      Sources/RepairBoards.php
  79. 0 2
      Sources/Reports.php
  80. 0 2
      Sources/ScheduledTasks.php
  81. 0 2
      Sources/Search.php
  82. 0 2
      Sources/SearchAPI-Fulltext.php
  83. 0 2
      Sources/SearchAPI-Standard.php
  84. 0 2
      Sources/Security.php
  85. 0 2
      Sources/SendTopic.php
  86. 0 2
      Sources/Session.php
  87. 0 2
      Sources/SplitTopics.php
  88. 0 2
      Sources/Stats.php
  89. 9 12
      Sources/Subs-Admin.php
  90. 0 2
      Sources/Subs-Auth.php
  91. 0 2
      Sources/Subs-BoardIndex.php
  92. 0 2
      Sources/Subs-Boards.php
  93. 0 2
      Sources/Subs-Calendar.php
  94. 0 2
      Sources/Subs-Categories.php
  95. 0 2
      Sources/Subs-Compat.php
  96. 0 1
      Sources/Subs-Db-mysql.php
  97. 0 2
      Sources/Subs-Db-postgresql.php
  98. 0 1
      Sources/Subs-Db-sqlite.php
  99. 0 1
      Sources/Subs-Editor.php
  100. 0 2
      Sources/Subs-Graphics.php

+ 0 - 0
.gitignore


+ 0 - 2
Packages/backups/index.php

@@ -5,5 +5,3 @@ if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
 	include (dirname(dirname(__FILE__)) . '/index.php');
 else
 	exit;
-
-?>

+ 0 - 2
Packages/index.php

@@ -12,5 +12,3 @@ if (file_exists(dirname(dirname(__FILE__)) . '/Settings.php'))
 // Can't find it... just forget it.
 else
 	exit;
-
-?>

+ 0 - 2
SSI.php

@@ -2018,5 +2018,3 @@ function ssi_recentAttachments($num_attachments = 10, $attachment_ext = array(),
 	echo '
 		</table>';
 }
-
-?>

+ 0 - 2
Smileys/aaron/index.php

@@ -5,5 +5,3 @@ if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
 	include (dirname(dirname(__FILE__)) . '/index.php');
 else
 	exit;
-
-?>

+ 0 - 2
Smileys/akyhne/index.php

@@ -5,5 +5,3 @@ if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
 	include (dirname(dirname(__FILE__)) . '/index.php');
 else
 	exit;
-
-?>

+ 0 - 2
Smileys/default/index.php

@@ -5,5 +5,3 @@ if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
 	include (dirname(dirname(__FILE__)) . '/index.php');
 else
 	exit;
-
-?>

+ 0 - 2
Smileys/fugue/index.php

@@ -5,5 +5,3 @@ if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
 	include (dirname(dirname(__FILE__)) . '/index.php');
 else
 	exit;
-
-?>

+ 0 - 2
Smileys/index.php

@@ -12,5 +12,3 @@ if (file_exists(dirname(dirname(__FILE__)) . '/Settings.php'))
 // Can't find it... just forget it.
 else
 	exit;
-
-?>

+ 0 - 2
Sources/Admin.php

@@ -995,5 +995,3 @@ function AdminEndSession()
 
 	redirectexit('action=admin');
 }
-
-?>

+ 0 - 2
Sources/BoardIndex.php

@@ -144,5 +144,3 @@ function CollapseCategory()
 	// And go back to the board index.
 	BoardIndex();
 }
-
-?>

+ 0 - 2
Sources/Calendar.php

@@ -535,5 +535,3 @@ function clock()
 			}
 	}
 }
-
-?>

+ 0 - 1
Sources/Class-CurlFetchWeb.php

@@ -312,4 +312,3 @@ class curl_fetch_web_data
 	}
 }
 
-?>

+ 0 - 2
Sources/Class-Graphics.php

@@ -696,5 +696,3 @@ if (!function_exists('smf_crc32'))
 {
 	require_once $sourcedir . '/Subs-Compat.php';
 }
-
-?>

+ 0 - 2
Sources/Class-Package.php

@@ -1034,5 +1034,3 @@ class ftp_connection
 		return true;
 	}
 }
-
-?>

+ 0 - 2
Sources/DbExtra-mysql.php

@@ -450,5 +450,3 @@ function smf_db_get_version()
 
 	return $ver;
 }
-
-?>

+ 0 - 2
Sources/DbExtra-postgresql.php

@@ -340,5 +340,3 @@ function smf_db_get_version()
 
 	return $ver;
 }
-
-?>

+ 0 - 2
Sources/DbExtra-sqlite.php

@@ -362,5 +362,3 @@ function smf_db_get_backup()
 
 	obExit(false);
 }
-
-?>

+ 0 - 2
Sources/DbPackages-mysql.php

@@ -645,5 +645,3 @@ function smf_db_create_query_column($column)
 	// Now just put it together!
 	return '`' .$column['name'] . '` ' . $type . ' ' . (!empty($unsigned) ? $unsigned : '') . (!empty($column['null']) ? '' : 'NOT NULL') . ' ' . $default;
 }
-
-?>

+ 0 - 2
Sources/DbPackages-postgresql.php

@@ -808,5 +808,3 @@ function smf_db_list_indexes($table_name, $detail = false, $parameters = array()
 
 	return $indexes;
 }
-
-?>

+ 0 - 2
Sources/DbPackages-sqlite.php

@@ -805,5 +805,3 @@ function smf_db_alter_table($table_name, $columns)
 	// We got here so we're good.  The temp table should be deleted, if not it will be gone later on >:D.
 	return true;
 }
-
-?>

+ 0 - 2
Sources/DbSearch-mysql.php

@@ -72,5 +72,3 @@ function smf_db_create_word_search($size)
 		)
 	);
 }
-
-?>

+ 0 - 2
Sources/DbSearch-postgresql.php

@@ -122,5 +122,3 @@ function smf_db_create_word_search($size)
 		)
 	);
 }
-
-?>

+ 0 - 2
Sources/DbSearch-sqlite.php

@@ -106,5 +106,3 @@ function smf_db_create_word_search($size)
 		)
 	);
 }
-
-?>

+ 0 - 2
Sources/Display.php

@@ -1829,5 +1829,3 @@ function QuickInTopicModeration()
 
 	redirectexit(!empty($topicGone) ? 'board=' . $board : 'topic=' . $topic . '.' . $_REQUEST['start']);
 }
-
-?>

+ 0 - 2
Sources/DumpDatabase.php

@@ -227,5 +227,3 @@ function un_compressed($string = '')
 {
 	return $string;
 }
-
-?>

+ 0 - 2
Sources/Errors.php

@@ -441,5 +441,3 @@ function set_fatal_error_headers()
 	header('Status: 503 Service Temporarily Unavailable');
 	header('Retry-After: 3600');
 }
-
-?>

+ 0 - 2
Sources/Groups.php

@@ -917,5 +917,3 @@ function list_getGroupRequests($start, $items_per_page, $sort, $where, $where_pa
 
 	return $group_requests;
 }
-
-?>

+ 0 - 2
Sources/Help.php

@@ -107,5 +107,3 @@ function ShowAdminHelp()
 	if (preg_match('~%([0-9]+\$)?s\?~', $context['help_text'], $match))
 		$context['help_text'] = sprintf($context['help_text'], $scripturl, $context['session_id'], $context['session_var']);
 }
-
-?>

+ 0 - 2
Sources/Karma.php

@@ -197,5 +197,3 @@ function BookOfUnknown()
 
 	obExit(false);
 }
-
-?>

+ 1 - 3
Sources/Load.php

@@ -2726,7 +2726,7 @@ function cache_put_data($key, $value, $ttl = 120)
 				@unlink($cachedir . '/data_' . $key . '.php');
 			else
 			{
-				$cache_data = '<' . '?' . 'php if (!defined(\'SMF\')) die; if (' . (time() + $ttl) . ' < time()) $expired = true; else{$expired = false; $value = \'' . addcslashes($value, '\\\'') . '\';}' . '?' . '>';
+				$cache_data = '<' . '?' . 'php if (!defined(\'SMF\')) die; if (' . (time() + $ttl) . ' < time()) $expired = true; else{$expired = false; $value = \'' . addcslashes($value, '\\\'') . '\';}';
 
 				// Write out the cache file, check that the cache write was successful; all the data must be written
 				// If it fails due to low diskspace, or other, remove the cache file
@@ -2877,5 +2877,3 @@ function get_memcached_server($level = 3)
 	if (!$memcached && $level > 0)
 		get_memcached_server($level - 1);
 }
-
-?>

+ 0 - 2
Sources/LogInOut.php

@@ -757,5 +757,3 @@ function validatePasswordFlood($id_member, $password_flood_value = false, $was_c
 	updateMemberData($id_member, array('passwd_flood' => $was_correct && $number_tries == 1 ? '' : $time_stamp . '|' . $number_tries));
 
 }
-
-?>

+ 1 - 3
Sources/Logging.php

@@ -175,7 +175,7 @@ function logLastDatabaseError()
 	if (filemtime($boarddir . '/db_last_error.php') === $last_db_error_change)
 	{
 		// Write the change
-		$write_db_change =  '<' . '?' . "php\n" . '$db_last_error = ' . time() . ';' . "\n" . '?' . '>';
+		$write_db_change =  '<' . '?' . "php\n" . '$db_last_error = ' . time() . ';';
 		$written_bytes = file_put_contents($boarddir . '/db_last_error.php', $write_db_change, LOCK_EX);
 
 		// survey says ...
@@ -526,5 +526,3 @@ function logActions($logs)
 
 	return $smcFunc['db_insert_id']('{db_prefix}log_actions', 'id_action');
 }
-
-?>

+ 0 - 1
Sources/ManageAttachments.php

@@ -2437,4 +2437,3 @@ function attachDirStatus($dir, $expected_files)
 		return array('ok', false, $num_files);
 }
 
-?>

+ 0 - 2
Sources/ManageBans.php

@@ -1871,5 +1871,3 @@ function updateBanMembers()
 	// Update the latest member and our total members as banning may change them.
 	updateStats('member');
 }
-
-?>

+ 0 - 1
Sources/ManageBoards.php

@@ -847,4 +847,3 @@ function EditBoardSettings($return_config = false)
 	prepareDBSettingContext($config_vars);
 }
 
-?>

+ 0 - 2
Sources/ManageCalendar.php

@@ -373,5 +373,3 @@ function ModifyCalendarSettings($return_config = false)
 	// Prepare the settings...
 	prepareDBSettingContext($config_vars);
 }
-
-?>

+ 0 - 2
Sources/ManageErrors.php

@@ -370,5 +370,3 @@ function ViewFile()
 	$context['sub_template'] = 'show_file';
 
 }
-
-?>

+ 0 - 2
Sources/ManageLanguages.php

@@ -1420,5 +1420,3 @@ function cleanLangString($string, $to_display = true)
 
 	return $new_string;
 }
-
-?>

+ 0 - 2
Sources/ManageMail.php

@@ -478,5 +478,3 @@ function time_since($time_diff)
 	else
 		return sprintf($time_diff == 1 ? $txt['mq_second'] : $txt['mq_seconds'], $time_diff);
 }
-
-?>

+ 0 - 2
Sources/ManageMaintenance.php

@@ -2194,5 +2194,3 @@ function MaintainRecountPosts()
 	$context['maintenance_finished'] = $txt['maintain_recountposts'];
 	redirectexit('action=admin;area=maintain;sa=members;done=recountposts');
 }
-
-?>

+ 0 - 2
Sources/ManageMembergroups.php

@@ -1179,5 +1179,3 @@ function ModifyMembergroupsettings()
 
 	prepareDBSettingContext($config_vars);
 }
-
-?>

+ 0 - 2
Sources/ManageMembers.php

@@ -1299,5 +1299,3 @@ function jeffsdatediff($old)
 	// Divide out the seconds in a day to get the number of days.
 	return ceil($dis / (24 * 60 * 60));
 }
-
-?>

+ 0 - 1
Sources/ManageNews.php

@@ -1080,4 +1080,3 @@ function ModifyNewsSettings($return_config = false)
 	prepareDBSettingContext($config_vars);
 }
 
-?>

+ 0 - 2
Sources/ManagePaid.php

@@ -1804,5 +1804,3 @@ function loadPaymentGateways()
 
 	return $gateways;
 }
-
-?>

+ 0 - 2
Sources/ManagePermissions.php

@@ -2436,5 +2436,3 @@ function ModifyPostModeration()
 	createToken('admin-mppm');
 
 }
-
-?>

+ 0 - 2
Sources/ManagePosts.php

@@ -382,5 +382,3 @@ function ModifyTopicSettings($return_config = false)
 	// Prepare the settings...
 	prepareDBSettingContext($config_vars);
 }
-
-?>

+ 0 - 2
Sources/ManageRegistration.php

@@ -340,5 +340,3 @@ function ModifyRegistrationSettings($return_config = false)
 
 	prepareDBSettingContext($config_vars);
 }
-
-?>

+ 0 - 2
Sources/ManageScheduledTasks.php

@@ -576,5 +576,3 @@ function list_getNumTaskLogEntries()
 
 	return $num_entries;
 }
-
-?>

+ 0 - 2
Sources/ManageSearch.php

@@ -794,5 +794,3 @@ function detectFulltextIndex()
 		$smcFunc['db_free_result']($request);
 	}
 }
-
-?>

+ 0 - 2
Sources/ManageSearchEngines.php

@@ -1117,5 +1117,3 @@ function sortSpiderTable()
 	// Remove the sorting column.
 	$smcFunc['db_remove_column']('{db_prefix}spiders', 'temp_order');
 }
-
-?>

+ 0 - 2
Sources/ManageServer.php

@@ -964,5 +964,3 @@ function ShowPHPinfoSettings()
 	$context['sub_template'] = 'php_info';
 	return;
 }
-
-?>

+ 0 - 2
Sources/ManageSettings.php

@@ -2581,5 +2581,3 @@ function get_integration_hooks()
 
 	return $integration_hooks;
 }
-
-?>

+ 0 - 1
Sources/ManageSmileys.php

@@ -1836,4 +1836,3 @@ function sortSmileyTable()
 	$smcFunc['db_remove_column']('{db_prefix}smileys', 'temp_order');
 }
 
-?>

+ 0 - 2
Sources/Memberlist.php

@@ -628,5 +628,3 @@ function printMemberListRows($request)
 		$context['members'][$member]['registered_date'] = strftime('%Y-%m-%d', $context['members'][$member]['registered_timestamp']);
 	}
 }
-
-?>

+ 0 - 2
Sources/MessageIndex.php

@@ -1196,5 +1196,3 @@ function QuickModeration()
 
 	redirectexit($redirect_url);
 }
-
-?>

+ 0 - 2
Sources/ModerationCenter.php

@@ -2151,5 +2151,3 @@ function ModEndSession()
 
 	redirectexit('action=moderate');
 }
-
-?>

+ 0 - 2
Sources/Modlog.php

@@ -624,5 +624,3 @@ function list_getModLogEntries($start, $items_per_page, $sort, $query_string = '
 	// Back we go!
 	return $entries;
 }
-
-?>

+ 0 - 2
Sources/MoveTopic.php

@@ -734,5 +734,3 @@ function moveTopicConcurrence()
 		fatal_lang_error('topic_already_moved', false, array($topic_link, $board_link));
 	}
 }
-
-?>

+ 0 - 2
Sources/News.php

@@ -990,5 +990,3 @@ function getXmlProfile($xml_format)
 
 	return $data;
 }
-
-?>

+ 0 - 2
Sources/Notify.php

@@ -183,5 +183,3 @@ function BoardNotify()
 	// Back to the board!
 	redirectexit('board=' . $board . '.' . $_REQUEST['start']);
 }
-
-?>

+ 0 - 2
Sources/PackageGet.php

@@ -758,5 +758,3 @@ function PackageServerRemove()
 
 	redirectexit('action=admin;area=packages;get');
 }
-
-?>

+ 0 - 2
Sources/Packages.php

@@ -2619,5 +2619,3 @@ function PackageFTPTest()
 		),
 	);
 }
-
-?>

+ 0 - 2
Sources/PersonalMessage.php

@@ -3705,5 +3705,3 @@ function isAccessiblePM($pmID, $validFor = 'in_or_outbox')
 		break;
 	}
 }
-
-?>

+ 0 - 2
Sources/Poll.php

@@ -983,5 +983,3 @@ function RemovePoll()
 	// Take the moderator back to the topic.
 	redirectexit('topic=' . $topic . '.' . $_REQUEST['start']);
 }
-
-?>

+ 0 - 2
Sources/Post.php

@@ -2868,5 +2868,3 @@ function JavaScriptModify()
 	else
 		obExit(false);
 }
-
-?>

+ 0 - 1
Sources/PostModeration.php

@@ -796,4 +796,3 @@ function removeMessages($messages, $messageDetails, $current_view = 'replies')
 		}
 	}
 }
-?>

+ 0 - 2
Sources/Printpage.php

@@ -274,5 +274,3 @@ function PrintTopic()
 	// Set a canonical URL for this page.
 	$context['canonical_url'] = $scripturl . '?topic=' . $topic . '.0';
 }
-
-?>

+ 0 - 2
Sources/Profile-Actions.php

@@ -923,5 +923,3 @@ function subscriptions($memID)
 	else
 		$context['sub_template'] = 'user_subscription';
 }
-
-?>

+ 0 - 2
Sources/Profile-Modify.php

@@ -3551,5 +3551,3 @@ function groupMembership2($profile_vars, $post_errors, $memID)
 
 	return $changeType;
 }
-
-?>

+ 0 - 2
Sources/Profile-View.php

@@ -2224,5 +2224,3 @@ function viewWarning($memID)
 		if ($context['member']['warning'] >= $limit)
 			$context['current_level'] = $limit;
 }
-
-?>

+ 0 - 2
Sources/Profile.php

@@ -809,5 +809,3 @@ function loadCustomFields($memID, $area = 'summary')
 
 	call_integration_hook('integrate_load_custom_profile_fields', array($memID, $area));
 }
-
-?>

+ 0 - 2
Sources/QueryString.php

@@ -621,5 +621,3 @@ function ob_sessrewrite($buffer)
 	// Return the changed buffer.
 	return $buffer;
 }
-
-?>

+ 0 - 2
Sources/Recent.php

@@ -1361,5 +1361,3 @@ function UnreadTopics()
 	// Allow helpdesks and bug trackers and what not to add their own unread data (just add a template_layer to show custom stuff in the template!)
  	call_integration_hook('integrate_unread_list');
 }
-
-?>

+ 0 - 2
Sources/Register.php

@@ -847,5 +847,3 @@ function RegisterCheckUsername()
 
 	$context['valid_username'] = empty($errors);
 }
-
-?>

+ 0 - 2
Sources/Reminder.php

@@ -392,5 +392,3 @@ function SecretAnswer2()
 
 	createToken('login');
 }
-
-?>

+ 0 - 2
Sources/RemoveTopic.php

@@ -1512,5 +1512,3 @@ function removeDeleteConcurrence()
 
 	fatal_lang_error('post_already_deleted', false, array($confirm_url));
 }
-
-?>

+ 0 - 2
Sources/RepairBoards.php

@@ -1664,5 +1664,3 @@ function createSalvageArea()
 	// Restore the user's language.
 	loadLanguage('Admin');
 }
-
-?>

+ 0 - 2
Sources/Reports.php

@@ -993,5 +993,3 @@ function setKeys($method = 'rows', $keys = array(), $reverse = false)
 	// Rows or columns?
 	$context['key_method'] = $method == 'rows' ? 'rows' : 'cols';
 }
-
-?>

+ 0 - 2
Sources/ScheduledTasks.php

@@ -1761,5 +1761,3 @@ function scheduled_remove_old_drafts()
 
 	return true;
 }
-
-?>

+ 0 - 2
Sources/Search.php

@@ -2172,5 +2172,3 @@ function searchSort($a, $b)
 
 	return $searchAPI->searchSort($a, $b);
 }
-
-?>

+ 0 - 2
Sources/SearchAPI-Fulltext.php

@@ -259,5 +259,3 @@ class fulltext_search
 		return $ignoreRequest;
 	}
 }
-
-?>

+ 0 - 2
Sources/SearchAPI-Standard.php

@@ -32,5 +32,3 @@ class standard_search
 		return false;
 	}
 }
-
-?>

+ 0 - 2
Sources/Security.php

@@ -1317,5 +1317,3 @@ function constructBanQueryIP($fullip)
 
 	return $ban_query;
 }
-
-?>

+ 0 - 2
Sources/SendTopic.php

@@ -580,5 +580,3 @@ function ReportToModerator2()
 	// Back to the post we reported!
 	redirectexit('reportsent;topic=' . $topic . '.msg' . $_POST['msg'] . '#msg' . $_POST['msg']);
 }
-
-?>

+ 0 - 2
Sources/Session.php

@@ -233,5 +233,3 @@ function sessionGC($max_lifetime)
 		)
 	);
 }
-
-?>

+ 0 - 2
Sources/SplitTopics.php

@@ -1601,5 +1601,3 @@ function MergeDone()
 	$context['page_title'] = $txt['merge'];
 	$context['sub_template'] = 'merge_done';
 }
-
-?>

+ 0 - 2
Sources/Stats.php

@@ -744,5 +744,3 @@ function SMStats()
 	// Die.
 	die('OK');
 }
-
-?>

+ 9 - 12
Sources/Subs-Admin.php

@@ -305,18 +305,16 @@ function updateSettingsFile($config_vars)
 				unset($config_vars[$var]);
 			}
 		}
-
-		// End of the file ... maybe
-		if (substr(trim($settingsArray[$i]), 0, 2) == '?' . '>')
-			$end = $i;
 	}
 
-	// This should never happen, but apparently it is happening.
-	if (empty($end) || $end < 10)
-		$end = count($settingsArray) - 1;
-
 	// Still more variables to go?  Then lets add them at the end.
 	if (!empty($config_vars))
+<<<<<<< HEAD
+	{		
+		// Add in any newly defined vars that were passed
+		foreach ($config_vars as $var => $val)
+			$settingsArray[$i++] = '$' . $var . ' = ' . $val . ';' . "\n";
+=======
 	{
 		if (trim($settingsArray[$end]) == '?' . '>')
 			$settingsArray[$end++] = '';
@@ -328,9 +326,10 @@ function updateSettingsFile($config_vars)
 			$settingsArray[$end++] = '$' . $var . ' = ' . $val . ';' . "\n";
 
 		$settingsArray[$end] = '?' . '>';
+>>>>>>> 0f0f217c462afd53df641ca3381741af9b0585af
 	}
 	else
-		$settingsArray[$end] = trim($settingsArray[$end]);
+		$settingsArray[$i] = trim($settingsArray[$i]);
 
 	// Sanity error checking: the file needs to be at least 12 lines.
 	if (count($settingsArray) < 12)
@@ -396,7 +395,7 @@ function updateDbLastError($time)
 	global $boarddir;
 
 	// Write out the db_last_error file with the error timestamp
-	file_put_contents($boarddir . '/db_last_error.php', '<' . '?' . "php\n" . '$db_last_error = ' . $time . ';' . "\n" . '?' . '>', LOCK_EX);
+	file_put_contents($boarddir . '/db_last_error.php', '<' . '?' . "php\n" . '$db_last_error = ' . $time . ';', LOCK_EX);
 	@touch($boarddir . '/' . 'Settings.php');
 }
 /**
@@ -516,5 +515,3 @@ function emailAdmins($template, $replacements = array(), $additional_recipients
 			sendmail($recipient['email'], $emaildata['subject'], $emaildata['body'], null, null, false, 1);
 		}
 }
-
-?>

+ 0 - 2
Sources/Subs-Auth.php

@@ -809,5 +809,3 @@ function smf_setcookie($name, $value = '', $expire = 0, $path = '', $domain = ''
 			.(!$secure ? '' : '; Secure')
 			.(!$httponly ? '' : '; HttpOnly'), false);
 }
-
-?>

+ 0 - 2
Sources/Subs-BoardIndex.php

@@ -323,5 +323,3 @@ function getBoardIndex($boardIndexOptions)
 
 	return $boardIndexOptions['include_categories'] ? $categories : $this_category;
 }
-
-?>

+ 0 - 2
Sources/Subs-Boards.php

@@ -1192,5 +1192,3 @@ function isChildOf($child, $parent)
 
 	return isChildOf($boards[$child]['parent'], $parent);
 }
-
-?>

+ 0 - 2
Sources/Subs-Calendar.php

@@ -1102,5 +1102,3 @@ function removeHolidays($holiday_ids)
 		'calendar_updated' => time(),
 	));
 }
-
-?>

+ 0 - 2
Sources/Subs-Categories.php

@@ -349,5 +349,3 @@ function collapseCategories($categories, $new_status, $members = null, $check_co
 			);
 	}
 }
-
-?>

+ 0 - 2
Sources/Subs-Compat.php

@@ -453,5 +453,3 @@ function sha1_raw($text)
 
 	return $raw;
 }
-
-?>

+ 0 - 1
Sources/Subs-Db-mysql.php

@@ -784,4 +784,3 @@ function smf_db_escape_wildcard_string($string, $translate_human_wildcards=false
 
 	return strtr($string, $replacements);
 }
-?>

+ 0 - 2
Sources/Subs-Db-postgresql.php

@@ -840,5 +840,3 @@ function smf_db_escape_wildcard_string($string, $translate_human_wildcards=false
 
 	return strtr($string, $replacements);
 }
-
-?>

+ 0 - 1
Sources/Subs-Db-sqlite.php

@@ -849,4 +849,3 @@ function smf_db_escape_wildcard_string($string, $translate_human_wildcards=false
 
 	return strtr($string, $replacements);
 }
-?>

+ 0 - 1
Sources/Subs-Editor.php

@@ -2282,4 +2282,3 @@ function AutoSuggest_Search_SMFVersions()
 
 	return $xml_data;
 }
-?>

+ 0 - 2
Sources/Subs-Graphics.php

@@ -1121,5 +1121,3 @@ function showLetterImage($letter)
 	// Nothing more to come.
 	die();
 }
-
-?>

Some files were not shown because too many files changed in this diff