'NO-ACL' is more clear that we don't have an ACL for the given admin than three aster...

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

diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php
index ae47871fa8b25d058b8dfc3603d721258facfe6f..326c48b3dc1aff46e8a4fc96bf3aae042acfc9f7 100644 (file)
--- a/inc/libs/network_functions.php
+++ b/inc/libs/network_functions.php
@@ -14,11 +14,9 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -55,7 +53,7 @@ function getCurrentNetworkId () {
 // Handle a (maybe) sent form here
 function doNetworkHandleForm () {
        // Was the form sent?
-       if ((isFormSent()) || (isFormSent('edit')) || (isFormSent('del')) || (isFormSent('change')) || (isFormSent('remove'))) {
+       if ((isFormSent()) || (isFormSent('edit')) || (isFormSent('delete')) || (isFormSent('change')) || (isFormSent('remove'))) {
                // Do we have a 'do'?
                if (isGetRequestParameterSet('do')) {
                        // Process the request
@@ -70,7 +68,7 @@ function doNetworkHandleForm () {
 // Processes an admin form
 function doAdminNetworkProcessForm () {
        // Form really sent?
-       if ((!isFormSent()) && (!isFormSent('edit')) && (!isFormSent('del')) && (!isFormSent('change')) && (!isFormSent('remove'))) {
+       if ((!isFormSent()) && (!isFormSent('edit')) && (!isFormSent('delete')) && (!isFormSent('change')) && (!isFormSent('remove'))) {
                // Abort here
                loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_FORM_NOT_SENT--}');
                return;
@@ -653,6 +651,29 @@ function generateNetworkRequestTypeOptions ($default = '') {
        return $GLOBALS[__FUNCTION__][$default];
 }
 
+// Generates an option list of network_active
+function generateNetworkActiveOptions ($default = '') {
+       // Do we have cache?
+       if (!isset($GLOBALS[__FUNCTION__][$default])) {
+               // Generate the list
+               $GLOBALS[__FUNCTION__][$default] = generateOptionList(
+                       '/ARRAY/',
+                       array(
+                               'Y',
+                               'N'
+                       ),
+                       array(
+                               '{--YES--}',
+                               '{--NO--}'
+                       ),
+                       $default
+               );
+       } // END - if
+
+       // Return cache
+       return $GLOBALS[__FUNCTION__][$default];
+}
+
 // Translates 'translate_name' for e.g. templates
 function translateNetworkTranslationName ($name) {
        // Get the message id
@@ -697,7 +718,7 @@ ORDER BY
        `sort` ASC', __FUNCTION__, __LINE__);
 
                // Do we have entries?
-               if (SQL_NUMROWS($result) > 0) {
+               if (!SQL_HASZERONUMS($result)) {
                        // Get all entries
                        while ($row = SQL_FETCHARRAY($result)) {
                                // Add it to our global array
@@ -751,7 +772,7 @@ function doAdminNetworkProcessAddNetwork () {
        setPostRequestParameter('network_id', SQL_INSERTID());
 
        // Output message
-       if (SQL_AFFECTEDROWS() == 1) {
+       if (!SQL_HASZEROAFFECTED()) {
                // Successfully added
                loadTemplate('admin_network_added', false, postRequestArray());
        } else {
@@ -777,9 +798,9 @@ function doAdminNetworkProcessHandleNetwork () {
                                        if (isFormSent('edit')) {
                                                // Add row template for editing
                                                $OUT .= loadTemplate('admin_edit_networks_row', true, $networkData);
-                                       } elseif (isFormSent('del')) {
+                                       } elseif (isFormSent('delete')) {
                                                // Add row template for deleting
-                                               $OUT .= loadTemplate('admin_del_networks_row', true, $networkData);
+                                               $OUT .= loadTemplate('admin_delete_networks_row', true, $networkData);
                                        } else {
                                                // Problem!
                                                debug_report_bug(__FUNCTION__, __LINE__, 'Cannot detect edit/del.');
@@ -793,8 +814,8 @@ function doAdminNetworkProcessHandleNetwork () {
                        // Output main template
                        if (isFormSent('edit')) {
                                loadTemplate('admin_edit_networks', false, $OUT);
-                       } elseif (isFormSent('del')) {
-                               loadTemplate('admin_del_networks', false, $OUT);
+                       } elseif (isFormSent('delete')) {
+                               loadTemplate('admin_delete_networks', false, $OUT);
                        } else {
                                // Problem!
                                debug_report_bug(__FUNCTION__, __LINE__, 'Cannot detect edit/del.');
@@ -829,9 +850,9 @@ function doAdminNetworkProcessHandleNetworkType () {
                                        if (isFormSent('edit')) {
                                                // Add row template for deleting
                                                $OUT .= loadTemplate('admin_edit_network_types_row', true, $networkTypeData);
-                                       } elseif (isFormSent('del')) {
+                                       } elseif (isFormSent('delete')) {
                                                // Add row template for deleting
-                                               $OUT .= loadTemplate('admin_del_network_types_row', true, $networkTypeData);
+                                               $OUT .= loadTemplate('admin_delete_network_types_row', true, $networkTypeData);
                                        } else {
                                                // Problem!
                                                debug_report_bug(__FUNCTION__, __LINE__, 'Cannot detect edit/del.');
@@ -845,8 +866,8 @@ function doAdminNetworkProcessHandleNetworkType () {
                        // Output main template
                        if (isFormSent('edit')) {
                                loadTemplate('admin_edit_network_types', false, $OUT);
-                       } elseif (isFormSent('del')) {
-                               loadTemplate('admin_del_network_types', false, $OUT);
+                       } elseif (isFormSent('delete')) {
+                               loadTemplate('admin_delete_network_types', false, $OUT);
                        } else {
                                // Problem!
                                debug_report_bug(__FUNCTION__, __LINE__, 'Cannot detect edit/del.');
@@ -884,12 +905,12 @@ function doAdminNetworkProcessHandleRequestParams () {
                                        if (isFormSent('edit')) {
                                                // Add row template for deleting
                                                $OUT .= loadTemplate('admin_edit_network_params_row', true, $networkRequestData);
-                                       } elseif (isFormSent('del')) {
+                                       } elseif (isFormSent('delete')) {
                                                // Get type data
                                                $networkRequestData['network_type_data'] = getNetworkTypeDataById($networkRequestData['network_type_id']);
 
                                                // Add row template for deleting
-                                               $OUT .= loadTemplate('admin_del_network_params_row', true, $networkRequestData);
+                                               $OUT .= loadTemplate('admin_delete_network_params_row', true, $networkRequestData);
                                        } else {
                                                // Problem!
                                                debug_report_bug(__FUNCTION__, __LINE__, 'Cannot detect edit/del.');
@@ -903,8 +924,8 @@ function doAdminNetworkProcessHandleRequestParams () {
                        // Output main template
                        if (isFormSent('edit')) {
                                loadTemplate('admin_edit_network_params', false, $OUT);
-                       } elseif (isFormSent('del')) {
-                               loadTemplate('admin_del_network_params', false, $OUT);
+                       } elseif (isFormSent('delete')) {
+                               loadTemplate('admin_delete_network_params', false, $OUT);
                        } else {
                                // Problem!
                                debug_report_bug(__FUNCTION__, __LINE__, 'Cannot detect edit/del.');
@@ -956,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(getMaskedMessage('ADMIN_NETWORK_UPDATED', $updated));
                } else {
                        // Nothing changed
                        loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_NOTHING_CHANGED--}');
@@ -983,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(getMaskedMessage('ADMIN_NETWORK_REMOVED', $removed));
                } else {
                        // Nothing removed
                        loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_NOTHING_REMOVED--}');
@@ -1024,7 +1045,7 @@ function doAdminNetworkProcessAddNetworkType () {
 )", __FUNCTION__, __LINE__);
 
        // Output message
-       if (SQL_AFFECTEDROWS() == 1) {
+       if (!SQL_HASZEROAFFECTED()) {
                // Successfully added
                loadTemplate('admin_network_type_added', false, postRequestArray());
        } else {
@@ -1076,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(getMaskedMessage('ADMIN_NETWORK_TYPES_UPDATED', $updated));
                } else {
                        // Nothing changed
                        loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_TYPES_NOTHING_CHANGED--}');
@@ -1127,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(getMaskedMessage('ADMIN_NETWORK_REQUEST_PARAMETER_UPDATED', $updated));
                } else {
                        // Nothing changed
                        loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_CHANGED--}');
@@ -1154,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(getMaskedMessage('ADMIN_NETWORK_TYPES_REMOVED', $removed));
                } else {
                        // Nothing removed
                        loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_TYPES_NOTHING_REMOVED--}');
@@ -1181,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(getMaskedMessage('ADMIN_NETWORK_REQUEST_PARAMETER_REMOVED', $removed));
                } else {
                        // Nothing removed
                        loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_REMOVED--}');
@@ -1222,7 +1243,7 @@ function doAdminNetworkProcessAddNetworkParam () {
 )", __FUNCTION__, __LINE__);
 
        // Output message
-       if (SQL_AFFECTEDROWS() == 1) {
+       if (!SQL_HASZEROAFFECTED()) {
                // Successfully added
                loadTemplate('admin_network_request_param_added', false, postRequestArray());
        } else {
@@ -1268,7 +1289,7 @@ function doAdminNetworkProcessAddNetworkApiTranslation () {
 )", __FUNCTION__, __LINE__);
 
        // Output message
-       if (SQL_AFFECTEDROWS() == 1) {
+       if (!SQL_HASZEROAFFECTED()) {
                // Successfully added
                loadTemplate('admin_network_api_translation_added', false, postRequestArray());
        } else {