From 0d16dc908325fb9078d335e17f4e7c86b54eda7d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 17 Jan 2013 02:20:02 +0000
Subject: [PATCH] Typos fixed + keep fake modules hidden

---
 DOCS/TODOs.txt                        | 30 +++++++++++++--------------
 beg.php                               |  2 +-
 birthday_confirm.php                  |  2 +-
 inc/extensions-functions.php          |  2 +-
 inc/extensions/ext-network.php        |  4 ++--
 inc/libs/network_functions.php        |  8 +++----
 inc/libs/yoomedia_functions.php       |  2 +-
 inc/module-functions.php              |  2 +-
 inc/modules/admin/admin-inc.php       |  2 +-
 inc/modules/admin/what-stats_mods.php |  2 +-
 inc/modules/admin/what-usage.php      |  2 +-
 inc/modules/guest/what-stats.php      |  6 +++---
 show_bonus.php                        |  2 +-
 13 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index e4ee2f9510..c986039971 100644
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -65,13 +65,13 @@
 ./inc/filter/forced_filter.php:73:		// @TODO This part is unfinished
 ./inc/filter-functions.php:117:	// @TODO Remove this forced removal after a year or so
 ./inc/filters.php:1320:		// @TODO No banner found, output some default banner
-./inc/functions.php:1126:			// @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ?
-./inc/functions.php:1212:			// @TODO Are these convertions still required?
-./inc/functions.php:1233:// @TODO Rewrite this function to use readFromFile() and writeToFile()
-./inc/functions.php:1842:	// @TODO Find a way to cache this
-./inc/functions.php:1946:	// @TODO This is still very static, rewrite it somehow
-./inc/functions.php:2150:	// @TODO Rename column data_type to e.g. mail_status
-./inc/functions.php:2500:// @TODO cacheFiles is not yet supported
+./inc/functions.php:1131:			// @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ?
+./inc/functions.php:1217:			// @TODO Are these convertions still required?
+./inc/functions.php:1238:// @TODO Rewrite this function to use readFromFile() and writeToFile()
+./inc/functions.php:1847:	// @TODO Find a way to cache this
+./inc/functions.php:1951:	// @TODO This is still very static, rewrite it somehow
+./inc/functions.php:2155:	// @TODO Rename column data_type to e.g. mail_status
+./inc/functions.php:2505:// @TODO cacheFiles is not yet supported
 ./inc/gen_sql_patches.php:95:// @TODO Rewrite this to a filter
 ./inc/header.php:66:// @TODO Find a way to not use direct module comparison
 ./inc/install-functions.php:446:	// @TODO Comparing with DEFAULT_MAIN_TITLE doesn't work
@@ -180,7 +180,7 @@
 ./inc/modules/guest/what-rallyes.php:99:	// @TODO Reactivate this: $content['admin'] = '<a href="{%url=modules.php?module=index&amp;what=impressum&amp;id=' . $content['admin_id'] . '%}">' . $content['login'] . '</a>';
 ./inc/modules/guest/what-sponsor_reg.php:293:			// @TODO Maybe a default referral id?
 ./inc/modules/guest/what-stats.php:111:		// @TODO This can be somehow rewritten
-./inc/modules/guest/what-stats.php:120:			// @TODO This does not exclude testers
+./inc/modules/guest/what-stats.php:120:			// @TODO This doesn't exclude tester accounts
 ./inc/modules/guest/what-stats.php:83:// @TODO This can be rewritten in a dynamic include
 ./inc/modules/member/what-beg.php:54:// @TODO Can't this be moved into EL?
 ./inc/modules/member/what-beg.php:63:// @TODO No more needed? define('__BEG_USERID_TIMEOUT', createFancyTime(getBegUseridTimeout()));
@@ -205,13 +205,13 @@
 ./inc/mysql-manager.php:408:	// @TODO Try to rewrite this to one or more functions
 ./inc/mysql-manager.php:44:// @TODO Can we cache this?
 ./inc/revision-functions.php:168:// @TODO This function does also set and get in 'cache_array'
-./inc/template-functions.php:1040:				// @TODO <label for="' . $prefix . '_' . $field . '"></<label> not working here
-./inc/template-functions.php:1095:			// @TODO Deprecate this thing
-./inc/template-functions.php:1106:			// @TODO Deprecate this thing
-./inc/template-functions.php:1228:	// @TODO This can be easily moved out after the merge from EL branch to this is complete
-./inc/template-functions.php:1277:		// @TODO Add a little more infos here
-./inc/template-functions.php:1658:// @TODO Lame description for this function
-./inc/template-functions.php:1680:			// @TODO Move this in a filter
+./inc/template-functions.php:1048:				// @TODO <label for="' . $prefix . '_' . $field . '"></<label> not working here
+./inc/template-functions.php:1103:			// @TODO Deprecate this thing
+./inc/template-functions.php:1114:			// @TODO Deprecate this thing
+./inc/template-functions.php:1236:	// @TODO This can be easily moved out after the merge from EL branch to this is complete
+./inc/template-functions.php:1285:		// @TODO Add a little more infos here
+./inc/template-functions.php:1666:// @TODO Lame description for this function
+./inc/template-functions.php:1688:			// @TODO Move this in a filter
 ./inc/template-functions.php:209:	 * @TODO On some pages this is buggy
 ./inc/template-functions.php:298:	// @TODO Remove these sanity checks if all is fine
 ./inc/template-functions.php:747:			// @TODO $userid is deprecated and should be removed from loadEmailTemplate() and replaced with $content[userid] in all templates
