Several fixes/improvements:

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

diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php
index cc0309615d75918dec0d5b102e7cd812798266d5..a1797e30ae4d8531a4925e12b7a7606858c5e5aa 100644 (file)
--- a/inc/libs/network_functions.php
+++ b/inc/libs/network_functions.php
@@ -51,7 +51,7 @@ function doNetworkHandleForm () {
                        doAdminNetworkProcessForm();
                } else {
                        // No 'do' found
-                       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NETWORK_DO_404'));
+                       loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_DO_404'));
                }
        } // END - if
 }
@@ -61,11 +61,11 @@ function doAdminNetworkProcessForm () {
        // Form really sent?
        if ((!isFormSent()) && (!isPostRequestParameterSet('edit')) && (!isPostRequestParameterSet('del')) && (!isPostRequestParameterSet('change')) && (!isPostRequestParameterSet('remove'))) {
                // Abort here
-               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NETWORK_FORM_NOT_SENT'));
+               loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_FORM_NOT_SENT'));
                return;
        } elseif (!isGetRequestParameterSet('do')) {
                // No 'do' found
-               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NETWORK_DO_404'));
+               loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_DO_404'));
                return;
        }
 
@@ -239,11 +239,11 @@ function generateAdminNetworkList () {
 
        // Query for all networks
        $result = SQL_QUERY("SELECT
-       `network_id`, `network_title`
+       `network_id`, `network_short_name`, `network_title`
 FROM
        `{?_MYSQL_PREFIX?}_network_data`
 ORDER BY
-       `network_title` ASC", __FILE__, __LINE__);
+       `network_short_name` ASC", __FILE__, __LINE__);
 
        // Do we have entries?
        if (SQL_NUMROWS($result) > 0) {
@@ -255,10 +255,10 @@ ORDER BY
                } // END - while
 
                // Generate the selection box
-               $content = generateSelectionBoxFromArray($rows, 'network', 'network_id', 'network_title');
+               $content = generateSelectionBoxFromArray($rows, 'network', 'network_id');
        } else {
                // Nothing selected
-               $content = loadTemplate('admin_settings_saved', false, getMessage('ADMIN_ENTRIES_404'));
+               $content = loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_ENTRIES_404'));
        }
 
        // Free the result
@@ -277,7 +277,7 @@ function doAdminNetworkProcessAddnetworkForm () {
        // 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_saved', false, getMaskedMessage('ADMIN_NETWORK_ALREADY_ADDED', postRequestParameter('network_short_name')));
+               loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_NETWORK_ALREADY_ADDED', postRequestParameter('network_short_name')));
                return false;
        } // END - if
 
@@ -302,7 +302,7 @@ function doAdminNetworkProcessAddnetworkForm () {
                loadTemplate('admin_network_added', false, postRequestArray());
        } else {
                // Not added
-               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_DATA_NOT_ADDED', postRequestParameter('network_short_name')));
+               loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_NETWORK_DATA_NOT_ADDED', postRequestParameter('network_short_name')));
        }
 }
 
@@ -370,7 +370,7 @@ function doAdminNetworkProcessHandlenetworkForm () {
                        $GLOBALS['network_display'] = false;
                } else {
                        // Nothing selected/found
-                       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NETWORK_NOTHING_FOUND'));
+                       loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_NOTHING_FOUND'));
                }
        } // END - if
 }
@@ -437,7 +437,7 @@ function doAdminNetworkProcessHandlenetworktypeForm () {
                        $GLOBALS['network_display'] = false;
                } else {
                        // Nothing selected/found
-                       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NETWORK_TYPES_NOTHING_FOUND'));
+                       loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_TYPES_NOTHING_FOUND'));
                }
        } // END - if
 }
@@ -482,7 +482,7 @@ function doAdminNetworkProcessChangenetworkForm () {
                        loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_UPDATED', $updated));
                } else {
                        // Nothing changed
-                       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NETWORK_NOTHING_CHANGED'));
+                       loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_NOTHING_CHANGED'));
                }
        } // END - if
 }
