]> git.mxchange.org Git - mailer.git/commitdiff
Renamed showEntriesByXmlCallback() to doGenericXmlTemplateCallback() as it is no...
authorRoland Häder <roland@mxchange.org>
Mon, 22 Oct 2012 19:13:54 +0000 (19:13 +0000)
committerRoland Häder <roland@mxchange.org>
Mon, 22 Oct 2012 19:13:54 +0000 (19:13 +0000)
18 files changed:
inc/modules/admin/subid-stats.php
inc/modules/admin/what-list_
inc/modules/admin/what-list_booking.php
inc/modules/admin/what-list_forced_ads.php
inc/modules/admin/what-list_forced_campaigns.php
inc/modules/admin/what-list_forced_costs.php
inc/modules/admin/what-list_grade_data.php
inc/modules/admin/what-list_nickname.php
inc/modules/admin/what-list_point_accounts.php
inc/modules/admin/what-list_surfbar_actions.php
inc/modules/admin/what-list_surfbar_urls.php
inc/modules/admin/what-list_user_subid.php
inc/modules/admin/what-unlock_surfbar_urls.php
inc/modules/member/subid-stats.php
inc/modules/member/what-booking.php
inc/modules/member/what-subids.php
inc/xml-functions.php
templates/xml/admin/admin_list_grade_data.xml

index d8c9b278bc65c3c10f54953d61e244d47741b562..3891d32aa66833d23ad71075570e9be98bac73b9 100644 (file)
@@ -43,7 +43,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 }
 
 // List all entries
-showEntriesByXmlCallback('admin_list_user_subid_stats');
+doGenericXmlTemplateCallback('admin_list_user_subid_stats');
 
 // [EOF]
 ?>
