From: Roland Häder <roland@mxchange.org>
Date: Mon, 22 Oct 2012 19:08:57 +0000 (+0000)
Subject: Extension ext-grade continued:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=96656bcea6601a6db340d7740492951be823dd5e;p=mailer.git

Extension ext-grade continued:
- Added XML template for adding grade data entries
- Introduced validateIsEmpty() which returns the input string if its trimmed
  string is not empty or FALSE otherwise.
- Made extra-value handling function more restrictive: Now the call-back
  function must be there
- Removed deprecated comment from all XML templates
---

diff --git a/.gitattributes b/.gitattributes
index ef855fa170..21f6a8e743 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -887,6 +887,7 @@ templates/de/emails/admin/.htaccess svneol=native#text/plain
 templates/de/emails/admin/admin_add_forced_ads.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_add_forced_campaigns.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_add_forced_costs.tpl svneol=native#text/plain
+templates/de/emails/admin/admin_add_grade_data.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_add_user_subids.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_admin_add_all_direct.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_admin_add_all_ref_referral.tpl svneol=native#text/plain
diff --git a/inc/functions.php b/inc/functions.php
index 6aecfae83a..a941932a6c 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1290,41 +1290,41 @@ function handleExtraValues ($filterFunction, $value, $extraValue) {
 	$ret = $value;
 
 	// Is there a special filter function?
-	if (!empty($filterFunction)) {
-		// Does the filter function exist?
-		if (function_exists($filterFunction)) {
-			// Is there extra parameters here?
-			if ((!is_null($extraValue)) && (!empty($extraValue))) {
-				// Put both parameters in one new array by default
-				$args = array($value, $extraValue);
-
-				// If we have an array simply use it and pre-extend it with our value
-				if (is_array($extraValue)) {
-					// Make the new args array
-					$args = merge_array(array($value), $extraValue);
-				} // END - if
+	if ((empty($filterFunction)) || (!function_exists($filterFunction))) {
+		// Call-back function does not exist or is empty
+		reportBug(__FUNCTION__, __LINE__, 'Filter function ' . $filterFunction . ' does not exist or is empty: value[' . gettype($value) . ']=' . $value . ',extraValue[' . gettype($extraValue) . ']=' . $extraValue);
+	} // END - if
 
-				// Call the multi-parameter call-back
-				$ret = call_user_func_array($filterFunction, $args);
+	// Is there extra parameters here?
+	if ((!is_null($extraValue)) && (!empty($extraValue))) {
+		// Put both parameters in one new array by default
+		$args = array($value, $extraValue);
 
-				// Is $ret 'true'?
-				if ($ret === TRUE) {
-					// Test passed, so write direct value
-					$ret = $args;
-				} // END - if
-			} else {
-				// One parameter call
-				$ret = call_user_func($filterFunction, $value);
-				//* BUG */ die('ret['.gettype($ret).']=' . $ret . ',value=' . $value.',filterFunction=' . $filterFunction);
-
-				// Is $ret 'true'?
-				if ($ret === TRUE) {
-					// Test passed, so write direct value
-					$ret = $value;
-				} // END - if
-			}
+		// If we have an array simply use it and pre-extend it with our value
+		if (is_array($extraValue)) {
+			// Make the new args array
+			$args = merge_array(array($value), $extraValue);
 		} // END - if
-	} // END - if
+
+		// Call the multi-parameter call-back
+		$ret = call_user_func_array($filterFunction, $args);
+
+		// Is $ret 'true'?
+		if ($ret === TRUE) {
+			// Test passed, so write direct value
+			$ret = $args;
+		} // END - if
+	} else {
+		// One parameter call
+		$ret = call_user_func($filterFunction, $value);
+		//* BUG */ die('ret['.gettype($ret).']=' . $ret . ',value=' . $value.',filterFunction=' . $filterFunction);
+
+		// Is $ret 'true'?
+		if ($ret === TRUE) {
+			// Test passed, so write direct value
+			$ret = $value;
+		} // END - if
+	}
 
 	// Return the value
 	return $ret;
@@ -2409,6 +2409,21 @@ function isIp4AddressValid ($address) {
 	return $GLOBALS[__FUNCTION__][$address];
 }
 
+// Returns the string if not empty or FALSE if empty
+function validateIsEmpty ($str) {
+	// Trim it
+	$trimmed = trim($str);
+
+	// Is the string empty?
+	if (empty($trimmed)) {
+		// Then set FALSE
+		$str = FALSE;
+	} // END - if
+
+	// Return it
+	return $str;
+}
+
 // ----------------------------------------------------------------------------
 //              "Translatation" functions for points_data table
 // ----------------------------------------------------------------------------
diff --git a/inc/language/grade_de.php b/inc/language/grade_de.php
index 21dae95de5..1ca3e17254 100644
--- a/inc/language/grade_de.php
+++ b/inc/language/grade_de.php
@@ -57,8 +57,17 @@ addMessages(array(
 	// Admin - submit buttons
 	'ADMIN_ADD_GRADE_DATA_SUBMIT' => "Neue Accountstufe hinzuf&uuml;gen",
 
+	// Admin - subject lines
+	'ADMIN_ADD_GRADE_DATA_SUBJECT' => "Neue Accountstufe hinzugef&uuml;gt",
+
 	// Admin - notices
 	'ADMIN_ADD_GRADE_DATA_NOTICE' => "<strong>Hinweise:</strong> Geben Sie als Namen z.B. <strong>Bronze</strong>, <strong>Silber</strong>, <strong>Gold</strong> oder <strong>Platinum</strong> ein. Als beschreibender Text k&ouml;nnten Sie z.B. eingeben, was alles ausserdem noch zu beachten gibt oder es dazu gibt. Mit der Eltern-Accountstufe w&auml;hlen Sie aus, welche Accountstufe n&ouml;tig ist, um die neue Stufe zu erreichen. Beispielsweise k&ouml;nnte die Stufe <strong>Silber</strong> die Stufe <strong>Bronze</strong> als Eltern-Accountstufe haben, damit zuerst Bronze und dann Silber erreicht werden muss.",
+
+	// Admin - grade_data table
+	'ADMIN_GRADE_DATA_ID' => "Stufen-Id:",
+	'ADMIN_GRADE_DATA_NAME' => "Name f&uuml;r Stufe:",
+	'ADMIN_GRADE_DATA_DESCRIPTION' => "Beschreibung:",
+	'ADMIN_GRADE_DATA_PARENT_ID' => "Eltern-Stufe:",
 ));
 
 // [EOF]
diff --git a/inc/libs/grade_functions.php b/inc/libs/grade_functions.php
index c44ecbcec3..9b8fc2b4c7 100644
--- a/inc/libs/grade_functions.php
+++ b/inc/libs/grade_functions.php
@@ -93,5 +93,16 @@ ORDER BY
 	return $GLOBALS[__FUNCTION__][$defaultId];
 }
 
+// ----------------------------------------------------------------------------
+//                             XML call-back functions
+// ----------------------------------------------------------------------------
+
+// For 'doing' add grade data, the column-index is required
+function addXmlSpecialAdminAddDoGradeData () {
+	// So set it all here
+	$GLOBALS['__COLUMN_INDEX']['doXmlCallbackFunction']  = 'column';
+	$GLOBALS['__XML_ARGUMENTS']['doXmlCallbackFunction']['column_index'] = 'column';
+}
+
 // [EOF]
 ?>
diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index bbd60234bd..82aca4d8c4 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -2022,7 +2022,7 @@ function doGenericAddEntries ($tableName, $columns = array(), $filterFunctions =
 		} // END - if
 
 		// Debug message
-		//* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',columnName[' . gettype($columnName) . ']=' . $columnName . ',filterFunctions=' . $filterFunctions[$key] . ',extraValues=' . intval(isset($extraValues[$key])) . ',extraValuesName=' . intval(isset($extraValues[$columnName . '_list'])) . '<br />');
+		//* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',columnName[' . gettype($columnName) . ']=' . $columnName . ',filterFunctions=' . $filterFunctions[$key] . ',extraValues=' . intval(isset($extraValues[$key])) . ',extraValuesName=' . intval(isset($extraValues[$columnName . '_list'])));
 
 		// Copy entry securely to the final arrays
 		$sqlColumns[$key] = SQL_ESCAPE($columnName);
@@ -2044,7 +2044,7 @@ function doGenericAddEntries ($tableName, $columns = array(), $filterFunctions =
 				// Then log it
 				//* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'columnName=' . $columnName . ',sqlValues[' . $key . '][' . gettype($sqlValues[$key]) . ']=' . $sqlValues[$key] . ' - AFTER!');
 			} // END - if
-		} elseif ((isset($filterFunctions[$key])) && (!empty($filterFunctions[$key])) && (!empty($sqlValues[$key]))) {
+		} elseif (isset($filterFunctions[$key])) {
 			// Debug mode enabled?
 			if (isDebugModeEnabled()) {
 				// Then log it
@@ -2085,7 +2085,7 @@ function doGenericAddEntries ($tableName, $columns = array(), $filterFunctions =
 		// Run the SQL query
 		SQL_QUERY($sql, __FUNCTION__, __LINE__);
 
-		// Add id
+		// Add id number
 		setPostRequestElement('id', SQL_INSERTID());
 
 		// Prepare filter data array
diff --git a/templates/de/emails/admin/admin_add_grade_data.tpl b/templates/de/emails/admin/admin_add_grade_data.tpl
new file mode 100644
index 0000000000..c5ec92d2c9
--- /dev/null
+++ b/templates/de/emails/admin/admin_add_grade_data.tpl
@@ -0,0 +1,19 @@
+Hallo Administrator,
+
+Es wurde soeben eine Accounstufe hinzugef&uuml;gt.
+
+Hier sind alle Daten dazu:
+------------------------------------------
+{--ADMIN_GRADE_DATA_ID--} $content[id]
+------------------------------------------
+{--ADMIN_GRADE_DATA_NAME--} $content[grade_name]
+------------------------------------------
+{--ADMIN_GRADE_DATA_DESCRIPTION--} {%pipe,fixEmptyContentToDashes=$content[grade_description]%}
+------------------------------------------
+{--ADMIN_GRADE_DATA_PARENT_ID--} {%pipe,fixEmptyContentToDashes=$content[grade_parent_id]%}
+------------------------------------------
+
+Mit freundlichen Gr&uuml;&szlig;en,
+  Ihr {?MAIN_TITLE?} Script
+
+{?URL?}/admin.php
diff --git a/templates/xml/admin/admin_add_do_forced_ads.xml b/templates/xml/admin/admin_add_do_forced_ads.xml
index ec0c7b3c9b..11113bd88d 100644
--- a/templates/xml/admin/admin_add_do_forced_ads.xml
+++ b/templates/xml/admin/admin_add_do_forced_ads.xml
@@ -35,10 +35,6 @@ MA  02110-1301  USA
 	//-->
 	<database-table name="" type="string" value="forced_ads" />
 	<!--
-	The following three lists must have the same count of list entries, else an
-	error may occur.
-	//-->
-	<!--
 	And all column names to read/write, leave this list tag empty for all (*).
 	//-->
 	<database-column-list>
diff --git a/templates/xml/admin/admin_add_do_forced_campaigns.xml b/templates/xml/admin/admin_add_do_forced_campaigns.xml
index 5e148bc387..8678da8c6f 100644
--- a/templates/xml/admin/admin_add_do_forced_campaigns.xml
+++ b/templates/xml/admin/admin_add_do_forced_campaigns.xml
@@ -35,10 +35,6 @@ MA  02110-1301  USA
 	//-->
 	<database-table name="" type="string" value="forced_campaigns" />
 	<!--
-	The following three lists must have the same count of list entries, else an
-	error may occur.
-	//-->
-	<!--
 	And all column names to read/write, leave this list tag empty for all (*).
 	//-->
 	<database-column-list>
diff --git a/templates/xml/admin/admin_add_do_forced_costs.xml b/templates/xml/admin/admin_add_do_forced_costs.xml
index 137b84e7b8..5efc39c815 100644
--- a/templates/xml/admin/admin_add_do_forced_costs.xml
+++ b/templates/xml/admin/admin_add_do_forced_costs.xml
@@ -35,10 +35,6 @@ MA  02110-1301  USA
 	//-->
 	<database-table name="" type="string" value="forced_costs" />
 	<!--
-	The following three lists must have the same count of list entries, else an
-	error may occur.
-	//-->
-	<!--
 	And all column names to read/write, leave this list tag empty for all (*).
 	//-->
 	<database-column-list>
diff --git a/templates/xml/admin/admin_add_do_grade_data.xml b/templates/xml/admin/admin_add_do_grade_data.xml
new file mode 100644
index 0000000000..aa689fed3e
--- /dev/null
+++ b/templates/xml/admin/admin_add_do_grade_data.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+This template provides meta data for adding grade data to the database.
+
+@author		Roland Haeder <webmaster@mxchange.org>
+@version	0.2.1-FINAL
+@copyright	(c) 2003 - 2009 by Roland Haeder
+@copyright	(c) 2009 - 2012 by Mailer Developer Team
+@license	GNU GPL 2.0 or any newer version
+@link		http://mxchange.org
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+MA  02110-1301  USA
+//-->
+<admin-entry-meta-data>
+	<!--
+	Call-back function which should all following parameter handled over
+	to. This will always be type of string but we like homogene XMLs.
+	//-->
+	<callback-function type="string" value="adminAddEntries" />
+	<!--
+	Name of the database table where the entries should be read/write from/to.
+	//-->
+	<database-table name="" type="string" value="grade_data" />
+	<!--
+	And all column names to read/write, leave this list tag empty for all (*).
+	//-->
+	<database-column-list>
+		<database-column-list-entry name="" type="string" table="" value="grade_name" alias="" function="" />
+		<database-column-list-entry name="" type="string" table="" value="grade_description" alias="" function="" />
+		<database-column-list-entry name="" type="string" table="" value="grade_parent_id" alias="" function="" />
+	</database-column-list>
+	<!--
+	"Filter" call-back functions to call back for piping the fetched data
+	through (can be left empty, no call-back function will be called)
+	//-->
+	<callback-function-list>
+		<callback-function-list-entry name="" type="string" value="validateIsEmpty" />
+		<callback-function-list-entry name="" type="string" value="validateIsEmpty" />
+		<callback-function-list-entry name="" type="string" value="convertZeroToNull" />
+	</callback-function-list>
+	<!--
+	Extra parameters (2nd, 3rd, ...) for above call-back functions. If an array
+	is provided, we have more than two parameters to handle over to the
+	call-back function. See function handleExtraValues() for details.
+	//-->
+	<extra-parameter-list>
+	</extra-parameter-list>
+	<!--
+	Columns for converting single time selections into a timestamp
+	//-->
+	<time-columns-list>
+	</time-columns-list>
+</admin-entry-meta-data>
diff --git a/templates/xml/admin/admin_delete_do_booking.xml b/templates/xml/admin/admin_delete_do_booking.xml
index ddde574d43..07a62058e4 100644
--- a/templates/xml/admin/admin_delete_do_booking.xml
+++ b/templates/xml/admin/admin_delete_do_booking.xml
@@ -35,10 +35,6 @@ MA  02110-1301  USA
 	//-->
 	<database-table name="" type="string" value="user_booking" />
 	<!--
-	The following three lists must have the same count of list entries, else an
-	error may occur.
-	//-->
-	<!--
 	And all column names to read/write, leave this list tag empty for all (*).
 	//-->
 	<database-column-list>
diff --git a/templates/xml/admin/admin_delete_do_forced_ads.xml b/templates/xml/admin/admin_delete_do_forced_ads.xml
index 2895d49fd3..64fb5ce982 100644
--- a/templates/xml/admin/admin_delete_do_forced_ads.xml
+++ b/templates/xml/admin/admin_delete_do_forced_ads.xml
@@ -35,10 +35,6 @@ MA  02110-1301  USA
 	//-->
 	<database-table name="" type="string" value="forced_ads" />
 	<!--
-	The following three lists must have the same count of list entries, else an
-	error may occur.
-	//-->
-	<!--
 	And all column names to read/write, leave this list tag empty for all (*).
 	//-->
 	<database-column-list>
diff --git a/templates/xml/admin/admin_delete_do_forced_costs.xml b/templates/xml/admin/admin_delete_do_forced_costs.xml
index a47f72010a..3234781bbc 100644
--- a/templates/xml/admin/admin_delete_do_forced_costs.xml
+++ b/templates/xml/admin/admin_delete_do_forced_costs.xml
@@ -35,10 +35,6 @@ MA  02110-1301  USA
 	//-->
 	<database-table name="" type="string" value="forced_costs" />
 	<!--
-	The following three lists must have the same count of list entries, else an
-	error may occur.
-	//-->
-	<!--
 	And all column names to read/write, leave this list tag empty for all (*).
 	//-->
 	<database-column-list>
diff --git a/templates/xml/admin/admin_delete_do_nickname_history.xml b/templates/xml/admin/admin_delete_do_nickname_history.xml
index 3af9abc605..c60cdc60b7 100644
--- a/templates/xml/admin/admin_delete_do_nickname_history.xml
+++ b/templates/xml/admin/admin_delete_do_nickname_history.xml
@@ -35,10 +35,6 @@ MA  02110-1301  USA
 	//-->
 	<database-table name="" type="string" value="history" />
 	<!--
-	The following three lists must have the same count of list entries, else an
-	error may occur.
-	//-->
-	<!--
 	And all column names to read/write, leave this list tag empty for all (*).
 	//-->
 	<database-column-list>
diff --git a/templates/xml/admin/admin_delete_do_surfbar_urls.xml b/templates/xml/admin/admin_delete_do_surfbar_urls.xml
index d9f7918a1f..740c48990c 100644
--- a/templates/xml/admin/admin_delete_do_surfbar_urls.xml
+++ b/templates/xml/admin/admin_delete_do_surfbar_urls.xml
@@ -36,10 +36,6 @@ MA  02110-1301  USA
 	//-->
 	<database-table name="" type="string" value="surfbar_urls" />
 	<!--
-	The following three lists must have the same count of list entries, else an
-	error may occur.
-	//-->
-	<!--
 	And all column names to read/write, leave this list tag empty for all (*).
 	//-->
 	<database-column-list>
diff --git a/templates/xml/admin/admin_delete_do_user_subid.xml b/templates/xml/admin/admin_delete_do_user_subid.xml
index 39fd0bdc77..eaa8a5d0f2 100644
--- a/templates/xml/admin/admin_delete_do_user_subid.xml
+++ b/templates/xml/admin/admin_delete_do_user_subid.xml
@@ -35,10 +35,6 @@ MA  02110-1301  USA
 	//-->
 	<database-table name="" type="string" value="user_subids" />
 	<!--
-	The following three lists must have the same count of list entries, else an
-	error may occur.
-	//-->
-	<!--
 	And all column names to read/write, leave this list tag empty for all (*).
 	//-->
 	<database-column-list>
diff --git a/templates/xml/admin/admin_delete_do_user_subid_stats.xml b/templates/xml/admin/admin_delete_do_user_subid_stats.xml
index 342e060605..8170e54ed4 100644
--- a/templates/xml/admin/admin_delete_do_user_subid_stats.xml
+++ b/templates/xml/admin/admin_delete_do_user_subid_stats.xml
@@ -35,10 +35,6 @@ MA  02110-1301  USA
 	//-->
 	<database-table name="" type="string" value="subid_log" />
 	<!--
-	The following three lists must have the same count of list entries, else an
-	error may occur.
-	//-->
-	<!--
 	And all column names to read/write, leave this list tag empty for all (*).
 	//-->
 	<database-column-list>
diff --git a/templates/xml/admin/admin_delete_show_forced_ads.xml b/templates/xml/admin/admin_delete_show_forced_ads.xml
index b81695d2f5..10e14323d2 100644
--- a/templates/xml/admin/admin_delete_show_forced_ads.xml
+++ b/templates/xml/admin/admin_delete_show_forced_ads.xml
@@ -35,10 +35,6 @@ MA  02110-1301  USA
 	//-->
 	<database-table name="" type="string" value="forced_ads" />
 	<!--
-	The following three lists must have the same count of list entries, else an
-	error may occur.
-	//-->
-	<!--
 	And all column names to read/write, leave this list tag empty for all (*).
 	//-->
 	<database-column-list>
diff --git a/templates/xml/admin/admin_delete_show_forced_costs.xml b/templates/xml/admin/admin_delete_show_forced_costs.xml
index 56dd0ac971..697202262e 100644
--- a/templates/xml/admin/admin_delete_show_forced_costs.xml
+++ b/templates/xml/admin/admin_delete_show_forced_costs.xml
@@ -35,10 +35,6 @@ MA  02110-1301  USA
 	//-->
 	<database-table name="" type="string" value="forced_costs" />
 	<!--
-	The following three lists must have the same count of list entries, else an
-	error may occur.
-	//-->
-	<!--
 	And all column names to read/write, leave this list tag empty for all (*).
 	//-->
 	<database-column-list>
diff --git a/templates/xml/admin/admin_delete_show_surfbar_urls.xml b/templates/xml/admin/admin_delete_show_surfbar_urls.xml
index 6a035fb0a0..343f69db20 100644
--- a/templates/xml/admin/admin_delete_show_surfbar_urls.xml
+++ b/templates/xml/admin/admin_delete_show_surfbar_urls.xml
@@ -36,10 +36,6 @@ MA  02110-1301  USA
 	//-->
 	<database-table name="" type="string" value="surfbar_urls" />
 	<!--
-	The following three lists must have the same count of list entries, else an
-	error may occur.
-	//-->
-	<!--
 	And all column names to read/write, leave this list tag empty for all (*).
 	//-->
 	<database-column-list>
diff --git a/templates/xml/admin/admin_delete_show_user_subid.xml b/templates/xml/admin/admin_delete_show_user_subid.xml
index 14539c2c0c..a1002eacba 100644
--- a/templates/xml/admin/admin_delete_show_user_subid.xml
+++ b/templates/xml/admin/admin_delete_show_user_subid.xml
@@ -35,9 +35,6 @@ MA  02110-1301  USA
 	//-->
 	<database-table name="" type="string" value="user_subids" />
 	<!--
-	The following three lists must have the same count of list entries, else an
-	error may occur.
-	//-->
 	<!--
 	And all column names to read/write, leave this list tag empty for all (*).
 	//-->
diff --git a/templates/xml/admin/admin_edit_do_forced_ads.xml b/templates/xml/admin/admin_edit_do_forced_ads.xml
index 3818cea1e0..441dcc2e6c 100644
--- a/templates/xml/admin/admin_edit_do_forced_ads.xml
+++ b/templates/xml/admin/admin_edit_do_forced_ads.xml
@@ -35,10 +35,6 @@ MA  02110-1301  USA
 	//-->
 	<database-table name="" type="string" value="forced_ads" />
 	<!--
-	The following three lists must have the same count of list entries, else an
-	error may occur.
-	//-->
-	<!--
 	And all column names to read/write, leave this list tag empty for all (*).
 	//-->
 	<database-column-list>
diff --git a/templates/xml/admin/admin_edit_do_forced_costs.xml b/templates/xml/admin/admin_edit_do_forced_costs.xml
index 950ff33436..c0dd169f5e 100644
--- a/templates/xml/admin/admin_edit_do_forced_costs.xml
+++ b/templates/xml/admin/admin_edit_do_forced_costs.xml
@@ -35,10 +35,6 @@ MA  02110-1301  USA
 	//-->
 	<database-table name="" type="string" value="forced_costs" />
 	<!--
-	The following three lists must have the same count of list entries, else an
-	error may occur.
-	//-->
-	<!--
 	And all column names to read/write, leave this list tag empty for all (*).
 	//-->
 	<database-column-list>
diff --git a/templates/xml/admin/admin_edit_do_point_accounts.xml b/templates/xml/admin/admin_edit_do_point_accounts.xml
index f0280cfa99..40ecd25c7c 100644
--- a/templates/xml/admin/admin_edit_do_point_accounts.xml
+++ b/templates/xml/admin/admin_edit_do_point_accounts.xml
@@ -35,10 +35,6 @@ MA  02110-1301  USA
 	//-->
 	<database-table name="" type="string" value="points_data" />
 	<!--
-	The following three lists must have the same count of list entries, else an
-	error may occur.
-	//-->
-	<!--
 	And all column names to read/write, leave this list tag empty for all (*).
 	//-->
 	<database-column-list>
diff --git a/templates/xml/admin/admin_edit_do_surfbar_actions.xml b/templates/xml/admin/admin_edit_do_surfbar_actions.xml
index 08ca40abf1..ce3e27c876 100644
--- a/templates/xml/admin/admin_edit_do_surfbar_actions.xml
+++ b/templates/xml/admin/admin_edit_do_surfbar_actions.xml
@@ -36,10 +36,6 @@ MA  02110-1301  USA
 	//-->
 	<database-table name="" type="string" value="surfbar_actions" />
 	<!--
-	The following three lists must have the same count of list entries, else an
-	error may occur.
-	//-->
-	<!--
 	And all column names to read/write, leave this list tag empty for all (*).
 	//-->
 	<database-column-list>
diff --git a/templates/xml/admin/admin_edit_do_surfbar_urls.xml b/templates/xml/admin/admin_edit_do_surfbar_urls.xml
index 584d9e0a1e..ebc3a40d2d 100644
--- a/templates/xml/admin/admin_edit_do_surfbar_urls.xml
+++ b/templates/xml/admin/admin_edit_do_surfbar_urls.xml
@@ -36,10 +36,6 @@ MA  02110-1301  USA
 	//-->
 	<database-table name="" type="string" value="surfbar_urls" />
 	<!--
-	The following three lists must have the same count of list entries, else an
-	error may occur.
-	//-->
-	<!--
 	And all column names to read/write, leave this list tag empty for all (*).
 	//-->
 	<database-column-list>
diff --git a/templates/xml/admin/admin_edit_do_user_subid.xml b/templates/xml/admin/admin_edit_do_user_subid.xml
index 6ab3c767d0..5b4c0e9336 100644
--- a/templates/xml/admin/admin_edit_do_user_subid.xml
+++ b/templates/xml/admin/admin_edit_do_user_subid.xml
@@ -35,10 +35,6 @@ MA  02110-1301  USA
 	//-->
 	<database-table name="" type="string" value="user_subids" />
 	<!--
-	The following three lists must have the same count of list entries, else an
-	error may occur.
-	//-->
-	<!--
 	And all column names to read/write, leave this list tag empty for all (*).
 	//-->
 	<database-column-list>
diff --git a/templates/xml/admin/admin_edit_show_forced_ads.xml b/templates/xml/admin/admin_edit_show_forced_ads.xml
index 060badac53..fb2348733f 100644
--- a/templates/xml/admin/admin_edit_show_forced_ads.xml
+++ b/templates/xml/admin/admin_edit_show_forced_ads.xml
@@ -35,10 +35,6 @@ MA  02110-1301  USA
 	//-->
 	<database-table name="" type="string" value="forced_ads" />
 	<!--
-	The following three lists must have the same count of list entries, else an
-	error may occur.
-	//-->
-	<!--
 	And all column names to read/write, leave this list tag empty for all (*).
 	//-->
 	<database-column-list>
diff --git a/templates/xml/admin/admin_edit_show_forced_campaigns.xml b/templates/xml/admin/admin_edit_show_forced_campaigns.xml
index e8797e360e..bf6050ed36 100644
--- a/templates/xml/admin/admin_edit_show_forced_campaigns.xml
+++ b/templates/xml/admin/admin_edit_show_forced_campaigns.xml
@@ -35,10 +35,6 @@ MA  02110-1301  USA
 	//-->
 	<database-table name="" type="string" value="forced_campaigns" />
 	<!--
-	The following three lists must have the same count of list entries, else an
-	error may occur.
-	//-->
-	<!--
 	And all column names to read/write, leave this list tag empty for all (*).
 	//-->
 	<database-column-list>
diff --git a/templates/xml/admin/admin_edit_show_forced_costs.xml b/templates/xml/admin/admin_edit_show_forced_costs.xml
index 7f41209db3..e30c47560b 100644
--- a/templates/xml/admin/admin_edit_show_forced_costs.xml
+++ b/templates/xml/admin/admin_edit_show_forced_costs.xml
@@ -35,10 +35,6 @@ MA  02110-1301  USA
 	//-->
 	<database-table name="" type="string" value="forced_costs" />
 	<!--
-	The following three lists must have the same count of list entries, else an
-	error may occur.
-	//-->
-	<!--
 	And all column names to read/write, leave this list tag empty for all (*).
 	//-->
 	<database-column-list>
diff --git a/templates/xml/admin/admin_edit_show_point_accounts.xml b/templates/xml/admin/admin_edit_show_point_accounts.xml
index 79a4f65e72..6e08bea5b8 100644
--- a/templates/xml/admin/admin_edit_show_point_accounts.xml
+++ b/templates/xml/admin/admin_edit_show_point_accounts.xml
@@ -35,10 +35,6 @@ MA  02110-1301  USA
 	//-->
 	<database-table name="" type="string" value="points_data" />
 	<!--
-	The following three lists must have the same count of list entries, else an
-	error may occur.
-	//-->
-	<!--
 	And all column names to read/write, leave this list tag empty for all (*).
 	//-->
 	<database-column-list>
@@ -63,6 +59,7 @@ MA  02110-1301  USA
 		A call-back function list entry
 		//-->
 		<callback-function-list-entry name="" type="string" value="bigintval" />
+		<callback-function-list-entry name="" type="string" value="bigintval" />
 	</callback-function-list>
 	<!--
 	Extra parameters (2nd, 3rd, ...) for above call-back functions. If an array
diff --git a/templates/xml/admin/admin_edit_show_surfbar_actions.xml b/templates/xml/admin/admin_edit_show_surfbar_actions.xml
index a0fc8f93f5..c5c61a7245 100644
--- a/templates/xml/admin/admin_edit_show_surfbar_actions.xml
+++ b/templates/xml/admin/admin_edit_show_surfbar_actions.xml
@@ -36,10 +36,6 @@ MA  02110-1301  USA
 	//-->
 	<database-table name="" type="string" value="surfbar_actions" />
 	<!--
-	The following three lists must have the same count of list entries, else an
-	error may occur.
-	//-->
-	<!--
 	And all column names to read/write, leave this list tag empty for all (*).
 	//-->
 	<database-column-list>
diff --git a/templates/xml/admin/admin_edit_show_surfbar_urls.xml b/templates/xml/admin/admin_edit_show_surfbar_urls.xml
index e9465a0202..40fba13855 100644
--- a/templates/xml/admin/admin_edit_show_surfbar_urls.xml
+++ b/templates/xml/admin/admin_edit_show_surfbar_urls.xml
@@ -36,10 +36,6 @@ MA  02110-1301  USA
 	//-->
 	<database-table name="" type="string" value="surfbar_urls" />
 	<!--
-	The following three lists must have the same count of list entries, else an
-	error may occur.
-	//-->
-	<!--
 	And all column names to read/write, leave this list tag empty for all (*).
 	//-->
 	<database-column-list>
@@ -61,6 +57,7 @@ MA  02110-1301  USA
 		//-->
 		<callback-function-list-entry name="" type="string" value="bigintval" />
 		<callback-function-list-entry name="member_list" type="string" value="addMemberSelectionBox" />
+		<callback-function-list-entry name="" type="string" value="" />
 	</callback-function-list>
 	<!--
 	Extra parameters (2nd, 3rd, ...) for above call-back functions. If an array
diff --git a/templates/xml/admin/admin_edit_show_user_subid.xml b/templates/xml/admin/admin_edit_show_user_subid.xml
index 74a562eda3..b2386d9a2f 100644
--- a/templates/xml/admin/admin_edit_show_user_subid.xml
+++ b/templates/xml/admin/admin_edit_show_user_subid.xml
@@ -35,10 +35,6 @@ MA  02110-1301  USA
 	//-->
 	<database-table name="" type="string" value="user_subids" />
 	<!--
-	The following three lists must have the same count of list entries, else an
-	error may occur.
-	//-->
-	<!--
 	And all column names to read/write, leave this list tag empty for all (*).
 	//-->
 	<database-column-list>
diff --git a/templates/xml/admin/admin_lock_do_surfbar_urls.xml b/templates/xml/admin/admin_lock_do_surfbar_urls.xml
index f970ff0ab8..b97aa36d2f 100644
--- a/templates/xml/admin/admin_lock_do_surfbar_urls.xml
+++ b/templates/xml/admin/admin_lock_do_surfbar_urls.xml
@@ -36,10 +36,6 @@ MA  02110-1301  USA
 	//-->
 	<database-table name="" type="string" value="surfbar_urls" />
 	<!--
-	The following three lists must have the same count of list entries, else an
-	error may occur.
-	//-->
-	<!--
 	And all column names to read/write, leave this list tag empty for all (*).
 	//-->
 	<database-column-list>
diff --git a/templates/xml/admin/admin_lock_show_surfbar_urls.xml b/templates/xml/admin/admin_lock_show_surfbar_urls.xml
index ae28d18b0a..eba2cf5d0f 100644
--- a/templates/xml/admin/admin_lock_show_surfbar_urls.xml
+++ b/templates/xml/admin/admin_lock_show_surfbar_urls.xml
@@ -36,10 +36,6 @@ MA  02110-1301  USA
 	//-->
 	<database-table name="" type="string" value="surfbar_urls" />
 	<!--
-	The following three lists must have the same count of list entries, else an
-	error may occur.
-	//-->
-	<!--
 	And all column names to read/write, leave this list tag empty for all (*).
 	//-->
 	<database-column-list>
diff --git a/templates/xml/admin/admin_undelete_do_surfbar_urls.xml b/templates/xml/admin/admin_undelete_do_surfbar_urls.xml
index 0420548067..1ffb1f52bf 100644
--- a/templates/xml/admin/admin_undelete_do_surfbar_urls.xml
+++ b/templates/xml/admin/admin_undelete_do_surfbar_urls.xml
@@ -36,10 +36,6 @@ MA  02110-1301  USA
 	//-->
 	<database-table name="" type="string" value="surfbar_urls" />
 	<!--
-	The following three lists must have the same count of list entries, else an
-	error may occur.
-	//-->
-	<!--
 	And all column names to read/write, leave this list tag empty for all (*).
 	//-->
 	<database-column-list>
diff --git a/templates/xml/admin/admin_undelete_show_surfbar_urls.xml b/templates/xml/admin/admin_undelete_show_surfbar_urls.xml
index bcc63c2084..bf8afe64be 100644
--- a/templates/xml/admin/admin_undelete_show_surfbar_urls.xml
+++ b/templates/xml/admin/admin_undelete_show_surfbar_urls.xml
@@ -36,10 +36,6 @@ MA  02110-1301  USA
 	//-->
 	<database-table name="" type="string" value="surfbar_urls" />
 	<!--
-	The following three lists must have the same count of list entries, else an
-	error may occur.
-	//-->
-	<!--
 	And all column names to read/write, leave this list tag empty for all (*).
 	//-->
 	<database-column-list>
diff --git a/templates/xml/admin_data_template.xml b/templates/xml/admin_data_template.xml
index 7bdac96841..1af83f05a2 100644
--- a/templates/xml/admin_data_template.xml
+++ b/templates/xml/admin_data_template.xml
@@ -39,10 +39,6 @@ MA 02110-1301 USA
 	//-->
 	<database-table name="" type="string" value="table_name" />
 	<!--
-	The following three lists must have the same count of list entries, else an
-	error may occur.
-	//-->
-	<!--
 	And all column names to read/write, leave this list tag empty for all (*).
 	//-->
 	<database-column-list>
diff --git a/templates/xml/member/member_add_do_user_subid.xml b/templates/xml/member/member_add_do_user_subid.xml
index 5cbce310c7..59d2683589 100644
--- a/templates/xml/member/member_add_do_user_subid.xml
+++ b/templates/xml/member/member_add_do_user_subid.xml
@@ -35,10 +35,6 @@ MA  02110-1301  USA
 	//-->
 	<database-table name="" type="string" value="user_subids" />
 	<!--
-	The following three lists must have the same count of list entries, else an
-	error may occur.
-	//-->
-	<!--
 	And all column names to read/write, leave this list tag empty for all (*).
 	//-->
 	<database-column-list>
diff --git a/templates/xml/member/member_delete_do_user_subid.xml b/templates/xml/member/member_delete_do_user_subid.xml
index 6911636638..ebab7093b4 100644
--- a/templates/xml/member/member_delete_do_user_subid.xml
+++ b/templates/xml/member/member_delete_do_user_subid.xml
@@ -35,10 +35,6 @@ MA  02110-1301  USA
 	//-->
 	<database-table name="" type="string" value="user_subids" />
 	<!--
-	The following three lists must have the same count of list entries, else an
-	error may occur.
-	//-->
-	<!--
 	And all column names to read/write, leave this list tag empty for all (*).
 	//-->
 	<database-column-list>
diff --git a/templates/xml/member/member_delete_show_user_subid.xml b/templates/xml/member/member_delete_show_user_subid.xml
index 74d6f0c002..d38e9953ac 100644
--- a/templates/xml/member/member_delete_show_user_subid.xml
+++ b/templates/xml/member/member_delete_show_user_subid.xml
@@ -35,10 +35,6 @@ MA  02110-1301  USA
 	//-->
 	<database-table name="" type="string" value="user_subids" />
 	<!--
-	The following three lists must have the same count of list entries, else an
-	error may occur.
-	//-->
-	<!--
 	And all column names to read/write, leave this list tag empty for all (*).
 	//-->
 	<database-column-list>
diff --git a/templates/xml/member/member_edit_do_user_subid.xml b/templates/xml/member/member_edit_do_user_subid.xml
index 1a33fa223d..195da5765b 100644
--- a/templates/xml/member/member_edit_do_user_subid.xml
+++ b/templates/xml/member/member_edit_do_user_subid.xml
@@ -35,10 +35,6 @@ MA  02110-1301  USA
 	//-->
 	<database-table name="" type="string" value="user_subids" />
 	<!--
-	The following three lists must have the same count of list entries, else an
-	error may occur.
-	//-->
-	<!--
 	And all column names to read/write, leave this list tag empty for all (*).
 	//-->
 	<database-column-list>
@@ -53,7 +49,7 @@ MA  02110-1301  USA
 	//-->
 	<callback-function-list>
 		<!--
-		Use again prepareSubId() to validate it.
+		Use again validateSubId() to validate it.
 		//-->
 		<callback-function-list-entry name="" type="string" value="validateSubId" />
 	</callback-function-list>
diff --git a/templates/xml/member/member_edit_show_user_subid.xml b/templates/xml/member/member_edit_show_user_subid.xml
index e383af5db9..5970612c66 100644
--- a/templates/xml/member/member_edit_show_user_subid.xml
+++ b/templates/xml/member/member_edit_show_user_subid.xml
@@ -35,10 +35,6 @@ MA  02110-1301  USA
 	//-->
 	<database-table name="" type="string" value="user_subids" />
 	<!--
-	The following three lists must have the same count of list entries, else an
-	error may occur.
-	//-->
-	<!--
 	And all column names to read/write, leave this list tag empty for all (*).
 	//-->
 	<database-column-list>