Extension ext-network continued:

- Some language ids renamed (better naming)
- Function isNetworkApiConfigured() introduced which checks if a network API is
  already configured by given network id
- Variable $id renamed to $networkId
- Wether the network API is configured is now displayed in network selection box

General:
- CSS classes 'good' and 'bad' added (but unused)

diff --git a/inc/language/network_de.php b/inc/language/network_de.php
index bd18405b9f7472b614061098c1050157edc8ff51..8730ab172f5ba13a3dd39fb756df1c67693ccbf7 100644 (file)
--- a/inc/language/network_de.php
+++ b/inc/language/network_de.php
@@ -201,17 +201,18 @@ addMessages(array(
        'ADMIN_NETWORK_API_TRANSLATION_INDEX_TRANSLATION' => "Index-Übersetzung auswählen",
        'ADMIN_NETWORK_API_INDEX_TRANSLATION' => "Index-Übersetzung",
        'ADMIN_NETWORK_API_INDEX_SORTING' => "Index-Reihenfolge",
-       // Network configuration
-       'ADMIN_CONFIG_NETWORK_API_ENTER_AFFILIATE_ID' => "Ihre Affiliate oder User-Id",
-       'ADMIN_CONFIG_NETWORK_API_ENTER_API_PASSWORD' => "Ihr Interface-Kennwort",
-       'ADMIN_CONFIG_NETWORK_API_ENTER_SITE_ID' => "Webseiten-Id Ihres {?MT_WORD2?}",
-       'ADMIN_CONFIG_NETWORK_API_ENTER_QUERY_AMOUNT' => "Freie Interface-Abfragen täglich",
+       // Network API configuration
+       'ADMIN_CONFIG_NETWORK_API_ENTER_AFFILIATE_ID' => "Ihre Affiliate oder User-Id:",
+       'ADMIN_CONFIG_NETWORK_API_ENTER_API_PASSWORD' => "Ihr Interface-Kennwort:",
+       'ADMIN_CONFIG_NETWORK_API_ENTER_SITE_ID' => "Webseiten-Id Ihres {?MT_WORD2?}:",
+       'ADMIN_CONFIG_NETWORK_API_ENTER_QUERY_AMOUNT' => "Freie Interface-Abfragen täglich:",
        'ADMIN_CONFIG_NETWORK_API_SELECT_API_ACTIVE' => "Soll dieses Interface abgefragt werden?",
        'ADMIN_CONFIG_NETWORK_API_TITLE' => "Einrichtung des API-Zugangs zum Werbenetzwerk <span class=\"data\">%s</span>:",
        'ADMIN_CONFIG_NETWORK_API_SAVE_BUTTON' => "API-Konfiguration speichern",
-       'ADMIN_CONFIG_NETWORK_API_NOTE' => "Tragen Sie hier Ihre Interface-Zugangsdaten zum angzeigten Werbenetzwerk ein.",
-       'ADMIN_NETWORK_API_CONFIG_SAVED' => "API-Konfiguration gespeichert.",
-       'ADMIN_NETWORK_API_CONFIG_NOT_SAVED' => "API-Konfiguration NICHT gespeichert (keine &Auml;nderungen).",
+       'ADMIN_CONFIG_NETWORK_API_SAVED' => "API-Konfiguration gespeichert.",
+       'ADMIN_CONFIG_NETWORK_API_NOT_SAVED' => "API-Konfiguration NICHT gespeichert (keine &Auml;nderungen).",
+       'ADMIN_NETWORK_API_NOT_CONFIGURED' => "Konfiguration fehlt",
+       'ADMIN_NETWORK_API_CONFIGURED' => "Konfiguration vorhanden",
        // Error codes
        'ADMIN_NETWORK_AFF_ID_PASS_WRONG_ERROR_CODE' => "Affiliate-Id oder -Passwort falsch",
        'ADMIN_NETWORK_SITE_ID_NOT_ASSIGNED_ERROR_CODE' => "Seiten-Id nicht zugewiesen/ung&uuml;ltig",

diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php
index fd779222d06ada3348adce1a9d38e8aa25ed4f08..cca701ce44de85cef493d8412d8f373da4f26507 100644 (file)
--- a/inc/libs/network_functions.php
+++ b/inc/libs/network_functions.php
@@ -41,8 +41,8 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Private setter for current network id
-function setCurrentNetworkId ($id) {
-       $GLOBALS['current_network_id'] = bigintval($id);
+function setCurrentNetworkId ($networkId) {
+       $GLOBALS['current_network_id'] = bigintval($networkId);
 }
 
 // Private getter for current network id
@@ -156,20 +156,20 @@ function isNetworkApiTranslationValid ($key, $type, $networkId) {
 }
 
 // "Getter" for a network's data by provided id number
-function getNetworkDataById ($id, $column = '') {
+function getNetworkDataById ($networkId, $column = '') {
        // Ids lower one are not accepted
-       if ($id < 1) {
+       if ($networkId < 1) {
                // Not good, should be fixed
-               debug_report_bug(__FUNCTION__, __LINE__, 'Network id ' . $id . ' is smaller than 1.');
+               debug_report_bug(__FUNCTION__, __LINE__, 'Network id ' . $networkId . ' is smaller than 1.');
        } // END - if
 
        // Set current network id
-       setCurrentNetworkId($id);
+       setCurrentNetworkId($networkId);
 
        // Is it cached?
-       if (!isset($GLOBALS['network_data'][$id])) {
+       if (!isset($GLOBALS['network_data'][$networkId])) {
                // By default we have no data
-               $GLOBALS['network_data'][$id] = array();
+               $GLOBALS['network_data'][$networkId] = array();
 
                // Query for the network data
                $result = SQL_QUERY_ESC("SELECT
@@ -179,12 +179,12 @@ FROM
 WHERE
        `network_id`=%s
 LIMIT 1",
-                       array(bigintval($id)), __FUNCTION__, __LINE__);
+                       array(bigintval($networkId)), __FUNCTION__, __LINE__);
 
                // Do we have an entry?
                if (SQL_NUMROWS($result) == 1) {
                        // Then get it
-                       $GLOBALS['network_data'][$id] = SQL_FETCHARRAY($result);
+                       $GLOBALS['network_data'][$networkId] = SQL_FETCHARRAY($result);
                } // END - if
 
                // Free result
@@ -194,28 +194,28 @@ LIMIT 1",
        // Return result
        if (empty($column)) {
                // Return array
-               return $GLOBALS['network_data'][$id];
+               return $GLOBALS['network_data'][$networkId];
        } else {
                // Return column
-               return $GLOBALS['network_data'][$id][$column];
+               return $GLOBALS['network_data'][$networkId][$column];
        }
 }
 
 // "Getter" for a network's data by provided type id number
-function getNetworkDataByTypeId ($id, $column = '') {
+function getNetworkDataByTypeId ($networkId, $column = '') {
        // Ids lower one are not accepted
-       if ($id < 1) {
+       if ($networkId < 1) {
                // Not good, should be fixed
-               debug_report_bug(__FUNCTION__, __LINE__, 'Network type id ' . $id . ' is smaller than 1.');
+               debug_report_bug(__FUNCTION__, __LINE__, 'Network type id ' . $networkId . ' is smaller than 1.');
        } // END - if
 
        // Set current network id
-       setCurrentNetworkId($id);
+       setCurrentNetworkId($networkId);
 
        // Is it cached?
-       if (!isset($GLOBALS['network_data'][$id])) {
+       if (!isset($GLOBALS['network_data'][$networkId])) {
                // By default we have no data
-               $GLOBALS['network_data'][$id] = array();
+               $GLOBALS['network_data'][$networkId] = array();
 
                // Query for the network data
                $result = SQL_QUERY_ESC("SELECT
@@ -230,12 +230,12 @@ ON
 WHERE
        t.`network_type_id`=%s
 LIMIT 1",
-                       array(bigintval($id)), __FUNCTION__, __LINE__);
+                       array(bigintval($networkId)), __FUNCTION__, __LINE__);
 
                // Do we have an entry?
                if (SQL_NUMROWS($result) == 1) {
                        // Then get it
-                       $GLOBALS['network_data'][$id] = SQL_FETCHARRAY($result);
+                       $GLOBALS['network_data'][$networkId] = SQL_FETCHARRAY($result);
                } // END - if
 
                // Free result
@@ -245,23 +245,23 @@ LIMIT 1",
        // Return result
        if (empty($column)) {
                // Return array
-               return $GLOBALS['network_data'][$id];
+               return $GLOBALS['network_data'][$networkId];
        } else {
                // Return column
-               return $GLOBALS['network_data'][$id][$column];
+               return $GLOBALS['network_data'][$networkId][$column];
        }
 }
 
 // "Getter" for a network type data by provided id number
-function getNetworkTypeDataById ($id) {
+function getNetworkTypeDataById ($networkId) {
        // Ids lower one are not accepted
-       if ($id < 1) {
+       if ($networkId < 1) {
                // Not good, should be fixed
-               debug_report_bug(__FUNCTION__, __LINE__, 'Network type id ' . $id . ' is smaller than 1.');
+               debug_report_bug(__FUNCTION__, __LINE__, 'Network type id ' . $networkId . ' is smaller than 1.');
        } // END - if
 
        // By default we have no data
-       $GLOBALS['network_type_data'][$id] = array();
+       $GLOBALS['network_type_data'][$networkId] = array();
 
        // Query for the network data
        $result = SQL_QUERY_ESC("SELECT
@@ -271,27 +271,27 @@ FROM
 WHERE
        `network_type_id`=%s
 LIMIT 1",
-               array(bigintval($id)), __FUNCTION__, __LINE__);
+               array(bigintval($networkId)), __FUNCTION__, __LINE__);
 
        // Do we have an entry?
        if (SQL_NUMROWS($result) == 1) {
                // Then get it
-               $GLOBALS['network_type_data'][$id] = SQL_FETCHARRAY($result);
+               $GLOBALS['network_type_data'][$networkId] = SQL_FETCHARRAY($result);
        } // END - if
 
        // Free result
        SQL_FREERESULT($result);
 
        // Return result
-       return $GLOBALS['network_type_data'][$id];
+       return $GLOBALS['network_type_data'][$networkId];
 }
 
 // "Getter" for a network request parameter data by provided id number
-function getNetworkRequestParamsDataById ($id) {
+function getNetworkRequestParamsDataById ($networkId) {
        // Ids lower one are not accepted
-       if ($id < 1) {
+       if ($networkId < 1) {
                // Not good, should be fixed
-               debug_report_bug(__FUNCTION__, __LINE__, 'Network request parameter id ' . $id . ' is smaller than 1.');
+               debug_report_bug(__FUNCTION__, __LINE__, 'Network request parameter id ' . $networkId . ' is smaller than 1.');
        } // END - if
 
        // By default we have no data
@@ -305,7 +305,7 @@ FROM
 WHERE
        `network_param_id`=%s
 LIMIT 1",
-               array(bigintval($id)), __FUNCTION__, __LINE__);
+               array(bigintval($networkId)), __FUNCTION__, __LINE__);
 
        // Do we have an entry?
        if (SQL_NUMROWS($result) == 1) {
@@ -321,46 +321,46 @@ LIMIT 1",
 }
 
 // Updates given network (id) with data from array
-function doNetworkUpdateDataByArray ($id, $networkData) {
+function doNetworkUpdateDataByArray ($networkId, $networkData) {
        // Ids lower one are not accepted
-       if ($id < 1) {
+       if ($networkId < 1) {
                // Not good, should be fixed
-               debug_report_bug(__FUNCTION__, __LINE__, 'Network id ' . $id . ' is smaller than 1.');
+               debug_report_bug(__FUNCTION__, __LINE__, 'Network id ' . $networkId . ' is smaller than 1.');
        } // END - if
 
        // Just call our inner method
-       return adminSaveSettings($networkData, '_network_data', sprintf("`network_id`=%s", bigintval($id)), array(), false, false);
+       return adminSaveSettings($networkData, '_network_data', sprintf("`network_id`=%s", bigintval($networkId)), array(), false, false);
 }
 
 // Updates given network type handler (id) with data from array
-function doNetworkUpdateTypeByArray ($id, $networkTypeData) {
+function doNetworkUpdateTypeByArray ($networkId, $networkTypeData) {
        // Ids lower one are not accepted
-       if ($id < 1) {
+       if ($networkId < 1) {
                // Not good, should be fixed
-               debug_report_bug(__FUNCTION__, __LINE__, 'Network type handler id ' . $id . ' is smaller than 1.');
+               debug_report_bug(__FUNCTION__, __LINE__, 'Network type handler id ' . $networkId . ' is smaller than 1.');
        } // END - if
 
        // Just call our inner method
-       return adminSaveSettings($networkTypeData, '_network_types', sprintf("`network_type_id`=%s", bigintval($id)), array(), false, false);
+       return adminSaveSettings($networkTypeData, '_network_types', sprintf("`network_type_id`=%s", bigintval($networkId)), array(), false, false);
 }
 
 // Updates given network request parameters (id) with data from array
-function doNetworkUpdateParamsByArray ($id, $networkParamData) {
+function doNetworkUpdateParamsByArray ($networkId, $networkParamData) {
        // Ids lower one are not accepted
-       if ($id < 1) {
+       if ($networkId < 1) {
                // Not good, should be fixed
-               debug_report_bug(__FUNCTION__, __LINE__, 'Network request parameter id ' . $id . ' is smaller than 1.');
+               debug_report_bug(__FUNCTION__, __LINE__, 'Network request parameter id ' . $networkId . ' is smaller than 1.');
        } // END - if
 
        // Just call our inner method
-       return adminSaveSettings($networkParamData, '_network_request_params', sprintf("`network_param_id`=%s", bigintval($id)), array(), false, false);
+       return adminSaveSettings($networkParamData, '_network_request_params', sprintf("`network_param_id`=%s", bigintval($networkId)), array(), false, false);
 }
 
 // Removes given network entry
-function doAdminRemoveNetworkEntry ($table, $column, $id, $limit = 1) {
+function doAdminRemoveNetworkEntry ($table, $column, $networkId, $limit = 1) {
        // Remove the entry
        SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_network_%s` WHERE `%s`=%s LIMIT %s",
-               array($table, $column, $id, $limit), __FUNCTION__, __LINE__);
+               array($table, $column, $networkId, $limit), __FUNCTION__, __LINE__);
 
        // Return affected rows
        return SQL_AFFECTEDROWS();
@@ -495,20 +495,20 @@ ORDER BY
 }
 
 // Generator (somewhat getter) for network type options
-function generateNetworkTypeOptions ($id) {
+function generateNetworkTypeOptions ($networkId) {
        // Is this an array, then we just came back from edit/delete actions
-       if (is_array($id)) {
-               $id = '';
+       if (is_array($networkId)) {
+               $networkId = '';
        } // END - if
 
        // Is this cached?
-       if (!isset($GLOBALS[__FUNCTION__][$id])) {
+       if (!isset($GLOBALS[__FUNCTION__][$networkId])) {
                // Generate output and cache it
-               $GLOBALS[__FUNCTION__][$id] = generateOptionList(
+               $GLOBALS[__FUNCTION__][$networkId] = generateOptionList(
                        'network_types',
                        'network_type_id',
                        'network_type_handle',
-                       $id,
+                       $networkId,
                        '',
                        sprintf(
                                "WHERE `network_id`=%s",
@@ -520,7 +520,7 @@ function generateNetworkTypeOptions ($id) {
        } // END - if
 
        // Return content
-       return $GLOBALS[__FUNCTION__][$id];
+       return $GLOBALS[__FUNCTION__][$networkId];
 }
 
 // Generates an options list of all available (hard-coded) handlers
@@ -734,6 +734,42 @@ ORDER BY
        return translateNetworkTranslationName($name);
 }
 
+// Translates network API configuration status (see function isNetworkApiConfigured()) by given id
+function translateNetworkApiConfiguredStatusById ($networkId) {
+       // Do we have cache?
+       if (!isset($GLOBALS[__FUNCTION__][$networkId])) {
+               // By default it is not configured
+               $GLOBALS[__FUNCTION__][$networkId] = '{--ADMIN_NETWORK_API_NOT_CONFIGURED--}';
+
+               // So is it configured?
+               if (isNetworkApiConfigured($networkId)) {
+                       // Yes, it is
+                       $GLOBALS[__FUNCTION__][$networkId] = '{--ADMIN_NETWORK_API_CONFIGURED--}';
+               } // END - if
+       } // END - if
+
+       // Return cache
+       return $GLOBALS[__FUNCTION__][$networkId];
+}
+
+// Checks if the given network is configured by looking its API configuration entry up
+function isNetworkApiConfigured ($networkId) {
+       // Do we have cache?
+       if (!isset($GLOBALS[__FUNCTION__][$networkId])) {
+               // Check for an entry in network_api_config
+               $GLOBALS[__FUNCTION__][$networkId] = (countSumTotalData(
+                       bigintval($networkId),
+                       'network_api_config',
+                       'network_id',
+                       'network_id',
+                       true
+               ) == 1);
+       } // END - if
+
+       // Return cache
+       return $GLOBALS[__FUNCTION__][$networkId];
+}
+
 //------------------------------------------------------------------------------
 //                             Call-back functions
 //------------------------------------------------------------------------------
@@ -778,11 +814,11 @@ function doAdminNetworkProcessHandleNetwork () {
        if (ifPostContainsSelections()) {
                // Something has been selected, so start displaying one by one
                $OUT = '';
-               foreach (postRequestElement('sel') as $id => $sel) {
+               foreach (postRequestElement('sel') as $networkId => $sel) {
                        // Is this selected?
                        if ($sel == 1) {
                                // Load this network's data
-                               $networkData = getNetworkDataById($id);
+                               $networkData = getNetworkDataById($networkId);
 
                                // Do we have found the network?
                                if (count($networkData) > 0) {
@@ -830,11 +866,11 @@ function doAdminNetworkProcessHandleNetworkType () {
 
                // Something has been selected, so start displaying one by one
                $OUT = '';
-               foreach (postRequestElement('sel') as $id => $sel) {
+               foreach (postRequestElement('sel') as $networkId => $sel) {
                        // Is this selected?
                        if ($sel == 1) {
                                // Load this network's data
-                               $networkTypeData = getNetworkTypeDataById($id);
+                               $networkTypeData = getNetworkTypeDataById($networkId);
 
                                // Do we have found the network?
                                if (count($networkTypeData) > 0) {
@@ -885,11 +921,11 @@ function doAdminNetworkProcessHandleRequestParams () {
 
                // Something has been selected, so start displaying one by one
                $OUT = '';
-               foreach (postRequestElement('sel') as $id => $sel) {
+               foreach (postRequestElement('sel') as $networkId => $sel) {
                        // Is this selected?
                        if ($sel == 1) {
                                // Load this network's data
-                               $networkRequestData = getNetworkRequestParamsDataById($id);
+                               $networkRequestData = getNetworkRequestParamsDataById($networkId);
 
                                // Do we have found the network?
                                if (count($networkRequestData) > 0) {
@@ -939,7 +975,7 @@ function doAdminNetworkProcessChangeNetwork () {
                $updated = 0;
 
                // Something has been selected, so start updating them
-               foreach (postRequestElement('sel') as $id => $sel) {
+               foreach (postRequestElement('sel') as $networkId => $sel) {
                        // Update this entry?
                        if ($sel == 1) {
                                // Init data array
@@ -953,17 +989,17 @@ function doAdminNetworkProcessChangeNetwork () {
                                        } // END - if
 
                                        // Do we have this enty?
-                                       if (!isset($entry[$id])) {
+                                       if (!isset($entry[$networkId])) {
                                                // Not found, needs fixing
-                                               debug_report_bug(__FUNCTION__, __LINE__, 'No entry in key=' . $key . ', id=' . $id . ' found.');
+                                               debug_report_bug(__FUNCTION__, __LINE__, 'No entry in key=' . $key . ', id=' . $networkId . ' found.');
                                        } // END - if
 
                                        // Add this entry
-                                       $networkData[$key] = $entry[$id];
+                                       $networkData[$key] = $entry[$networkId];
                                } // END - foreach
 
                                // Update the network data
-                               $updated += doNetworkUpdateDataByArray($id, $networkData);
+                               $updated += doNetworkUpdateDataByArray($networkId, $networkData);
                        } // END - if
                } // END - foreach
 
@@ -986,11 +1022,11 @@ function doAdminNetworkProcessRemoveNetwork () {
                $removed = 0;
 
                // Something has been selected, so start updating them
-               foreach (postRequestElement('sel') as $id => $sel) {
+               foreach (postRequestElement('sel') as $networkId => $sel) {
                        // Update this entry?
                        if ($sel == 1) {
                                // Remove this entry
-                               $removed += doAdminRemoveNetworkEntry('data', 'network_id', $id);
+                               $removed += doAdminRemoveNetworkEntry('data', 'network_id', $networkId);
                        } // END - if
                } // END - foreach
 
@@ -1055,7 +1091,7 @@ function doAdminNetworkProcessChangeNetworkType () {
                $updated = 0;
 
                // Something has been selected, so start updating them
-               foreach (postRequestElement('sel') as $id => $sel) {
+               foreach (postRequestElement('sel') as $networkId => $sel) {
                        // Update this entry?
                        if ($sel == 1) {
                                // Init data array
@@ -1069,23 +1105,23 @@ function doAdminNetworkProcessChangeNetworkType () {
                                        } // END - if
 
                                        // Do we have this enty?
-                                       if (!isset($entry[$id])) {
+                                       if (!isset($entry[$networkId])) {
                                                // Not found, needs fixing
-                                               debug_report_bug(__FUNCTION__, __LINE__, 'No entry in key=' . $key . ', id=' . $id . ' found.');
+                                               debug_report_bug(__FUNCTION__, __LINE__, 'No entry in key=' . $key . ', id=' . $networkId . ' found.');
                                        } // END - if
 
                                        // Fix empty network_type_banner_url to NULL
-                                       if (($key == 'network_type_banner_url') && (trim($entry[$id]) == '')) {
+                                       if (($key == 'network_type_banner_url') && (trim($entry[$networkId]) == '')) {
                                                // Set it to NULL
-                                               $entry[$id] = NULL;
+                                               $entry[$networkId] = NULL;
                                        } // END - if
 
                                        // Add this entry
-                                       $networkTypeData[$key] = $entry[$id];
+                                       $networkTypeData[$key] = $entry[$networkId];
                                } // END - foreach
 
                                // Update the network data
-                               $updated += doNetworkUpdateTypeByArray($id, $networkTypeData);
+                               $updated += doNetworkUpdateTypeByArray($networkId, $networkTypeData);
                        } // END - if
                } // END - foreach
 
@@ -1108,7 +1144,7 @@ function doAdminNetworkProcessChangeNetworkParam () {
                $updated = 0;
 
                // Something has been selected, so start updating them
-               foreach (postRequestElement('sel') as $id => $sel) {
+               foreach (postRequestElement('sel') as $networkId => $sel) {
                        // Update this entry?
                        if ($sel == 1) {
                                // Init data array
@@ -1122,23 +1158,23 @@ function doAdminNetworkProcessChangeNetworkParam () {
                                        } // END - if
 
                                        // Do we have this enty?
-                                       if (!isset($entry[$id])) {
+                                       if (!isset($entry[$networkId])) {
                                                // Not found, needs fixing
-                                               debug_report_bug(__FUNCTION__, __LINE__, 'No entry in key=' . $key . ', id=' . $id . ' found.');
+                                               debug_report_bug(__FUNCTION__, __LINE__, 'No entry in key=' . $key . ', id=' . $networkId . ' found.');
                                        } // END - if
 
                                        // Fix empty request_param_default to NULL
-                                       if (($key == 'request_param_default') && (trim($entry[$id]) == '')) {
+                                       if (($key == 'request_param_default') && (trim($entry[$networkId]) == '')) {
                                                // Set it to NULL
-                                               $entry[$id] = NULL;
+                                               $entry[$networkId] = NULL;
                                        } // END - if
 
                                        // Add this entry
-                                       $networkParamsData[$key] = $entry[$id];
+                                       $networkParamsData[$key] = $entry[$networkId];
                                } // END - foreach
 
                                // Update the network data
-                               $updated += doNetworkUpdateParamsByArray($id, $networkParamsData);
+                               $updated += doNetworkUpdateParamsByArray($networkId, $networkParamsData);
                        } // END - if
                } // END - foreach
 
@@ -1161,11 +1197,11 @@ function doAdminNetworkProcessRemoveNetworkType () {
                $removed = 0;
 
                // Something has been selected, so start updating them
-               foreach (postRequestElement('sel') as $id => $sel) {
+               foreach (postRequestElement('sel') as $networkId => $sel) {
                        // Update this entry?
                        if ($sel == 1) {
                                // Remove this entry
-                               $removed += doAdminRemoveNetworkEntry('types', 'network_type_id', $id);
+                               $removed += doAdminRemoveNetworkEntry('types', 'network_type_id', $networkId);
                        } // END - if
                } // END - foreach
 
@@ -1188,11 +1224,11 @@ function doAdminNetworkProcessRemoveNetworkParam () {
                $removed = 0;
 
                // Something has been selected, so start updating them
-               foreach (postRequestElement('sel') as $id => $sel) {
+               foreach (postRequestElement('sel') as $networkId => $sel) {
                        // Update this entry?
                        if ($sel == 1) {
                                // Remove this entry
-                               $removed += doAdminRemoveNetworkEntry('request_params', 'network_param_id', $id);
+                               $removed += doAdminRemoveNetworkEntry('request_params', 'network_param_id', $networkId);
                        } // END - if
                } // END - foreach
 
@@ -1297,15 +1333,6 @@ function doAdminNetworkProcessAddNetworkApiTranslation () {
 
 // Adds/update network API configuration
 function doAdminNetworkProcessNetworkApiConfig () {
-       // Check for an entry in network_api_config
-       $entryCount = countSumTotalData(
-               bigintval(getRequestElement('network')),
-               'network_api_config',
-               'network_id',
-               'network_id',
-               true
-       );
-
        // Remove the 'ok' part
        unsetPostRequestElement('ok');
 
@@ -1313,7 +1340,7 @@ function doAdminNetworkProcessNetworkApiConfig () {
        setPostRequestElement('network_id', bigintval(getRequestElement('network')));
 
        // Is there already an entry?
-       if ($entryCount == 1) {
+       if (isNetworkApiConfigured(getRequestElement('network'))) {
                // Generate SQL query
                $SQL = getUpdateSqlFromArray(postRequestArray(), 'network_api_config', 'network_id', postRequestElement('network_id'), array('network_id'));
        } else {
@@ -1333,10 +1360,10 @@ function doAdminNetworkProcessNetworkApiConfig () {
        // Output message
        if (!SQL_HASZEROAFFECTED()) {
                // Successfully added
-               displayMessage('{--ADMIN_NETWORK_API_CONFIG_SAVED--}');
+               displayMessage('{--ADMIN_CONFIG_NETWORK_API_SAVED--}');
        } else {
                // Not added
-               loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_API_CONFIG_NOT_SAVED--}');
+               loadTemplate('admin_settings_unsaved', false, '{--ADMIN_CONFIG_NETWORK_API_NOT_SAVED--}');
        }
 }
 

diff --git a/templates/de/html/admin/admin_config_network_api.tpl b/templates/de/html/admin/admin_config_network_api.tpl
index f62668bb48cbaed662c4cab524f679b4affbc7ff..8ea6955fe983d2e2e9606d329cecda6279586bd5 100644 (file)
--- a/templates/de/html/admin/admin_config_network_api.tpl
+++ b/templates/de/html/admin/admin_config_network_api.tpl
@@ -8,27 +8,27 @@
 </tr>
 <tr>
        <td align="center" class="bottom right" width="50%">
-               {--ADMIN_CONFIG_NETWORK_API_ENTER_AFFILIATE_ID--}:<br />
+               {--ADMIN_CONFIG_NETWORK_API_ENTER_AFFILIATE_ID--}<br />
                <input type="text" class="form_field" name="network_affiliate_id" size="5" value="$content[network_affiliate_id]" />
        </td>
        <td align="center" class="bottom" width="50%">
-               {--ADMIN_CONFIG_NETWORK_API_ENTER_SITE_ID--}:<br />
+               {--ADMIN_CONFIG_NETWORK_API_ENTER_SITE_ID--}<br />
                <input type="text" class="form_field" name="network_site_id" size="5" value="$content[network_site_id]" />
        </td>
 </tr>
 <tr>
        <td align="center" class="bottom right" width="50%">
-               {--ADMIN_CONFIG_NETWORK_API_ENTER_API_PASSWORD--}:<br />
+               {--ADMIN_CONFIG_NETWORK_API_ENTER_API_PASSWORD--}<br />
                <input type="text" class="form_field" name="network_api_password" size="20" value="$content[network_api_password]" />
        </td>
        <td align="center" class="bottom" width="50%">
-               {--ADMIN_CONFIG_NETWORK_API_ENTER_QUERY_AMOUNT--}:<br />
+               {--ADMIN_CONFIG_NETWORK_API_ENTER_QUERY_AMOUNT--}<br />
                <input type="text" class="form_field" name="network_query_amount" size="5" value="$content[network_query_amount]" />
        </td>
 </tr>
 <tr>
        <td align="center" class="bottom" colspan="2">
-               {--ADMIN_CONFIG_NETWORK_API_SELECT_API_ACTIVE--}:<br />
+               {--ADMIN_CONFIG_NETWORK_API_SELECT_API_ACTIVE--}<br />
                <select class="form_field" name="network_api_active" size="1">
                        {%pipe,generateNetworkApiActiveOptions=$content[network_api_active]%}
                </select>
@@ -43,7 +43,3 @@
 </table>
 </form>
 </div>
-
-<div class="notice">
-       {--ADMIN_CONFIG_NETWORK_API_NOTE--}
-</div>

diff --git a/templates/de/html/select/select_network_option.tpl b/templates/de/html/select/select_network_option.tpl
index 1e9fed35a1f04cd642f43469cbc5d5dca2ca6705..2685a6bc5f8690e832475b9dba2d4ccf28c8f7dd 100644 (file)
--- a/templates/de/html/select/select_network_option.tpl
+++ b/templates/de/html/select/select_network_option.tpl
@@ -1,3 +1,3 @@
 <option value="$content[network_id]">
-       $content[network_title] ($content[network_short_name])
+       $content[network_title] ({%pipe,translateNetworkApiConfiguredStatusById=$content[network_id]%}, $content[network_short_name])
 </option>

diff --git a/theme/business/css/general.css b/theme/business/css/general.css
index fb7d0772096a7bd871e20178f0f5c483f27fc2a0..3b1cfbdd85b58fc3e793f8b366b9f7a2c72c7c34 100644 (file)
--- a/theme/business/css/general.css
+++ b/theme/business/css/general.css
@@ -641,3 +641,12 @@ ol.listing {
 li.listing {
        padding-bottom: 5px;
 }
+
+bad {
+       color: #aa0000;
+       font-style: italic;
+}
+
+good {
+       color: #00aa00;
+}

diff --git a/theme/default/css/general.css b/theme/default/css/general.css
index 9d81babc0ad2df3256e3f581dcd9dd0fe22f0c89..dbdbdc123d5311b73d64d9c601b760d8c07902fd 100644 (file)
--- a/theme/default/css/general.css
+++ b/theme/default/css/general.css
@@ -687,3 +687,12 @@ ol.listing {
 li.listing {
        padding-bottom: 5px;
 }
+
+bad {
+       color: #aa0000;
+       font-style: italic;
+}
+
+good {
+       color: #00aa00;
+}

diff --git a/theme/desert/css/general.css b/theme/desert/css/general.css
index 976d5a07a50ae8f0827fc816c4807703564a1059..8ac81d470f52b1d6eefd8c3f63e3d69b20395a91 100644 (file)
--- a/theme/desert/css/general.css
+++ b/theme/desert/css/general.css
@@ -627,3 +627,12 @@ ol.listing {
 li.listing {
        padding-bottom: 5px;
 }
+
+bad {
+       color: #aa0000;
+       font-style: italic;
+}
+
+good {
+       color: #00aa00;
+}

diff --git a/theme/org/css/general.css b/theme/org/css/general.css
index d7c14181be9c305af5285d552f55ccffdfd19bb0..25809e6b8c5854e7df8e1c3427e41d182778f6ed 100644 (file)
--- a/theme/org/css/general.css
+++ b/theme/org/css/general.css
@@ -520,3 +520,12 @@ ol.listing {
 li.listing {
        padding-bottom: 5px;
 }
+
+bad {
+       color: #aa0000;
+       font-style: italic;
+}
+
+good {
+       color: #00aa00;
+}

diff --git a/theme/schleuder/css/general.css b/theme/schleuder/css/general.css
index 198b5b7c663eabaafaa8497c6a8b5c4e5c9894aa..89a0cae099bdf92d72a86662864e29152ced9c02 100644 (file)
--- a/theme/schleuder/css/general.css
+++ b/theme/schleuder/css/general.css
@@ -560,3 +560,12 @@ ol.listing {
 li.listing {
        padding-bottom: 5px;
 }
+
+bad {
+       color: #aa0000;
+       font-style: italic;
+}
+
+good {
+       color: #00aa00;
+}

diff --git a/theme/ship-simu/css/general.css b/theme/ship-simu/css/general.css
index 3d57147e764a1434cdc637adfe9cc0d60a10e684..edab8921cd54b6ab4ad669eda17f6a7bc722e7d2 100644 (file)
--- a/theme/ship-simu/css/general.css
+++ b/theme/ship-simu/css/general.css
@@ -530,3 +530,12 @@ ol.listing {
 li.listing {
        padding-bottom: 5px;
 }
+
+bad {
+       color: #aa0000;
+       font-style: italic;
+}
+
+good {
+       color: #00aa00;
+}