diff --git a/beg.php b/beg.php
index 6bc039e62e..e333315d8a 100644
--- a/beg.php
+++ b/beg.php
@@ -65,7 +65,7 @@ if (isGetRequestElementSet('userid')) {
 
 	// Validate if it is not a number
 	if ((isExtensionActive('nickname')) && (isNicknameUsed(getRequestElement('userid')))) {
-		// Maybe we have found a nickname?
+		// Maybe a nickname is provided?
 		fetchUserData(getRequestElement('userid'), 'nickname');
 	} elseif (isNicknameUsed(getRequestElement('userid'))) {
 		// Nickname entered but nickname is not active
diff --git a/birthday_confirm.php b/birthday_confirm.php
index 51c7c93629..8d47c8e4b9 100644
--- a/birthday_confirm.php
+++ b/birthday_confirm.php
@@ -117,7 +117,7 @@ if (SQL_NUMROWS($result) == 1) {
 // Free memory
 SQL_FREERESULT($result);
 
-// Set this because we have no module in URI
+// Set this because there is no module in URI
 $GLOBALS['__module'] = 'birthday_confirm';
 
 // Include header
diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php
index e85a690cfb..c026edd073 100644
--- a/inc/extensions-functions.php
+++ b/inc/extensions-functions.php
@@ -248,7 +248,7 @@ function registerExtension ($ext_name, $taskId, $isDryRun = FALSE, $ignoreUpdate
 	$processResult = FALSE;
 	initIncludePool('extension');
 
-	// By default we have no failures
+	// By default there is no failure
 	enableExtensionReportingFailure();
 
 	// Does this extension exists?
diff --git a/inc/extensions/ext-network.php b/inc/extensions/ext-network.php
index 2c7e143bc0..68a1f54d2a 100644
--- a/inc/extensions/ext-network.php
+++ b/inc/extensions/ext-network.php
@@ -79,8 +79,8 @@ switch (getExtensionMode()) {
 		break;
 
 	case 'activate': // Do stuff when admin activates this extension
-		addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='N',`hidden`='N',`admin_only`='N',`mem_only`='N' WHERE `module`='network-delurl' LIMIT 1");
-		addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='N',`hidden`='N',`admin_only`='N',`mem_only`='N' WHERE `module`='network-vcheck' LIMIT 1");
+		addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='N',`hidden`='Y',`admin_only`='N',`mem_only`='N' WHERE `module`='network-delurl' LIMIT 1");
+		addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='N',`hidden`='Y',`admin_only`='N',`mem_only`='N' WHERE `module`='network-vcheck' LIMIT 1");
 		break;
 
 	case 'deactivate': // Do stuff when admin deactivates this extension
diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php
index b8fe2467b9..e90c66c73c 100644
--- a/inc/libs/network_functions.php
+++ b/inc/libs/network_functions.php
@@ -1859,7 +1859,7 @@ function doAdminNetworkProcessHandleNetworks () {
 			} // END - if
 		} // END - foreach
 
-		// If we have no rows, we don't need to display the edit form
+		// If there are no rows, we don't need to display the edit form
 		if (!empty($OUT)) {
 			// Init array with generic element
 			$content = array(
@@ -1909,7 +1909,7 @@ function doAdminNetworkProcessHandleNetworkTypes () {
 			} // END - if
 		} // END - foreach
 
-		// If we have no rows, we don't need to display the edit form
+		// If there are no rows, we don't need to display the edit form
 		if (!empty($OUT)) {
 			// Prepare array with generic elements
 			$content = array(
@@ -1973,7 +1973,7 @@ function doAdminNetworkProcessHandleRequestParams () {
 			} // END - if
 		} // END - foreach
 
-		// If we have no rows, we don't need to display the edit form
+		// If there are no rows, we don't need to display the edit form
 		if (!empty($OUT)) {
 			// Prepare array with generic elements
 			$content = array(
@@ -2460,7 +2460,7 @@ function doAdminNetworkProcessHandleArrayTranslations () {
 			} // END - if
 		} // END - foreach
 
-		// If we have no rows, we don't need to display the edit form
+		// If there are no rows, we don't need to display the edit form
 		if (!empty($OUT)) {
 			// Prepare array with generic elements
 			$content = array(
diff --git a/inc/libs/yoomedia_functions.php b/inc/libs/yoomedia_functions.php
index 5360c5104c..c76bee6f4b 100644
--- a/inc/libs/yoomedia_functions.php
+++ b/inc/libs/yoomedia_functions.php
@@ -157,7 +157,7 @@ function YOOMEDIA_PARSE_RESPONSE ($response, $type) {
 	// Cut off the header
 	$dummy = removeHttpHeaderFromResponse($response);
 
-	// If we have no result, abort here
+	// If there is no result, abort here
 	if (count($dummy) == 0) {
 		// Empty response from API
 		reportBug(__FUNCTION__, __LINE__, 'Empty result from API received. response()=' . count($response) . ',type=' . $type);
diff --git a/inc/module-functions.php b/inc/module-functions.php
index 3bc6dadb4d..21c7a8116c 100644
--- a/inc/module-functions.php
+++ b/inc/module-functions.php
@@ -288,7 +288,7 @@ function checkModulePermissions ($module = '') {
 			// Data is missing so we add it
 			if (isExtensionInstalledAndNewer('sql_patches', '0.3.6')) {
 				/*
-				 * Since 0.3.6 we have a has_menu column, this took me a half
+				 * Since 0.3.6 there is a has_menu column, this took me a half
 				 * hour to find a loop here... *sigh*
 				 */
 				SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_mod_reg`
diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 5d655b2f74..2c9e0963b5 100644
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -1448,7 +1448,7 @@ function addEmailNavigation ($numPages, $offset, $show_form, $colspan, $return=f
 			$NAV .= '</a>';
 		}
 
-		// Add separator if we have not yet reached total pages
+		// Add separator if total pages has not been reached
 		if ($page < $numPages) {
 			// Add it
 			$NAV .= '|';
diff --git a/inc/modules/admin/what-stats_mods.php b/inc/modules/admin/what-stats_mods.php
index 07ac5d2177..80943ba526 100644
--- a/inc/modules/admin/what-stats_mods.php
+++ b/inc/modules/admin/what-stats_mods.php
@@ -64,7 +64,7 @@ if ((getRequestElement('mod') == 'index') || (getRequestElement('mod') == 'login
 	loadTemplate('admin_list_mods_stats2', FALSE, $OUT);
 } else {
 	// Load module statics
-	$result = SQL_QUERY("SELECT `module`, `title`, `clicks` FROM `{?_MYSQL_PREFIX?}_mod_reg` ORDER BY `clicks` DESC,`module` ASC", __FILE__, __LINE__);
+	$result = SQL_QUERY('SELECT `module`, `title`, `clicks` FROM `{?_MYSQL_PREFIX?}_mod_reg` ORDER BY `clicks` DESC, `module` ASC', __FILE__, __LINE__);
 	$OUT = '';
 	while ($content = SQL_FETCHARRAY($result)) {
 		if (($content['module'] == 'index') || ($content['module'] == 'login')) {
diff --git a/inc/modules/admin/what-usage.php b/inc/modules/admin/what-usage.php
index b18804cc84..10008b064e 100644
--- a/inc/modules/admin/what-usage.php
+++ b/inc/modules/admin/what-usage.php
@@ -125,7 +125,7 @@ if ((!empty($FQFN)) && (isFileReadable($FQFN))) {
 	// Output code
 	outputHtml($content);
 } else {
-	// Nothing to load, then we have no directory 'usage'
+	// Nothing to load, then there is no directory 'usage'
 	displayMessage('{--ADMIN_USAGE_DIRECTORY_404--}');
 }
 
diff --git a/inc/modules/guest/what-stats.php b/inc/modules/guest/what-stats.php
index 9ee6c44086..031d48f717 100644
--- a/inc/modules/guest/what-stats.php
+++ b/inc/modules/guest/what-stats.php
@@ -114,10 +114,10 @@ switch (strtoupper($do)) {
 			$cats[$content['id']] = $content['cat'];
 		} // END - while
 
-		// Now we have all categories loaded, count members
+		// Now all categories have been loaded, count members
 		foreach ($cats as $id => $dummy) {
-			// We only need id and nothing more to count...
-			// @TODO This does not exclude testers
+			// Only the id needs to be counted
+			// @TODO This doesn't exclude tester accounts
 			$cat_cnt[$id] = countSumTotalData(bigintval($id), 'user_cats', 'id', 'cat_id', TRUE);
 		} // END - foreach
 
diff --git a/show_bonus.php b/show_bonus.php
index 5144df314e..7ac7347952 100644
--- a/show_bonus.php
+++ b/show_bonus.php
@@ -41,7 +41,7 @@ require('inc/libs/security_functions.php');
 // Init start time
 $GLOBALS['__start_time'] = microtime(TRUE);
 
-// Set this because we have no module in URI
+// Set this because there is no module in URI
 $GLOBALS['__module']      = 'show_bonus';
 $GLOBALS['__output_mode'] = '0';
 
-- 
2.39.5