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 ef855fa17093ab7d429fdff162fcfa4b5963147d..21f6a8e74324c453c7f2359377b131098265d4ef 100644 (file)
--- 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 6aecfae83a22d43bd0baf18a1d09335d5f0841f3..a941932a6ca5d471dbe8008484b418f6c5802fbd 100644 (file)
--- 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 21dae95de5fc9e338b9060467799a77b15511b65..1ca3e17254ee816395722bd2783a2b666ca8eedc 100644 (file)
--- 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ügen",
 
+       // Admin - subject lines
+       'ADMIN_ADD_GRADE_DATA_SUBJECT' => "Neue Accountstufe hinzugefü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 c44ecbcec34c02ab99340b96ecf194623e1f1aaa..9b8fc2b4c7b8641231d3224be6c07408ce0c3e7c 100644 (file)
--- 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 bbd60234bdfc3dde0ad943b62b4e526358fff69b..82aca4d8c419ea4264cef0ed0b8f233c6b8ec007 100644 (file)
--- 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 (file)
index 0000000..c5ec92d
--- /dev/null
+++ b/templates/de/emails/admin/admin_add_grade_data.tpl
@@ -0,0 +1,19 @@
+Hallo Administrator,
+
+Es wurde soeben eine Accounstufe hinzugefü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üß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 ec0c7b3c9bf4dbc7ea9bc0b081ed663e0d18965e..11113bd88d86f139defa358d1a4d7620c3d66aa7 100644 (file)
--- 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 5e148bc387dbf484c8c3023cbb846013b1b2e798..8678da8c6f3a4e0a14587a0cc906ab33ce9e979e 100644 (file)
--- 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 137b84e7b8210e15f611bedf182d09fa8ccae8b2..5efc39c815b0e8b54a8a752a34ae60dccb3ff5f3 100644 (file)
--- 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 (file)
index 0000000..aa689fe
--- /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 ddde574d43cfd1eb0e7f11e21d333ee13a1e82be..07a62058e4d708a344e6a0c47f2fce4bca73802b 100644 (file)
--- 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 2895d49fd398244a2e0d0b4faa21af7cb10ed578..64fb5ce982902bdd6f2c4835afc01789f3c3e31e 100644 (file)
--- 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 a47f72010a171d8ace3039ea5005d34df8caad5b..3234781bbc80df025cd2c14a34cd1e755708ab24 100644 (file)
--- 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 3af9abc6056123f1120ddb98cf890a074b551da9..c60cdc60b7845384878e50673b59e02e23b8eed9 100644 (file)
--- 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 d9f7918a1fda4a18b341033f41bbea00c8cb4b3e..740c48990c14c0d51b297c2f46da776452e2656c 100644 (file)
--- 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 39fd0bdc776bdd01d5348bcb42b65b0787f2f6b3..eaa8a5d0f290468423d934868b659ede07250946 100644 (file)
--- 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 342e06060516d36c160892c6d2d007115001fb77..8170e54ed4358b2850bf1776a61e39a41d8b8cbf 100644 (file)
--- 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 b81695d2f5a746d9009007a1001a7cd7978138b3..10e14323d25da1ddbbef1d28e4bc56349c1146d3 100644 (file)
--- 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 56dd0ac97154bff3a5154d5a0087eb5f24d2181c..697202262e1473bae334ac8c10119769ef7a1ad5 100644 (file)
--- 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 6a035fb0a04168ef5e19ebc6c115bfdfa8691688..343f69db206fcc21c09823bf1751a277ee0c3baa 100644 (file)
--- 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 14539c2c0ccd4edc4e7b79c82d66ad7ad0db86e7..a1002eacba0f29830b18e669506353ae4f7a0065 100644 (file)
--- 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 3818cea1e0b302b2cb4bba6e85c228c72b462c81..441dcc2e6cfe5c46b5c31ba1e9ae41444b469e02 100644 (file)
--- 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 950ff33436bdb8cd597b6a59d43b04a387a84245..c0dd169f5ef4bdeb36e00c014fd4bfac607b69a4 100644 (file)
--- 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 f0280cfa99ed749bf681aa617d9c16dd574404da..40ecd25c7cd72d16782340b17f62535fc4c27e73 100644 (file)
--- 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 08ca40abf1ad621e6592de8919756b687f3566b8..ce3e27c8767b0da64513a1596b5132d60beaf0f7 100644 (file)
--- 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 584d9e0a1ed0d87cab3066fc6e2807d16b3e9d88..ebc3a40d2d805baedc91641e85644942dce6ba47 100644 (file)
--- 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 6ab3c767d0cc6ed79c6eb800c4bbcca93ab61872..5b4c0e9336521baa7c0eaa68ccf8d31f5a98b4c0 100644 (file)
--- 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 060badac532ce51da6e8789bf61ee94ef61af457..fb2348733f52a3951e9f33e29d714c764905cbec 100644 (file)
--- 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 e8797e360e40b8b116e7344f0d069b823ab65a91..bf6050ed3605a2824a004477538edcaebbcfb760 100644 (file)
--- 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 7f41209db367a30a7d44527912dd31bd9043edac..e30c47560b7592d17e10dcb7d9c7fbfe8dd22c52 100644 (file)
--- 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 79a4f65e72743f0d4481d7a5d8749e8553de7263..6e08bea5b8ad65f96fc78a339189dbf55b7c09c4 100644 (file)
--- 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 a0fc8f93f50b97d5b6e421e6314c56130c39b926..c5c61a724560af81a81a3b175853521fa7cb0b99 100644 (file)
--- 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 e9465a020239677391810e4af21b933c8d1da0be..40fba138558c8319452d344665f22f38c0250191 100644 (file)
--- 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 74a562eda359341c1dcf895d1d407ac72558959c..b2386d9a2f7009da1e6ce3c45f85d50537804a4d 100644 (file)
--- 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 f970ff0ab853eb43fc5de1c13c5306c1c907badf..b97aa36d2fc1c161453a8946b92b858deab48947 100644 (file)
--- 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 ae28d18b0a53e777da3eddd1d5059b32afed760c..eba2cf5d0f0c1f3bd8cffed237f7c2d0b6719ca6 100644 (file)
--- 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 0420548067a596616f857cdd6c8a7ab416d996cf..1ffb1f52bf280dc34b3f0b0be8cffd2ce0fad179 100644 (file)
--- 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 bcc63c2084054320b0b0e22cd8e305b2afa1d412..bf8afe64be40843a84c92438c094142d781a1fb9 100644 (file)
--- 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 7bdac96841fccb68dd77e66b8441f9df012844a4..1af83f05a29cf27e5fc89b195f945a1b07e31542 100644 (file)
--- 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 5cbce310c7026b39e98ef7bbf958d187e7fdeee3..59d2683589c86d64f56bbe4b3a0fc3319f977f36 100644 (file)
--- 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 6911636638dc98c3dfce1155f99af2e89deb63c6..ebab7093b4bfd942ccc8a079b0df62510b676b8a 100644 (file)
--- 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 74d6f0c0029bbb03376cfe11922058b779803f24..d38e9953ac66ee037e161be113cce27c8814ffbf 100644 (file)
--- 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 1a33fa223d17b9fc2774223d970f5e609d8478cb..195da5765bb863a3ffbaff22a324c8355ba5ae5c 100644 (file)
--- 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 e383af5db9d76210aafe766551b9513c4ba2368e..5970612c66a4744ed6a5bc9db1e3ca5360131452 100644 (file)
--- 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>