index c18d48e917f49e5bccffecd0f05fbbb421a61846..2f0c1556965f1b72bf71b371fc43bb85cf373d59 100644 (file)
@@ -58,40 +58,40 @@ if ((countRequestPost() > 0) && (!ifPostContainsSelections('???_id'))) {
 // Edit or delete button hit?
 if (isFormSent('edit')) {
        // Show entries for editing
-       showEntriesByXmlCallback('admin_edit_show_!!!s');
+       doGenericXmlTemplateCallback('admin_edit_show_!!!s');
 
        // Do not show the list of URLs after this template
        $show = FALSE;
 } elseif (isFormSent('do_edit')) {
        // Change data of entries
-       showEntriesByXmlCallback('admin_edit_do_!!!s');
+       doGenericXmlTemplateCallback('admin_edit_do_!!!s');
 } elseif (isFormSent('delete')) {
        // Show entries for deletion
-       showEntriesByXmlCallback('admin_delete_show_!!!s');
+       doGenericXmlTemplateCallback('admin_delete_show_!!!s');
 
        // Do not show the list of URLs after this template
        $show = FALSE;
 } elseif (isFormSent('do_delete')) {
        // Remove entries from database
-       showEntriesByXmlCallback('admin_delete_do_!!!s');
+       doGenericXmlTemplateCallback('admin_delete_do_!!!s');
 } elseif (isFormSent('lock')) {
        // Un-/lock selected URLs. This does not work for pending URLs
-       showEntriesByXmlCallback('admin_lock_show_!!!s');
+       doGenericXmlTemplateCallback('admin_lock_show_!!!s');
 
        // Do not show the list of URLs after this template
        $show = FALSE;
 } elseif (isFormSent('do_lock')) {
        // Un-/lock selected URLs. This does not work for pending URLs
-       showEntriesByXmlCallback('admin_lock_do_!!!s');
+       doGenericXmlTemplateCallback('admin_lock_do_!!!s');
 } elseif (isFormSent('undelete')) {
        // Undelete selected URLs. This does only work for deleted URLs... ;-)
-       showEntriesByXmlCallback('admin_undelete_show_!!!s');
+       doGenericXmlTemplateCallback('admin_undelete_show_!!!s');
 
        // Do not show the list of URLs after this template
        $show = FALSE;
 } elseif (isFormSent('do_undelete')) {
        // Undelete selected URLs. This does only work for deleted URLs... ;-)
-       showEntriesByXmlCallback('admin_undelete_do_!!!s');
+       doGenericXmlTemplateCallback('admin_undelete_do_!!!s');
 }
 
 // Show entries?
@@ -101,7 +101,7 @@ if ($show === FALSE) {
 } // END - if
 
 // List all !!!
-showEntriesByXmlCallback('admin_list_!!!s');
+doGenericXmlTemplateCallback('admin_list_!!!s');
 
 // [EOF]
 ?>
index ad99c5009b70affb6461e8de207be98cef599cd4..731f1602eebf909b949fd58bedb1222f1c43a42a 100644 (file)
@@ -48,11 +48,11 @@ if (isGetRequestElementSet('userid')) {
        // Delete entries?
        if (isFormSent('do_delete')) {
                // Remove entries from database
-               showEntriesByXmlCallback('admin_delete_do_booking');
+               doGenericXmlTemplateCallback('admin_delete_do_booking');
        } // END - if
 
        // List all entries per user
-       showEntriesByXmlCallback('admin_list_booking', array(
+       doGenericXmlTemplateCallback('admin_list_booking', array(
                'userid' => bigintval(getRequestElement('userid'))
        ));
 } else {
index 4771a77db5e25f6447020466741c933e93dfbc2d..498e3d44fef304c694ef4e74e4b37d64fcdc08fa 100644 (file)
@@ -58,25 +58,25 @@ if ((!isFormSent('add')) && (countRequestPost() > 0) && (!ifPostContainsSelectio
 // Edit or delete button hit?
 if (isFormSent('add')) {
        // Add new forced ad
-       showEntriesByXmlCallback('admin_add_do_forced_ads');
+       doGenericXmlTemplateCallback('admin_add_do_forced_ads');
 } elseif (isFormSent('edit')) {
        // Show entries for editing
-       showEntriesByXmlCallback('admin_edit_show_forced_ads');
+       doGenericXmlTemplateCallback('admin_edit_show_forced_ads');
 
        // Do not show the list of URLs after this template
        $show = FALSE;
 } elseif (isFormSent('do_edit')) {
        // Change data of entries
-       showEntriesByXmlCallback('admin_edit_do_forced_ads');
+       doGenericXmlTemplateCallback('admin_edit_do_forced_ads');
 } elseif (isFormSent('delete')) {
        // Show entries for deletion
-       showEntriesByXmlCallback('admin_delete_show_forced_ads');
+       doGenericXmlTemplateCallback('admin_delete_show_forced_ads');
 
        // Do not show the list of URLs after this template
        $show = FALSE;
 } elseif (isFormSent('do_delete')) {
        // Remove entries from database
-       showEntriesByXmlCallback('admin_delete_do_forced_ads');
+       doGenericXmlTemplateCallback('admin_delete_do_forced_ads');
 }
 
 // Show entries?
@@ -86,7 +86,7 @@ if ($show === FALSE) {
 } // END - if
 
 // List all URLs
-showEntriesByXmlCallback('admin_list_forced_ads');
+doGenericXmlTemplateCallback('admin_list_forced_ads');
 
 // Display form for adding a forced-ad
 loadTemplate('admin_add_forced_ad');
index 50949df58064c9ee8751777f67ea860d956cbaf5..811cee8592e9ee7fd7c091ab4f25abfc0e119431 100644 (file)
@@ -58,34 +58,34 @@ if ((!isFormSent('add')) && (countRequestPost() > 0) && (!ifPostContainsSelectio
 // Edit or delete button hit?
 if (isFormSent('add')) {
        // Add new forced ad
-       showEntriesByXmlCallback('admin_add_do_forced_campaigns');
+       doGenericXmlTemplateCallback('admin_add_do_forced_campaigns');
 } elseif (isFormSent('edit')) {
        // Show entries for editing
-       showEntriesByXmlCallback('admin_edit_show_forced_campaigns');
+       doGenericXmlTemplateCallback('admin_edit_show_forced_campaigns');
 
        // Do not show the list of URLs after this template
        $show = FALSE;
 } elseif (isFormSent('do_edit')) {
        // Change data of entries
-       showEntriesByXmlCallback('admin_edit_do_forced_campaigns');
+       doGenericXmlTemplateCallback('admin_edit_do_forced_campaigns');
 } elseif (isFormSent('delete')) {
        // Show entries for deletion
-       showEntriesByXmlCallback('admin_delete_show_forced_campaigns');
+       doGenericXmlTemplateCallback('admin_delete_show_forced_campaigns');
 
        // Do not show the list of URLs after this template
        $show = FALSE;
 } elseif (isFormSent('do_delete')) {
        // Remove entries from database
-       showEntriesByXmlCallback('admin_delete_do_forced_campaigns');
+       doGenericXmlTemplateCallback('admin_delete_do_forced_campaigns');
 } elseif (isFormSent('lock')) {
        // Un-/lock selected campaigns. This does not work for pending campaigns
-       showEntriesByXmlCallback('admin_lock_show_forced_campaigns');
+       doGenericXmlTemplateCallback('admin_lock_show_forced_campaigns');
 
        // Do not show the list of URLs after this template
        $show = FALSE;
 } elseif (isFormSent('do_lock')) {
        // Un-/lock selected campaigns. This does not work for pending campaigns
-       showEntriesByXmlCallback('admin_lock_do_forced_campaigns');
+       doGenericXmlTemplateCallback('admin_lock_do_forced_campaigns');
 } elseif (isFormSent('activate')) {
        // List activation of selected campaigns. This does not work for locked campaigns
        if (doForcedAdminActivateCampaigns()) {
@@ -104,7 +104,7 @@ if ($show === FALSE) {
 } // END - if
 
 // List all campaigns
-showEntriesByXmlCallback('admin_list_forced_campaigns');
+doGenericXmlTemplateCallback('admin_list_forced_campaigns');
 
 // Init array
 $content = array(
index e4f3ae440694ab57afb669a4feb4180a0e0b6ef7..a687179bd40a09ed453941133e49c7f436607546 100644 (file)
@@ -58,25 +58,25 @@ if ((!isFormSent('add')) && (countRequestPost() > 0) && (!ifPostContainsSelectio
 // Edit or delete button hit?
 if (isFormSent('add')) {
        // Add new forced ad
-       showEntriesByXmlCallback('admin_add_do_forced_costs');
+       doGenericXmlTemplateCallback('admin_add_do_forced_costs');
 } elseif (isFormSent('edit')) {
        // Show entries for editing
-       showEntriesByXmlCallback('admin_edit_show_forced_costs');
+       doGenericXmlTemplateCallback('admin_edit_show_forced_costs');
 
        // Do not show the list of URLs after this template
        $show = FALSE;
 } elseif (isFormSent('do_edit')) {
        // Change data of entries
-       showEntriesByXmlCallback('admin_edit_do_forced_costs');
+       doGenericXmlTemplateCallback('admin_edit_do_forced_costs');
 } elseif (isFormSent('delete')) {
        // Show entries for deletion
-       showEntriesByXmlCallback('admin_delete_show_forced_costs');
+       doGenericXmlTemplateCallback('admin_delete_show_forced_costs');
 
        // Do not show the list of URLs after this template
        $show = FALSE;
 } elseif (isFormSent('do_delete')) {
        // Remove entries from database
-       showEntriesByXmlCallback('admin_delete_do_forced_costs');
+       doGenericXmlTemplateCallback('admin_delete_do_forced_costs');
 }
 
 // Show entries?
@@ -86,7 +86,7 @@ if ($show === FALSE) {
 } // END - if
 
 // List all URLs
-showEntriesByXmlCallback('admin_list_forced_costs');
+doGenericXmlTemplateCallback('admin_list_forced_costs');
 
 // Display form for adding a forced-ad
 loadTemplate('admin_add_forced_costs');
index 154cae152293ff612dbe39ca1be109b9f44b6984..e7065423e798027e4c67db845b7903d9fb413d70 100644 (file)
@@ -58,28 +58,28 @@ if ((countRequestPost() > 0) && (!isFormSent('add_grade')) && (!ifPostContainsSe
 // Edit or delete button hit?
 if (isFormSent('add_grade')) {
        // Add grade
-       showEntriesByXmlCallback('admin_add_do_grade_data');
+       doGenericXmlTemplateCallback('admin_add_do_grade_data');
 
        // Do not show the list of URLs after this template
        $show = FALSE;
 } elseif (isFormSent('edit')) {
        // Show entries for editing
-       showEntriesByXmlCallback('admin_edit_show_grade_data');
+       doGenericXmlTemplateCallback('admin_edit_show_grade_data');
 
        // Do not show the list of URLs after this template
        $show = FALSE;
 } elseif (isFormSent('do_edit')) {
        // Change data of entries
-       showEntriesByXmlCallback('admin_edit_do_grade_data');
+       doGenericXmlTemplateCallback('admin_edit_do_grade_data');
 } elseif (isFormSent('delete')) {
        // Show entries for deletion
-       showEntriesByXmlCallback('admin_delete_show_grade_data');
+       doGenericXmlTemplateCallback('admin_delete_show_grade_data');
 
        // Do not show the list of URLs after this template
        $show = FALSE;
 } elseif (isFormSent('do_delete')) {
        // Remove entries from database
-       showEntriesByXmlCallback('admin_delete_do_grade_data');
+       doGenericXmlTemplateCallback('admin_delete_do_grade_data');
 }
 
 // Show entries?
@@ -89,7 +89,7 @@ if ($show === FALSE) {
 } // END - if
 
 // List all URLs
-showEntriesByXmlCallback('admin_list_grade_data');
+doGenericXmlTemplateCallback('admin_list_grade_data');
 
 // Add form for adding new entry
 loadTemplate('admin_add_grade_data');
index e9788a830eb69f818d1dea17ff4780d0a43b45f8..c954fa448141d9240625a345035f767c1e4ab6d8 100644 (file)
@@ -48,11 +48,11 @@ if (isGetRequestElementSet('userid')) {
        // Delete entries?
        if (isFormSent('do_delete')) {
                // Remove entries from database
-               showEntriesByXmlCallback('admin_delete_do_nickname_history');
+               doGenericXmlTemplateCallback('admin_delete_do_nickname_history');
        } // END - if
 
        // List all entries per user
-       showEntriesByXmlCallback('admin_list_nickname_history', array(
+       doGenericXmlTemplateCallback('admin_list_nickname_history', array(
                'userid' => bigintval(getRequestElement('userid'))
        ));
 } else {
index a605653754b0cb0b4ab022ec051bcaf9bb937e59..ab31e813f048be28447549325f21e97b70c0d867 100644 (file)
@@ -67,22 +67,22 @@ if (isFormSent('add')) {
        }
 } elseif (isFormSent('edit')) {
        // Show only custom entries for editing
-       showEntriesByXmlCallback('admin_edit_show_point_accounts');
+       doGenericXmlTemplateCallback('admin_edit_show_point_accounts');
 
        // Do not show the list of URLs after this template
        $show = FALSE;
 } elseif (isFormSent('do_edit')) {
        // Change data of only custom entries
-       showEntriesByXmlCallback('admin_edit_do_point_accounts');
+       doGenericXmlTemplateCallback('admin_edit_do_point_accounts');
 } elseif ((isFormSent('delete')) && (ifPointsAccountTypeMatchesPost('CUSTOM'))) {
        // Show only custom entries for deleting
-       showEntriesByXmlCallback('admin_delete_show_point_accounts');
+       doGenericXmlTemplateCallback('admin_delete_show_point_accounts');
 
        // Do not show the list of URLs after this template
        $show = FALSE;
 } elseif ((isFormSent('do_delete')) && (ifPointsAccountTypeMatchesPost('CUSTOM'))) {
        // Remove only custom entries
-       showEntriesByXmlCallback('admin_delete_do_point_accounts');
+       doGenericXmlTemplateCallback('admin_delete_do_point_accounts');
 }
 
 // Show entries?
@@ -92,7 +92,7 @@ if ($show === FALSE) {
 } // END - if
 
 // List all campaigns
-showEntriesByXmlCallback('admin_list_point_accounts');
+doGenericXmlTemplateCallback('admin_list_point_accounts');
 
 // Display form for adding a forced-ad
 loadTemplate('admin_add_point_accounts');
index 53a6e68b5cacd7c7118a7f708b8d2e8510fca113..87f664c3c499b932b234abbeb74d29672103ae26 100644 (file)
@@ -49,13 +49,13 @@ $show = TRUE;
 // Edit or delete button hit?
 if (isFormSent('edit')) {
        // Show entries for editing
-       showEntriesByXmlCallback('admin_edit_show_surfbar_actions');
+       doGenericXmlTemplateCallback('admin_edit_show_surfbar_actions');
 
        // Do not show the list of URLs after this template
        $show = FALSE;
 } elseif (isFormSent('do_edit')) {
        // Change data of entries
-       showEntriesByXmlCallback('admin_edit_do_surfbar_actions');
+       doGenericXmlTemplateCallback('admin_edit_do_surfbar_actions');
 }
 
 // Show entries?
@@ -65,7 +65,7 @@ if ($show === FALSE) {
 } // END - if
 
 // List all URLs
-showEntriesByXmlCallback('admin_list_surfbar_actions');
+doGenericXmlTemplateCallback('admin_list_surfbar_actions');
 
 // [EOF]
 ?>
index 02943e89dfcc1dd9e1741000d968fb91a517ee96..f97717706c6db10ec0f7ef03e113271805263c94 100644 (file)
@@ -58,40 +58,40 @@ if ((countRequestPost() > 0) && (!ifPostContainsSelections('url_id'))) {
 // Edit or delete button hit?
 if (isFormSent('edit')) {
        // Show entries for editing
-       showEntriesByXmlCallback('admin_edit_show_surfbar_urls');
+       doGenericXmlTemplateCallback('admin_edit_show_surfbar_urls');
 
        // Do not show the list of URLs after this template
        $show = FALSE;
 } elseif (isFormSent('do_edit')) {
        // Change data of entries
-       showEntriesByXmlCallback('admin_edit_do_surfbar_urls');
+       doGenericXmlTemplateCallback('admin_edit_do_surfbar_urls');
 } elseif (isFormSent('delete')) {
        // Show entries for deletion
-       showEntriesByXmlCallback('admin_delete_show_surfbar_urls');
+       doGenericXmlTemplateCallback('admin_delete_show_surfbar_urls');
 
        // Do not show the list of URLs after this template
        $show = FALSE;
 } elseif (isFormSent('do_delete')) {
        // Remove entries from database
-       showEntriesByXmlCallback('admin_delete_do_surfbar_urls');
+       doGenericXmlTemplateCallback('admin_delete_do_surfbar_urls');
 } elseif (isFormSent('lock')) {
        // Un-/lock selected URLs. This does not work for pending URLs
-       showEntriesByXmlCallback('admin_lock_show_surfbar_urls');
+       doGenericXmlTemplateCallback('admin_lock_show_surfbar_urls');
 
        // Do not show the list of URLs after this template
        $show = FALSE;
 } elseif (isFormSent('do_lock')) {
        // Un-/lock selected URLs. This does not work for pending URLs
-       showEntriesByXmlCallback('admin_lock_do_surfbar_urls');
+       doGenericXmlTemplateCallback('admin_lock_do_surfbar_urls');
 } elseif (isFormSent('undelete')) {
        // Undelete selected URLs. This does only work for deleted URLs... ;-)
-       showEntriesByXmlCallback('admin_undelete_show_surfbar_urls');
+       doGenericXmlTemplateCallback('admin_undelete_show_surfbar_urls');
 
        // Do not show the list of URLs after this template
        $show = FALSE;
 } elseif (isFormSent('do_undelete')) {
        // Undelete selected URLs. This does only work for deleted URLs... ;-)
-       showEntriesByXmlCallback('admin_undelete_do_surfbar_urls');
+       doGenericXmlTemplateCallback('admin_undelete_do_surfbar_urls');
 }
 
 // Show entries?
@@ -101,7 +101,7 @@ if ($show === FALSE) {
 } // END - if
 
 // List all URLs
-showEntriesByXmlCallback('admin_list_surfbar_urls');
+doGenericXmlTemplateCallback('admin_list_surfbar_urls');
 
 // [EOF]
 ?>
index 4249f2785195019e84264f8b8c21f1d153060708..d655ed3d7c50598c3217bcbf8125b8ae38d88a1f 100644 (file)
@@ -58,25 +58,25 @@ if ((countRequestPost() > 0) && (!ifPostContainsSelections('id')) && (!ifPostCon
 // Edit or delete button hit?
 if (isFormSent('edit')) {
        // Show entries for editing
-       showEntriesByXmlCallback('admin_edit_show_user_subid');
+       doGenericXmlTemplateCallback('admin_edit_show_user_subid');
 
        // Do not show the list of URLs after this template
        $show = FALSE;
 } elseif (isFormSent('do_edit')) {
        // Change data of entries
-       showEntriesByXmlCallback('admin_edit_do_user_subid');
+       doGenericXmlTemplateCallback('admin_edit_do_user_subid');
 } elseif (isFormSent('delete')) {
        // Show entries for deletion
-       showEntriesByXmlCallback('admin_delete_show_user_subid');
+       doGenericXmlTemplateCallback('admin_delete_show_user_subid');
 
        // Do not show the list of URLs after this template
        $show = FALSE;
 } elseif (isFormSent('do_delete')) {
        // Remove entries from database
-       showEntriesByXmlCallback('admin_delete_do_user_subid');
+       doGenericXmlTemplateCallback('admin_delete_do_user_subid');
 } elseif (isFormSent('do_delete_stats')) {
        // Remove entries from database
-       showEntriesByXmlCallback('admin_delete_do_user_subid_stats');
+       doGenericXmlTemplateCallback('admin_delete_do_user_subid_stats');
 } elseif ((isGetRequestElementSet('do')) && (isGetRequestElementSet('id'))) {
        // Construct module name
        $incFile = sprintf("inc/modules/admin/subid-%s.php", SQL_ESCAPE(getRequestElement('do')));
@@ -106,7 +106,7 @@ if ($show === FALSE) {
 // Is a user id sent?
 if (isGetRequestElementSet('userid')) {
        // List all sub ids
-       showEntriesByXmlCallback('admin_list_user_subid', array(
+       doGenericXmlTemplateCallback('admin_list_user_subid', array(
                'userid' => bigintval(getRequestElement('userid'))
        ));
 } else {
index ba10c41ae6a04b4dd70217b9574796a7572b8f8b..426ffb1af4d511cdc159d5f642a29882661dac2d 100644 (file)
@@ -65,7 +65,7 @@ if ((isPostRequestElementSet('unlock')) && (ifPostContainsSelections('url_id')))
 }
 
 // List all pendingURLs
-showEntriesByXmlCallback('admin_unlock_surfbar_urls');
+doGenericXmlTemplateCallback('admin_unlock_surfbar_urls');
 
 // [EOF]
 ?>
index 92a8083ef572e68b2f03546bde743152a380b5c4..52be5159c233a6e15e43f3d7e282bea24f77c196 100644 (file)
@@ -45,7 +45,7 @@ if (!defined('__SECURITY')) {
 }
 
 // List all entries
-showEntriesByXmlCallback('member_list_subid_stats');
+doGenericXmlTemplateCallback('member_list_subid_stats');
 
 // [EOF]
 ?>
index 7bae72887b191e0504fc408c5c10a7b31eaba8d7..24bd87bf9d3f959d50206f84d5a7d7ac0ca36136 100644 (file)
@@ -52,7 +52,7 @@ if ((!isExtensionActive('booking')) && (!isAdmin())) {
 } // END - if
 
 // Load XML template
-showEntriesByXmlCallback('member_list_booking');
+doGenericXmlTemplateCallback('member_list_booking');
 
 // [EOF]
 ?>
index 1a92045be5b57b51d4c9a93a45556f2f93941aab..8fd6b2a2e4d366c6e706d13f674773a1c8caa333 100644 (file)
@@ -70,25 +70,25 @@ if ((countRequestPost('id') > 0) && (!isFormSent('add_subid')) && ((!ifPostConta
 // Edit or delete button hit?
 if (isFormSent('add_subid')) {
        // Add new sub id
-       showEntriesByXmlCallback('member_add_do_user_subid');
+       doGenericXmlTemplateCallback('member_add_do_user_subid');
 } elseif (isFormSent('edit')) {
        // Show entries for editing
-       showEntriesByXmlCallback('member_edit_show_user_subid');
+       doGenericXmlTemplateCallback('member_edit_show_user_subid');
 
        // Do not show the list of URLs after this template
        $show = FALSE;
 } elseif (isFormSent('do_edit')) {
        // Change data of entries
-       showEntriesByXmlCallback('member_edit_do_user_subid');
+       doGenericXmlTemplateCallback('member_edit_do_user_subid');
 } elseif (isFormSent('delete')) {
        // Show entries for deletion
-       showEntriesByXmlCallback('member_delete_show_user_subid');
+       doGenericXmlTemplateCallback('member_delete_show_user_subid');
 
        // Do not show the list of URLs after this template
        $show = FALSE;
 } elseif (isFormSent('do_delete')) {
        // Remove entries from database
-       showEntriesByXmlCallback('member_delete_do_user_subid');
+       doGenericXmlTemplateCallback('member_delete_do_user_subid');
 } elseif ((isGetRequestElementSet('do')) && (isGetRequestElementSet('id'))) {
        // Construct module name
        $incFile = sprintf("inc/modules/member/subid-%s.php", SQL_ESCAPE(getRequestElement('do')));
@@ -116,7 +116,7 @@ if ($show === FALSE) {
 } // END - if
 
 // List all campaigns
-showEntriesByXmlCallback('member_list_subid');
+doGenericXmlTemplateCallback('member_list_subid');
 
 // Display form for adding a sub id
 loadTemplate('member_add_subid');
index 0d487f4e5b42710f43ea0ab223f600acf98b3a8d..f62de6a6e8d1d59adaee34c4a6709b880d0424e4 100644 (file)
@@ -56,7 +56,7 @@ function initXml () {
 }
 
 // Calls back a function based on given XML template data
-function showEntriesByXmlCallback ($template, $content = array(), $compileCode = TRUE) {
+function doGenericXmlTemplateCallback ($template, $content = array(), $compileCode = TRUE) {
        // Init XML system as sch calls will be only used once per run
        initXml();
 
index c5e77728201bc037fc700c68e6da72ddfc0afaae..e0a9af79feeefb45b33d582a66db716526d06ba2 100644 (file)
@@ -99,7 +99,7 @@ MA  02110-1301  USA
                        <!--
                        The actual data, again.
                        //-->
-                       <column-callback-data type="string" value="grade_parent_id" callback="generateAdminGradeSelectionBox" />
+                       <column-callback-data type="string" value="grade_parent_id" callback="generateAdminGradeDataSelectionBox" />
                        <!--
                        More parameters, remember that the first parameter is always given
                        and that it is the data from column.