From f97544ccd404280919e2d08a9e4a19e61167277f Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Mon, 22 Oct 2012 19:13:54 +0000
Subject: [PATCH] Renamed showEntriesByXmlCallback() to
doGenericXmlTemplateCallback() as it is no longer for only showing entries,
it has become a generic XML call-back system
---
inc/modules/admin/subid-stats.php | 2 +-
inc/modules/admin/what-list_ | 18 +++++++++---------
inc/modules/admin/what-list_booking.php | 4 ++--
inc/modules/admin/what-list_forced_ads.php | 12 ++++++------
.../admin/what-list_forced_campaigns.php | 16 ++++++++--------
inc/modules/admin/what-list_forced_costs.php | 12 ++++++------
inc/modules/admin/what-list_grade_data.php | 12 ++++++------
inc/modules/admin/what-list_nickname.php | 4 ++--
inc/modules/admin/what-list_point_accounts.php | 10 +++++-----
.../admin/what-list_surfbar_actions.php | 6 +++---
inc/modules/admin/what-list_surfbar_urls.php | 18 +++++++++---------
inc/modules/admin/what-list_user_subid.php | 12 ++++++------
inc/modules/admin/what-unlock_surfbar_urls.php | 2 +-
inc/modules/member/subid-stats.php | 2 +-
inc/modules/member/what-booking.php | 2 +-
inc/modules/member/what-subids.php | 12 ++++++------
inc/xml-functions.php | 2 +-
templates/xml/admin/admin_list_grade_data.xml | 2 +-
18 files changed, 74 insertions(+), 74 deletions(-)
diff --git a/inc/modules/admin/subid-stats.php b/inc/modules/admin/subid-stats.php
index d8c9b278bc..3891d32aa6 100644
--- a/inc/modules/admin/subid-stats.php
+++ b/inc/modules/admin/subid-stats.php
@@ -43,7 +43,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
}
// List all entries
-showEntriesByXmlCallback('admin_list_user_subid_stats');
+doGenericXmlTemplateCallback('admin_list_user_subid_stats');
// [EOF]
?>
diff --git a/inc/modules/admin/what-list_ b/inc/modules/admin/what-list_
index c18d48e917..2f0c155696 100644
--- a/inc/modules/admin/what-list_
+++ b/inc/modules/admin/what-list_
@@ -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]
?>
diff --git a/inc/modules/admin/what-list_booking.php b/inc/modules/admin/what-list_booking.php
index ad99c5009b..731f1602ee 100644
--- a/inc/modules/admin/what-list_booking.php
+++ b/inc/modules/admin/what-list_booking.php
@@ -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 {
diff --git a/inc/modules/admin/what-list_forced_ads.php b/inc/modules/admin/what-list_forced_ads.php
index 4771a77db5..498e3d44fe 100644
--- a/inc/modules/admin/what-list_forced_ads.php
+++ b/inc/modules/admin/what-list_forced_ads.php
@@ -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');
diff --git a/inc/modules/admin/what-list_forced_campaigns.php b/inc/modules/admin/what-list_forced_campaigns.php
index 50949df580..811cee8592 100644
--- a/inc/modules/admin/what-list_forced_campaigns.php
+++ b/inc/modules/admin/what-list_forced_campaigns.php
@@ -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(
diff --git a/inc/modules/admin/what-list_forced_costs.php b/inc/modules/admin/what-list_forced_costs.php
index e4f3ae4406..a687179bd4 100644
--- a/inc/modules/admin/what-list_forced_costs.php
+++ b/inc/modules/admin/what-list_forced_costs.php
@@ -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');
diff --git a/inc/modules/admin/what-list_grade_data.php b/inc/modules/admin/what-list_grade_data.php
index 154cae1522..e7065423e7 100644
--- a/inc/modules/admin/what-list_grade_data.php
+++ b/inc/modules/admin/what-list_grade_data.php
@@ -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');
diff --git a/inc/modules/admin/what-list_nickname.php b/inc/modules/admin/what-list_nickname.php
index e9788a830e..c954fa4481 100644
--- a/inc/modules/admin/what-list_nickname.php
+++ b/inc/modules/admin/what-list_nickname.php
@@ -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 {
diff --git a/inc/modules/admin/what-list_point_accounts.php b/inc/modules/admin/what-list_point_accounts.php
index a605653754..ab31e813f0 100644
--- a/inc/modules/admin/what-list_point_accounts.php
+++ b/inc/modules/admin/what-list_point_accounts.php
@@ -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');
diff --git a/inc/modules/admin/what-list_surfbar_actions.php b/inc/modules/admin/what-list_surfbar_actions.php
index 53a6e68b5c..87f664c3c4 100644
--- a/inc/modules/admin/what-list_surfbar_actions.php
+++ b/inc/modules/admin/what-list_surfbar_actions.php
@@ -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]
?>
diff --git a/inc/modules/admin/what-list_surfbar_urls.php b/inc/modules/admin/what-list_surfbar_urls.php
index 02943e89df..f97717706c 100644
--- a/inc/modules/admin/what-list_surfbar_urls.php
+++ b/inc/modules/admin/what-list_surfbar_urls.php
@@ -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]
?>
diff --git a/inc/modules/admin/what-list_user_subid.php b/inc/modules/admin/what-list_user_subid.php
index 4249f27851..d655ed3d7c 100644
--- a/inc/modules/admin/what-list_user_subid.php
+++ b/inc/modules/admin/what-list_user_subid.php
@@ -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 {
diff --git a/inc/modules/admin/what-unlock_surfbar_urls.php b/inc/modules/admin/what-unlock_surfbar_urls.php
index ba10c41ae6..426ffb1af4 100644
--- a/inc/modules/admin/what-unlock_surfbar_urls.php
+++ b/inc/modules/admin/what-unlock_surfbar_urls.php
@@ -65,7 +65,7 @@ if ((isPostRequestElementSet('unlock')) && (ifPostContainsSelections('url_id')))
}
// List all pendingURLs
-showEntriesByXmlCallback('admin_unlock_surfbar_urls');
+doGenericXmlTemplateCallback('admin_unlock_surfbar_urls');
// [EOF]
?>
diff --git a/inc/modules/member/subid-stats.php b/inc/modules/member/subid-stats.php
index 92a8083ef5..52be5159c2 100644
--- a/inc/modules/member/subid-stats.php
+++ b/inc/modules/member/subid-stats.php
@@ -45,7 +45,7 @@ if (!defined('__SECURITY')) {
}
// List all entries
-showEntriesByXmlCallback('member_list_subid_stats');
+doGenericXmlTemplateCallback('member_list_subid_stats');
// [EOF]
?>
diff --git a/inc/modules/member/what-booking.php b/inc/modules/member/what-booking.php
index 7bae72887b..24bd87bf9d 100644
--- a/inc/modules/member/what-booking.php
+++ b/inc/modules/member/what-booking.php
@@ -52,7 +52,7 @@ if ((!isExtensionActive('booking')) && (!isAdmin())) {
} // END - if
// Load XML template
-showEntriesByXmlCallback('member_list_booking');
+doGenericXmlTemplateCallback('member_list_booking');
// [EOF]
?>
diff --git a/inc/modules/member/what-subids.php b/inc/modules/member/what-subids.php
index 1a92045be5..8fd6b2a2e4 100644
--- a/inc/modules/member/what-subids.php
+++ b/inc/modules/member/what-subids.php
@@ -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');
diff --git a/inc/xml-functions.php b/inc/xml-functions.php
index 0d487f4e5b..f62de6a6e8 100644
--- a/inc/xml-functions.php
+++ b/inc/xml-functions.php
@@ -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();
diff --git a/templates/xml/admin/admin_list_grade_data.xml b/templates/xml/admin/admin_list_grade_data.xml
index c5e7772820..e0a9af79fe 100644
--- a/templates/xml/admin/admin_list_grade_data.xml
+++ b/templates/xml/admin/admin_list_grade_data.xml
@@ -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.
--
2.39.5