Call-back function names shortened, __FUNCTION__ used:

- All call-back function names in ext-network shortened, they were to long
- __FUNCTION__ used now in all (except security_functions.php) function
  libraries

diff --git a/inc/libs/mailid_functions.php b/inc/libs/mailid_functions.php
index 79651ffa017284112afa7e66b20d2d6d72844725..2c64c4f991642c58c6282078688f17df0b76dc79 100644 (file)
--- a/inc/libs/mailid_functions.php
+++ b/inc/libs/mailid_functions.php
@@ -63,7 +63,7 @@ function handleMailIdErrorCode ($errorCode) {
                                break;
 
                        default:
-                               logDebugMessage(__FILE__, __LINE__, sprintf("Unknown status %s detected in mailid_error_redirect.", getConfig('mailid_error_redirect')));
+                               logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown status %s detected in mailid_error_redirect.", getConfig('mailid_error_redirect')));
                                redirectToUrl('modules.php?module=index&code=' . getCode('UNKNOWN_STATUS') . '&ext=mailid');
                                break;
                } // END - switch

diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php
index d8fbacec8ce99412d202b9083ce45e655847bd12..7d0a942560423d5fc4b4a3fd295b5caf4b88654b 100644 (file)
--- a/inc/libs/network_functions.php
+++ b/inc/libs/network_functions.php
@@ -81,7 +81,7 @@ function doAdminNetworkProcessForm () {
        }
 
        // Create function name
