Extension ext-surfbar continued, fixes:

[mailer.git] / inc / libs / network_functions.php

diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php
index a938ec8140b5bde2ea28640ec77833c660fb2a8e..3895fd794997ae74fcd2a91ea82a693d2325c532 100644 (file)
--- a/inc/libs/network_functions.php
+++ b/inc/libs/network_functions.php
@@ -53,7 +53,7 @@ function getCurrentNetworkId () {
 // Handle a (maybe) sent form here
 function doNetworkHandleForm () {
        // Was the form sent?
-       if ((isFormSent()) || (isFormSent('edit')) || (isFormSent('delete')) || (isFormSent('change')) || (isFormSent('remove'))) {
+       if ((isFormSent()) || (isFormSent('edit')) || (isFormSent('delete')) || (isFormSent('do_edit')) || (isFormSent('do_delete'))) {
                // Do we have a 'do'?
                if (isGetRequestParameterSet('do')) {
                        // Process the request
@@ -68,7 +68,7 @@ function doNetworkHandleForm () {
 // Processes an admin form
 function doAdminNetworkProcessForm () {
        // Form really sent?
-       if ((!isFormSent()) && (!isFormSent('edit')) && (!isFormSent('delete')) && (!isFormSent('change')) && (!isFormSent('remove'))) {
+       if ((!isFormSent()) && (!isFormSent('edit')) && (!isFormSent('delete')) && (!isFormSent('do_edit')) && (!isFormSent('do_delete'))) {
                // Abort here
                loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_FORM_NOT_SENT--}');
                return;
@@ -677,25 +677,25 @@ function generateNetworkActiveOptions ($default = '') {
 // Translates 'translate_name' for e.g. templates
 function translateNetworkTranslationName ($name) {
        // Get the message id
-       return getMessage('ADMIN_NETWORK_TRANSLATE_' . strtoupper($name) . '_NAME');
+       return '{--ADMIN_NETWORK_TRANSLATE_' . strtoupper($name) . '_NAME--}';
 }
 
 // Translates the network type handler (e.g. banner, paidmail) for templates
 function translateNetworkTypeHandler ($type) {
        // Get the message id
-       return getMessage('ADMIN_NETWORK_TYPES_' . strtoupper($type) . '');
+       return '{--ADMIN_NETWORK_TYPES_' . strtoupper($type) . '--}';
 }
 
 // Translates request type
 function translateNetworkRequestType ($type) {
        // Get the message id
-       return getMessage('ADMIN_NETWORK_REQUEST_TYPE_' . strtoupper($type) . '');
+       return '{--ADMIN_NETWORK_REQUEST_TYPE_' . strtoupper($type) . '--}';
 }
 
 // Translates request parameter
 function translateNetworkRequestParameter ($param) {
        // Get the message id
-       return getMessage('ADMIN_NETWORK_REQUEST_PARAMETER_' . strtoupper($param) . '');
+       return '{--ADMIN_NETWORK_REQUEST_PARAMETER_' . strtoupper($param) . '--}';
 }
 
 // Translates API index
@@ -752,7 +752,7 @@ 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
-               loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_NETWORK_ALREADY_ADDED', postRequestParameter('network_short_name')));
+               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_ALREADY_ADDED=' . postRequestParameter('network_short_name') . '%}');
                return false;
        } // END - if
 
@@ -777,7 +777,7 @@ function doAdminNetworkProcessAddNetwork () {
                loadTemplate('admin_network_added', false, postRequestArray());
        } else {
                // Not added
-               loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_NETWORK_DATA_NOT_ADDED', postRequestParameter('network_short_name')));
+               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_DATA_NOT_ADDED=' . postRequestParameter('network_short_name') . '%}');
        }
 }
 
@@ -977,7 +977,7 @@ function doAdminNetworkProcessChangeNetwork () {
                // Do we have updates?
                if ($updated > 0) {
                        // Updates done
-                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_UPDATED', $updated));
+                       displayMessage('{%message,ADMIN_NETWORK_UPDATED=' . $updated . '%}');
                } else {
                        // Nothing changed
                        loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_NOTHING_CHANGED--}');
@@ -1004,7 +1004,7 @@ function doAdminNetworkProcessRemoveNetwork () {
                // Do we have removes?
                if ($removed > 0) {
                        // Removals done
-                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_REMOVED', $removed));
+                       displayMessage('{%message,ADMIN_NETWORK_REMOVED=' . $removed . '%}');
                } else {
                        // Nothing removed
                        loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_NOTHING_REMOVED--}');
@@ -1017,7 +1017,7 @@ function doAdminNetworkProcessAddNetworkType () {
        // Is the network type handle already used with given network?
        if (isNetworkTypeHandleValid(postRequestParameter('network_type_handle'), getRequestParameter('network'))) {
                // Already added
-               loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_NETWORK_TYPES_HANDLE_ALREADY_ADDED', postRequestParameter('network_type_handle')));
+               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_TYPES_HANDLE_ALREADY_ADDED=' . postRequestParameter('network_type_handle') . '%}');
 
                // ... so abort here
                return false;
@@ -1050,7 +1050,7 @@ function doAdminNetworkProcessAddNetworkType () {
                loadTemplate('admin_network_type_added', false, postRequestArray());
        } else {
                // Not added
-               loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_NETWORK_TYPES_NOT_ADDED', postRequestParameter('network_type_handle')));
+               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_TYPES_NOT_ADDED=' . postRequestParameter('network_type_handle') . '%}');
        }
 }
 
@@ -1097,7 +1097,7 @@ function doAdminNetworkProcessChangeNetworkType () {
                // Do we have updates?
                if ($updated > 0) {
                        // Updates done
-                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_TYPES_UPDATED', $updated));
+                       displayMessage('{%message,ADMIN_NETWORK_TYPES_UPDATED=' . $updated . '%}');
                } else {
                        // Nothing changed
                        loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_TYPES_NOTHING_CHANGED--}');
@@ -1148,7 +1148,7 @@ function doAdminNetworkProcessChangeNetworkParam () {
                // Do we have updates?
                if ($updated > 0) {
                        // Updates done
-                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_REQUEST_PARAMETER_UPDATED', $updated));
+                       displayMessage('{%message,ADMIN_NETWORK_REQUEST_PARAMETER_UPDATED=' . $updated . '%}');
                } else {
                        // Nothing changed
                        loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_CHANGED--}');
@@ -1175,7 +1175,7 @@ function doAdminNetworkProcessRemoveNetworkType () {
                // Do we have removes?
                if ($removed > 0) {
                        // Removals done
-                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_TYPES_REMOVED', $removed));
+                       displayMessage('{%message,ADMIN_NETWORK_TYPES_REMOVED=' . $removed . '%}');
                } else {
                        // Nothing removed
                        loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_TYPES_NOTHING_REMOVED--}');
@@ -1202,7 +1202,7 @@ function doAdminNetworkProcessRemoveNetworkParam () {
                // Do we have removes?
                if ($removed > 0) {
                        // Removals done
-                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_REQUEST_PARAMETER_REMOVED', $removed));
+                       displayMessage('{%message,ADMIN_NETWORK_REQUEST_PARAMETER_REMOVED=' . $removed . '%}');
                } else {
                        // Nothing removed
                        loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_REMOVED--}');
@@ -1215,7 +1215,7 @@ 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
-               loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_NETWORK_REQUEST_PARAMETER_ALREADY_ADDED', postRequestParameter('request_param_key')));
+               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_REQUEST_PARAMETER_ALREADY_ADDED=' . postRequestParameter('request_param_key') . '%}');
 
                // ... so abort here
                return false;
@@ -1248,7 +1248,7 @@ function doAdminNetworkProcessAddNetworkParam () {
                loadTemplate('admin_network_request_param_added', false, postRequestArray());
        } else {
                // Not added
-               loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_NETWORK_REQUEST_PARAMETER_NOT_ADDED', postRequestParameter('request_param_key')));
+               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_REQUEST_PARAMETER_NOT_ADDED=' . postRequestParameter('request_param_key') . '%}');
        }
 }
 
@@ -1257,7 +1257,7 @@ function doAdminNetworkProcessAddNetworkApiTranslation () {
        // Is the request parameter already used with given network?
        if (isNetworkApiTranslationValid(postRequestParameter('network_api_index'), postRequestParameter('network_type_id'), getRequestParameter('network'))) {
                // Already added
-               loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_NETWORK_API_TRANSLATION_ALREADY_ADDED', postRequestParameter('network_api_index')));
+               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_API_TRANSLATION_ALREADY_ADDED=' . postRequestParameter('network_api_index') . '%}');
 
                // ... so abort here
                return false;
@@ -1294,7 +1294,7 @@ function doAdminNetworkProcessAddNetworkApiTranslation () {
                loadTemplate('admin_network_api_translation_added', false, postRequestArray());
        } else {
                // Not added
-               loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_NETWORK_API_TRANSLATION_NOT_ADDED', postRequestParameter('network_api_index')));
+               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_API_TRANSLATION_NOT_ADDED=' . postRequestParameter('network_api_index') . '%}');
        }
 }