@@ -509,7 +509,7 @@ function doAdminNetworkProcessRemovenetworkForm () {
                        loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_REMOVED', $removed));
                } else {
                        // Nothing removed
-                       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NETWORK_NOTHING_REMOVED'));
+                       loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_NOTHING_REMOVED'));
                }
        } // END - if
 }
@@ -519,7 +519,7 @@ function doAdminNetworkProcessAddnetworktypeForm () {
        // Is the network type handle already used with given network?
        if (isNetworkTypeHandleValid(postRequestParameter('network_type_handle'), getRequestParameter('network'))) {
                // Already added
-               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_TYPES_HANDLE_ALREADY_ADDED', postRequestParameter('network_type_handle')));
+               loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_NETWORK_TYPES_HANDLE_ALREADY_ADDED', postRequestParameter('network_type_handle')));
 
                // ... so abort here
                return false;
@@ -531,6 +531,12 @@ function doAdminNetworkProcessAddnetworktypeForm () {
        // Add id
        setPostRequestParameter('network_id', getRequestParameter('network'));
 
+       // Is network_type_banner_url set?
+       if (postRequestParameter('network_type_banner_url') == '') {
+               // Remove empty value to get a NULL for an optional entry
+               unsetPostRequestParameter('network_type_banner_url');
+       } // END - if
+
        // Add the whole request to database
        SQL_QUERY("INSERT INTO
        `{?_MYSQL_PREFIX?}_network_types`
@@ -546,7 +552,7 @@ function doAdminNetworkProcessAddnetworktypeForm () {
                loadTemplate('admin_network_type_added', false, postRequestArray());
        } else {
                // Not added
-               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_TYPES_NOT_ADDED', postRequestParameter('network_type_handle')));
+               loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_NETWORK_TYPES_NOT_ADDED', postRequestParameter('network_type_handle')));
        }
 }
 
@@ -590,7 +596,7 @@ function doAdminNetworkProcessChangenetworktypeForm () {
                        loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_TYPES_UPDATED', $updated));
                } else {
                        // Nothing changed
-                       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NETWORK_TYPES_NOTHING_CHANGED'));
+                       loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_TYPES_NOTHING_CHANGED'));
                }
        } // END - if
 }
@@ -617,7 +623,7 @@ function doAdminNetworkProcessRemovenetworktypeForm () {
                        loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_TYPES_REMOVED', $removed));
                } else {
                        // Nothing removed
-                       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NETWORK_TYPES_NOTHING_REMOVED'));
+                       loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_TYPES_NOTHING_REMOVED'));
                }
        } // END - if
 }
@@ -627,7 +633,7 @@ function doAdminNetworkProcessAddnetworkparamForm () {
        // 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_saved', false, getMaskedMessage('ADMIN_NETWORK_REQUEST_PARAMETER_ALREADY_ADDED', postRequestParameter('request_param_key')));
+               loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_NETWORK_REQUEST_PARAMETER_ALREADY_ADDED', postRequestParameter('request_param_key')));
 
                // ... so abort here
                return false;
@@ -639,6 +645,12 @@ function doAdminNetworkProcessAddnetworkparamForm () {
        // Add id
        setPostRequestParameter('network_id', getRequestParameter('network'));
 
+       // Is request_param_default set?
+       if (postRequestParameter('request_param_default') == '') {
+               // Remove empty value to get a NULL for an optional entry
+               unsetPostRequestParameter('request_param_default');
+       } // END - if
+
        // Add the whole request to database
        SQL_QUERY("INSERT INTO
        `{?_MYSQL_PREFIX?}_network_request_params`
@@ -654,7 +666,7 @@ function doAdminNetworkProcessAddnetworkparamForm () {
                loadTemplate('admin_network_request_param_added', false, postRequestArray());
        } else {
                // Not added
-               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_REQUEST_PARAMETER_NOT_ADDED', postRequestParameter('request_param_key')));
+               loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_NETWORK_REQUEST_PARAMETER_NOT_ADDED', postRequestParameter('request_param_key')));
        }
 }