-       $functionName = sprintf("doAdminNetworkProcess%sForm", capitalizeUnderscoreString(getRequestParameter('do')));
+       $functionName = sprintf("doAdminNetworkProcess%s", capitalizeUnderscoreString(getRequestParameter('do')));
 
        // Is the function valid?
        if (!function_exists($functionName)) {
@@ -623,7 +623,7 @@ function translateNetworkRequestType ($name) {
 //------------------------------------------------------------------------------
 
 // Callback function to add new network
-function doAdminNetworkProcessAddNetworkForm () {
+function doAdminNetworkProcessAddNetwork () {
        // We can say here, the form is sent, so check if the network is already added
        if (isNetworkNameValid(postRequestParameter('network_short_name'))) {
                // Already there
@@ -657,7 +657,7 @@ function doAdminNetworkProcessAddNetworkForm () {
 }
 
 // Displays selected networks for editing
-function doAdminNetworkProcessHandleNetworkForm () {
+function doAdminNetworkProcessHandleNetwork () {
        // Do we have selections?
        if (ifPostContainsSelections()) {
                // Something has been selected, so start displaying one by one
@@ -706,7 +706,7 @@ function doAdminNetworkProcessHandleNetworkForm () {
 }
 
 // Handle network type form
-function doAdminNetworkProcessHandleNetworkTypeForm () {
+function doAdminNetworkProcessHandleNetworkType () {
        // Do we have selections?
        if (ifPostContainsSelections()) {
                // Load network data
@@ -758,7 +758,7 @@ function doAdminNetworkProcessHandleNetworkTypeForm () {
 }
 
 // Handle network request parameter form
-function doAdminNetworkProcessHandleRequestParamsForm () {
+function doAdminNetworkProcessHandleRequestParams () {
        // Do we have selections?
        if (ifPostContainsSelections()) {
                // Init cache array
@@ -816,7 +816,7 @@ function doAdminNetworkProcessHandleRequestParamsForm () {
 }
 
 // Changes given networks
-function doAdminNetworkProcessChangeNetworkForm () {
+function doAdminNetworkProcessChangeNetwork () {
        // Do we have selections?
        if (ifPostContainsSelections()) {
                // By default nothing is updated
@@ -861,7 +861,7 @@ function doAdminNetworkProcessChangeNetworkForm () {
 }
 
 // Removes given networks
-function doAdminNetworkProcessRemoveNetworkForm () {
+function doAdminNetworkProcessRemoveNetwork () {
        // Do we have selections?
        if (ifPostContainsSelections()) {
                // By default nothing is removed
@@ -888,7 +888,7 @@ function doAdminNetworkProcessRemoveNetworkForm () {
 }
 
 // Add a network type handler if not yet found
-function doAdminNetworkProcessAddNetworkTypeForm () {
+function doAdminNetworkProcessAddNetworkType () {
        // Is the network type handle already used with given network?
        if (isNetworkTypeHandleValid(postRequestParameter('network_type_handle'), getRequestParameter('network'))) {
                // Already added
@@ -930,7 +930,7 @@ function doAdminNetworkProcessAddNetworkTypeForm () {
 }
 
 // Changes given network type handlers
-function doAdminNetworkProcessChangeNetworkTypeForm () {
+function doAdminNetworkProcessChangeNetworkType () {
        // Do we have selections?
        if (ifPostContainsSelections()) {
                // By default nothing is updated
@@ -981,7 +981,7 @@ function doAdminNetworkProcessChangeNetworkTypeForm () {
 }
 
 // Changes given network request parameters
-function doAdminNetworkProcessChangeNetworkParamForm () {
+function doAdminNetworkProcessChangeNetworkParam () {
        // Do we have selections?
        if (ifPostContainsSelections()) {
                // By default nothing is updated
@@ -1032,7 +1032,7 @@ function doAdminNetworkProcessChangeNetworkParamForm () {
 }
 
 // Removes given network type handlers
-function doAdminNetworkProcessRemoveNetworkTypeForm () {
+function doAdminNetworkProcessRemoveNetworkType () {
        // Do we have selections?
        if (ifPostContainsSelections()) {
                // By default nothing is removed
@@ -1059,7 +1059,7 @@ function doAdminNetworkProcessRemoveNetworkTypeForm () {
 }
 
 // Removes given network request parameters
-function doAdminNetworkProcessRemoveNetworkParamForm () {
+function doAdminNetworkProcessRemoveNetworkParam () {
        // Do we have selections?
        if (ifPostContainsSelections()) {
                // By default nothing is removed
@@ -1086,7 +1086,7 @@ function doAdminNetworkProcessRemoveNetworkParamForm () {
 }
 
 // Adds a request parameter to given network and type
-function doAdminNetworkProcessAddNetworkParamForm () {
+function doAdminNetworkProcessAddNetworkParam () {
        // Is the request parameter already used with given network?
        if (isNetworkRequestParameterValid(postRequestParameter('request_param_key'), postRequestParameter('network_type_id'), getRequestParameter('network'))) {
                // Already added

diff --git a/inc/libs/sponsor_functions.php b/inc/libs/sponsor_functions.php
index 07970d3a29526bb4b2e861968a104b5deb190a7b..d038b478e4208511ff02bde915820d4ef2fdd4a1 100644 (file)
--- a/inc/libs/sponsor_functions.php
+++ b/inc/libs/sponsor_functions.php
@@ -569,7 +569,7 @@ function doProcessSponsorFormRequest ($messageArray = array()) {
                case 'added': // Sponsor successfully added with account status = UNCONFIRMED!
                        // Check for his id number
                        $result = SQL_QUERY_ESC("SELECT `id`, `hash` FROM `{?_MYSQL_PREFIX?}_sponsor_data` WHERE `email`='%s' LIMIT 1",
-                               array(postRequestParameter('email')), __FILE__, __LINE__);
+                               array(postRequestParameter('email')), __FUNCTION__, __LINE__);
                        if (SQL_NUMROWS($result) == 1) {
                                // id found so let's load it for the confirmation email
                                list($id, $hash) = SQL_FETCHROW($result);
@@ -602,7 +602,7 @@ function doProcessSponsorFormRequest ($messageArray = array()) {
                        break;
 
                default:
-                       logDebugMessage(__FILE__, __LINE__, sprintf("Unknown status %s detected.", $status));
+                       logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown status %s detected.", $status));
                        if (!isAdmin()) {
                                // Message for testing admin
                                $message = getMaskedMessage('ADMIN_SPONSOR_UNKNOWN_STATUS', $status);

diff --git a/templates/de/html/admin/admin_list_beg.tpl b/templates/de/html/admin/admin_list_beg.tpl
index f047babd7931cf74e367d6d1cd4121834cc6f3b4..1932d95dbe910753a4bece9818d57592a2c86b62 100644 (file)
--- a/templates/de/html/admin/admin_list_beg.tpl
+++ b/templates/de/html/admin/admin_list_beg.tpl
@@ -26,7 +26,9 @@
                <td class="header_column bottom right">
                        <u>$content[total] {?POINTS?}</u>
                </td>
-               <td class="header_column bottom">&nbsp;</td>
+               <td class="header_column bottom">
+                       &nbsp;
+               </td>
        </tr>
        <tr>
                <td colspan="5" align="center">