Adding of API array indexes basicly finished

diff --git a/.gitattributes b/.gitattributes
index 22027d93c1edde920ac9dbcffae562e1a830b103..8908b997402c868fc489d75017637825704f3283 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1270,6 +1270,7 @@ templates/de/html/admin/admin_mods_stats2.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_mods_stats2_row.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_mods_stats_row.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_network_added.tpl -text svneol=unset#text/plain
+templates/de/html/admin/admin_network_api_translation_added.tpl svneol=native#text/plain
 templates/de/html/admin/admin_network_request_param_added.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_network_type_added.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_newsletter.tpl -text svneol=unset#text/plain

diff --git a/inc/language/network_de.php b/inc/language/network_de.php
index 993e1f987dc787d44c6f30a0040cd41a60fd1b52..82d47f42a659284641362df1bee801a9d663dea8 100644 (file)
--- a/inc/language/network_de.php
+++ b/inc/language/network_de.php
@@ -65,6 +65,7 @@ addMessages(array(
        'ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_CHANGED' => "Es wurden keine Änderungen an den API-Parametern ausgeführt.",
        'ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_REMOVED' => "Es wurden keine API-Parameter gelöscht.",
        'ADMIN_NETWORK_API_TRANSLATION_404' => "Es wurden keine &Uuml;bersetzungen zum Antwort-Array zum Werbenetzwerk <span class=\"data\">%s</span> gefunden.",
+       'ADMIN_NETWORK_API_TRANSLATION_NOT_ADDED' => "Die Array-Element-&Uuml;bersetzung <span class=\"data\">%s</span> wurde nicht hinzugef&uuml;gt.",
        // - Form titles
        'ADMIN_NETWORK_ADD_TITLE' => "Neues Werbenetzwerk hinzuf&uuml;gen - Allgemeine Daten",
        'ADMIN_NETWORK_EDIT_TITLE' => "Werbenetzwerk editieren - Allgemeine Daten",
@@ -105,9 +106,10 @@ addMessages(array(
        'ADMIN_NETWORK_REQUEST_PARAMETER_REMOVE' => "API-Parameter entfernen",
        'ADMIN_NETWORK_API_TRANSLATION_ADD' => "R&uuml;ckgabewert hinzuf&uuml;gen",
        // - Success titles
-       'ADMIN_NETWORK_ADDED_TITLE' => "Allgemeine Werbenetzwerkdaten hinzugef&uuml;gt.",
-       'ADMIN_NETWORK_TYPES_ADDED_TITLE' => "Werbeart-Handler hinzugef&uuml;gt.",
+       'ADMIN_NETWORK_ADDED_TITLE' => "Allgemeine Werbenetzwerkdaten hinzugef&uuml;gt",
+       'ADMIN_NETWORK_TYPES_ADDED_TITLE' => "Werbeart-Handler hinzugef&uuml;gt",
        'ADMIN_NETWORK_REQUEST_PARAM_ADDED_TITLE' => "API-Parameter hinzugef&uuml;gt",
+       'ADMIN_NETWORK_API_TRANSLATION_ADDED_TITLE' => "Array-Element-&Uuml;bersetzung hinzugef&uuml;gt",
        // - Success nots
        'ADMIN_NETWORK_UPDATED' => "Es wurden <span class=\"data\">%s</span> Eintr&auml;ge in den allgemeinen Daten aktualisiert.",
        'ADMIN_NETWORK_REMOVED' => "Es wurden <span class=\"data\">%s</span> Eintr&auml;ge aus den allgemeinen Daten gel&ouml;scht.",
@@ -125,6 +127,7 @@ addMessages(array(
        'ADMIN_NETWORK_API_TRANSLATION_ADD_NOTE' => "F&uuml;gen Sie hier weitere Array-Element-&Uuml;bersetzungen zu dem ausgew&auml;hlten Netzwerk und Werbeart-Handler ein.",
        // - Other messages
        'ADMIN_NETWORK_REQUEST_PARAMETER_LIST_LIMITED_TO_TYPE' => "Es wurden nur die API-Parameter des ausgew&auml;hlten Werbeart-Handlers angezeigt.",
+       'ADMIN_NETWORK_API_TRANSLATION_LIST_LIMITED_TO_TYPE' => "Es wurden nur die Array-Element-&Uuml;bersetzungen des ausgew&auml;hlten Werbeart-Handlers angezeigt.",
        // - Advertise types
        'ADMIN_NETWORK_TYPES_BANNER' => "Banner-Klick/-View",
        'ADMIN_NETWORK_TYPES_BANNER_CLICK' => "Banner-Klick",

diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php
index 7d0a942560423d5fc4b4a3fd295b5caf4b88654b..89392f1e1c73828748d25da4b3d631d77c3c8357 100644 (file)
--- a/inc/libs/network_functions.php
+++ b/inc/libs/network_functions.php
@@ -141,6 +141,22 @@ function isNetworkRequestParameterValid ($key, $type, $networkId) {
        return $isValid;
 }
 
+// Checks wether the given network API array translation
+function isNetworkApiTranslationValid ($key, $type, $networkId) {
+       // Query for it
+       $result = SQL_QUERY_ESC("SELECT `network_api_id` FROM `{?_MYSQL_PREFIX?}_network_api_translation` WHERE `network_id`=%s AND `network_type_id`=%s AND `network_api_index`='%s' LIMIT 1",
+               array($networkId, $type, $key), __FUNCTION__, __LINE__);
+
+       // Does it exist?
+       $isValid = (SQL_NUMROWS($result) == 1);
+
+       // Free result
+       SQL_FREERESULT($result);
+
+       // Return result
+       return $isValid;
+}
+
 // "Getter" for a network's data by provided id number
 function getNetworkDataById ($id, $column = '') {
        // Ids lower one are not accepted
@@ -911,10 +927,10 @@ function doAdminNetworkProcessAddNetworkType () {
        } // END - if
 
        // Add the whole request to database
-       SQL_QUERY("INSERT INTO
+       SQL_QUERY('INSERT INTO
        `{?_MYSQL_PREFIX?}_network_types`
 (
-       `" . implode('`,`', array_keys(postRequestArray())) . "`
+       `' . implode('`,`', array_keys(postRequestArray())) . "`
 ) VALUES (
        '" . implode("','", array_values(postRequestArray())) . "'
 )", __FUNCTION__, __LINE__);
@@ -1127,6 +1143,42 @@ function doAdminNetworkProcessAddNetworkParam () {
        }
 }
 
+// Adds a API response array entry
+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('request_param_key')));
+
+               // ... so abort here
+               return false;
+       } // END - if
+
+       // Remove the 'ok' part
+       unsetPostRequestParameter('ok');
+
+       // Add id
+       setPostRequestParameter('network_id', bigintval(getRequestParameter('network')));
+
+       // Add the whole request to database
+       SQL_QUERY('INSERT INTO
+       `{?_MYSQL_PREFIX?}_network_api_translation`
+(
+       `' . implode('`,`', array_keys(postRequestArray())) . "`
+) VALUES (
+       '" . implode("','", array_values(postRequestArray())) . "'
+)", __FUNCTION__, __LINE__);
+
+       // Output message
+       if (SQL_AFFECTEDROWS() == 1) {
+               // Successfully added
+               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')));
+       }
+}
+
 // Do expression code for this extension
 function doExpressionNetwork ($data) {
        // Construct replacer

diff --git a/templates/de/html/admin/admin_add_network_api_translation.tpl b/templates/de/html/admin/admin_add_network_api_translation.tpl
index 790d5a48aadeeb538acb493a8a6a4caaf09b1491..f60ec8c07272b2bb24476f26021646b2bd615f8f 100644 (file)
--- a/templates/de/html/admin/admin_add_network_api_translation.tpl
+++ b/templates/de/html/admin/admin_add_network_api_translation.tpl
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=list_network_api_translation&amp;do=add_network_api_translation&amp;network={%pipe,getRequestParameter=network%}&amp;network_type={%pipe,getRequestParameter=network_type%}%}" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=list_network_api_translation&amp;do=add_network_api_translation&amp;network={%pipe,getRequestParameter=network%}%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td class="admin_title bottom" colspan="2" align="center">
@@ -20,14 +20,14 @@
        <tr>
                <td align="right" width="250">{--ADMIN_NETWORK_API_TRANSLATION_INDEX--}:</td>
                <td>
-                       <input type="hidden" name="network_array_index" value="$content[translation_index]" />
+                       <input type="hidden" name="network_api_index" value="$content[translation_index]" />
                        <strong>$content[translation_index]</strong>
                </td>
        </tr>
        <tr>
                <td class="bottom" align="right" width="250">{--ADMIN_NETWORK_API_TRANSLATION_INDEX_TRANSLATION--}:</td>
                <td class="bottom">
-                       <select class="admin_select" name="index_translation" size="1">
+                       <select class="admin_select" name="network_api_index" size="1">
                                {%pipe,generateNetworkTranslationOptions%}
                        </select>
                </td>

diff --git a/templates/de/html/admin/admin_network_api_translation_added.tpl b/templates/de/html/admin/admin_network_api_translation_added.tpl
new file mode 100644 (file)
index 0000000..9db451c
--- /dev/null
+++ b/templates/de/html/admin/admin_network_api_translation_added.tpl
@@ -0,0 +1,13 @@
+<div align="center" style="margin-top:10px;margin-bottom:10px">
+
+<div style="width:550px" class="admin_table dashed">
+       <div class="admin_title bottom">
+               {--ADMIN_NETWORK_API_TRANSLATION_ADDED_TITLE--}
+       </div>
+       <div class="admin_message">
+               Die Array-Element-&Uuml;bersetzung $content[network_api_index] wurde soeben hinzugef&uuml;gt.
+               Sie sollten nun als n&auml;chstes die <a href="{%url=modules.php?module=admin&amp;what=list_network_error_codes&amp;network=$content[network_id]%}">Fehlercodes hinzuf&uuml;gen</a>.
+       </div>
+</div>
+
+</div>