Deleting of network type handler partialy finished

diff --git a/.gitattributes b/.gitattributes
index f359a018353bca6b65547e0ef2553d1ec3bc0ecb..383737c2e446e09aaa7c48e9340a140fc61e0956 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -982,6 +982,8 @@ templates/de/html/admin/admin_del_cats_row.tpl -text
 templates/de/html/admin/admin_del_email_bonus.tpl -text
 templates/de/html/admin/admin_del_email_normal.tpl -text
 templates/de/html/admin/admin_del_email_notify.tpl -text
+templates/de/html/admin/admin_del_network_types.tpl -text
+templates/de/html/admin/admin_del_network_types_row.tpl -text
 templates/de/html/admin/admin_del_networks.tpl -text
 templates/de/html/admin/admin_del_networks_row.tpl -text
 templates/de/html/admin/admin_del_payments.tpl -text

diff --git a/inc/language/network_de.php b/inc/language/network_de.php
index b84fc4f72e4264c3593b99c12560ec471f9fe3ee..b898a2e1dafe2710d1f80677358938bb9502b7bc 100644 (file)
--- a/inc/language/network_de.php
+++ b/inc/language/network_de.php
@@ -63,14 +63,13 @@ addMessages(array(
        'ADMIN_NETWORK_SELECT_TITLE' => "Werbenetzwerk auswählen",
        'ADMIN_NETWORK_TYPE_ADD_TITLE' => "Werbenetzwerk verwalten - Neue Werbeart hinzufügen",
        'ADMIN_NETWORK_TYPE_EDIT_TITLE' => "Werbeart-Handler editieren",
+       'ADMIN_NETWORK_TYPE_DELETE_TITLE' => "Werbeart-Handle löschen",
+       'ADMIN_NETWORK_TYPE_LIST_TITLE' => "Werbeart-Handler auflisten und verwalten",
        // - Link titles
        'ADMIN_NETWORK_LIST_TYPES_LINK_TITLE' => "Weiter zu den Werbearten",
        'ADMIN_NETWORK_LIST_PARAMS_LINK_TITLE' => "Weiter zu den Abfrageparametern",
        'ADMIN_NETWORK_LIST_CODE_TYPES_LINK_TITLE' => "Weiter zu den Rückgabewerten",
        'ADMIN_NETWORK_LIST_CODES_LINK_TITLE' => "Weiter zu den Fehlercodes",
-       'ADMIN_NETWORK_ADDED_TITLE' => "Allgemeine Werbenetzwerkdaten hinzugefügt.",
-       'ADMIN_NETWORK_TYPE_ADDED_TITLE' => "Werbeart-Handler hinzugefügt.",
-       'ADMIN_NETWORK_TYPE_LIST_TITLE' => "Werbeart-Handler auflisten und verwalten",
        // - Buttons
        'ADMIN_NETWORK_ADD' => "Allgemeine Daten anlegen",
        'ADMIN_NETWORK_EDIT' => "Editieren",
@@ -82,6 +81,10 @@ addMessages(array(
        'ADMIN_NETWORK_TYPE_EDIT' => "Editieren",
        'ADMIN_NETWORK_TYPE_DELETE' => "Löschen",
        'ADMIN_NETWORK_TYPE_CHANGE' => "Handler ändern",
+       'ADMIN_NETWORK_TYPE_REMOVE' => "Handler entfernen",
+       // - Success titles
+       'ADMIN_NETWORK_ADDED_TITLE' => "Allgemeine Werbenetzwerkdaten hinzugefügt.",
+       'ADMIN_NETWORK_TYPE_ADDED_TITLE' => "Werbeart-Handler hinzugefü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 Dateen gel&ouml;scht.",

diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php
index b19a5ede3de1353633e91e275f02c0c4b0afdde6..b97060e9d45387c3f771c52848e1861c5b6b6f07 100644 (file)
--- a/inc/libs/network_functions.php
+++ b/inc/libs/network_functions.php
@@ -371,6 +371,9 @@ function doAdminNetworkProcessHandlenetworktypeForm () {
                                                // Add row template for deleting
                                                $OUT .= loadTemplate('admin_edit_network_types_row', true, $networkTypeData);
                                        } elseif (isPostRequestElementSet('del')) {
+                                               // Fix empty banner URL
+                                               if (trim($networkTypeData['network_type_banner_url']) == '') $networkTypeData['network_type_banner_url'] = '---';
+
                                                // Add row template for deleting
                                                $OUT .= loadTemplate('admin_del_network_types_row', true, $networkTypeData);
                                        } else {

diff --git a/templates/de/html/admin/admin_del_network_types.tpl b/templates/de/html/admin/admin_del_network_types.tpl
new file mode 100644 (file)
index 0000000..cb30e90
--- /dev/null
+++ b/templates/de/html/admin/admin_del_network_types.tpl
@@ -0,0 +1,27 @@
+<div align="center">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=list_network_types&amp;do=removenetworktype%}" method="post">
+<table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
+       <tr>
+               <td align="center" class="admin_title bottom" height="25" colspan="2">
+                       <div>
+                               <strong>{--ADMIN_NETWORK_TYPE_DELETE_TITLE--}</strong>
+                       </div>
+                       <div class="tiny">
+                               (<a href="$content[network_data][network_reflink]" title="$content[network_data][network_title]" target="_blank">$content[network_data][network_title]</a>)
+                       </div>
+               </td>
+       </tr>
+       $content[rows]
+       <tr>
+               <td colspan="2" class="admin_footer">
+                       <input type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />
+                       <input type="submit" name="remove" class="admin_delete" value="{--ADMIN_NETWORK_TYPE_REMOVE--}" />
+               </td>
+       </tr>
+</table>
+</form>
+
+<div class="admin_note">
+       {--ADMIN_NETWORK_TYPE_LIST_NOTE--}
+</div>
+</div>

diff --git a/templates/de/html/admin/admin_del_network_types_row.tpl b/templates/de/html/admin/admin_del_network_types_row.tpl
new file mode 100644 (file)
index 0000000..e4e1578
--- /dev/null
+++ b/templates/de/html/admin/admin_del_network_types_row.tpl
@@ -0,0 +1,25 @@
+<tr>
+       <td class="switch_sw$content[sw]" style="padding-left:5px">{--ADMIN_NETWORK_TYPE_HANDLE--}:</td>
+       <td class="switch_sw$content[sw]">
+               <input type="hidden" name="sel[$content[network_id]]" value="1" />
+               $content[network_type_handle]
+       </td>
+</tr>
+<tr>
+       <td class="switch_sw$content[sw]" style="padding-left:5px">{--ADMIN_NETWORK_TYPE_API_URL--}:</td>
+       <td class="switch_sw$content[sw]">
+               $content[network_type_api_url]
+       </td>
+</tr>
+<tr>
+       <td class="switch_sw$content[sw]" style="padding-left:5px">{--ADMIN_NETWORK_TYPE_CLICK_URL--}:</td>
+       <td class="switch_sw$content[sw]">
+               $content[network_type_click_url]
+       </td>
+</tr>
+<tr>
+       <td class="switch_sw$content[sw] bottom" style="padding-left:5px">{--ADMIN_NETWORK_TYPE_BANNER_URL--}:</td>
+       <td class="switch_sw$content[sw] bottom">
+               $content[network_type_banner_url]
+       </td>
+</tr>

diff --git a/templates/de/html/admin/admin_del_networks_row.tpl b/templates/de/html/admin/admin_del_networks_row.tpl
index a456914323cf57d8fa263210f1cfe4bd11e2e8a8..2222e1295db4b6788f105ffd0f11e3aede8d5a84 100644 (file)
--- a/templates/de/html/admin/admin_del_networks_row.tpl
+++ b/templates/de/html/admin/admin_del_networks_row.tpl
@@ -1,4 +1,3 @@
-<tr><td colspan="4" class="switch_sw$content[sw] seperator" height="5">&nbsp;</td></tr>
 <tr>
        <td class="switch_sw$content[sw]" style="padding-left:5px">{--ADMIN_NETWORK_TITLE--}:</td>
        <td class="switch_sw$content[sw]">
@@ -10,7 +9,6 @@
                $content[network_short_name]
        </td>
 </tr>
-<tr><td colspan="4" class="switch_sw$content[sw] seperator" height="5">&nbsp;</td></tr>
 <tr>
        <td class="switch_sw$content[sw]" style="padding-left:5px">{--ADMIN_NETWORK_REFLINK--}:</td>
        <td class="switch_sw$content[sw]">
@@ -21,7 +19,6 @@
                $content[network_data_seperator]
        </td>
 </tr>
-<tr><td colspan="4" class="switch_sw$content[sw] seperator" height="5">&nbsp;</td></tr>
 <tr>
        <td class="switch_sw$content[sw]" style="padding-left:5px">{--ADMIN_NETWORK_REQUEST_TYPE--}:</td>
        <td class="switch_sw$content[sw]">
@@ -32,12 +29,10 @@
                $content[network_row_seperator]
        </td>
 </tr>
-<tr><td colspan="4" class="switch_sw$content[sw] seperator" height="5">&nbsp;</td></tr>
 <tr>
-       <td class="switch_sw$content[sw]" style="padding-left:5px">{--ADMIN_NETWORK_CHARSET--}:</td>
-       <td class="switch_sw$content[sw]">
+       <td class="switch_sw$content[sw] bottom" style="padding-left:5px">{--ADMIN_NETWORK_CHARSET--}:</td>
+       <td class="switch_sw$content[sw] bottom">
                $content[network_charset]
        </td>
-       <td class="switch_sw$content[sw] seperator" colspan="2">&nbsp;</td>
+       <td class="switch_sw$content[sw] bottom seperator" colspan="2">&nbsp;</td>
 </tr>
-<tr><td colspan="4" class="bottom switch_sw$content[sw] seperator" height="6">&nbsp;</td></tr>

diff --git a/templates/de/html/admin/admin_edit_network_types.tpl b/templates/de/html/admin/admin_edit_network_types.tpl
index 023d068c52e73127a451518e9947caeae73d1e24..f0bdc6be6a7472ef767590fae0238c5396e67c14 100644 (file)
--- a/templates/de/html/admin/admin_edit_network_types.tpl
+++ b/templates/de/html/admin/admin_edit_network_types.tpl
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=list_networks&amp;network=$content[network_data][network_id]&amp;do=changenetworktype%}" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=list_network_types&amp;network=$content[network_data][network_id]&amp;do=changenetworktype%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td align="center" class="admin_title bottom" height="25" colspan="2">

diff --git a/templates/de/html/admin/admin_edit_networks_row.tpl b/templates/de/html/admin/admin_edit_networks_row.tpl
index cf4da8d96274fe6df2e57351d566ced85da8f050..112153658be1446acf6e8ea9f37ca53622fc8a5f 100644 (file)
--- a/templates/de/html/admin/admin_edit_networks_row.tpl
+++ b/templates/de/html/admin/admin_edit_networks_row.tpl
@@ -1,4 +1,3 @@
-<tr><td colspan="4" class="switch_sw$content[sw] seperator" height="5">&nbsp;</td></tr>
 <tr>
        <td class="switch_sw$content[sw]" style="padding-left:5px">{--ADMIN_NETWORK_TITLE--}:</td>
        <td class="switch_sw$content[sw]">
@@ -10,7 +9,6 @@
                <input type="text" name="network_short_name[$content[network_id]]" class="admin_normal" size="10" maxlength="50" value="$content[network_short_name]" />
        </td>
 </tr>
-<tr><td colspan="4" class="switch_sw$content[sw] seperator" height="5">&nbsp;</td></tr>
 <tr>
        <td class="switch_sw$content[sw]" style="padding-left:5px">{--ADMIN_NETWORK_REFLINK--}:</td>
        <td class="switch_sw$content[sw]">
@@ -21,7 +19,6 @@
                <input type="text" name="network_data_seperator[$content[network_id]]" class="admin_normal" size="4" maxlength="4" value="$content[network_data_seperator]" />
        </td>
 </tr>
-<tr><td colspan="4" class="switch_sw$content[sw] seperator" height="5">&nbsp;</td></tr>
 <tr>
        <td class="switch_sw$content[sw]" style="padding-left:5px">{--ADMIN_NETWORK_REQUEST_TYPE--}:</td>
        <td class="switch_sw$content[sw]">
@@ -34,12 +31,10 @@
                <input type="text" name="network_row_seperator[$content[network_id]]" class="admin_normal" size="4" maxlength="4" value="$content[network_row_seperator]" />
        </td>
 </tr>
-<tr><td colspan="4" class="switch_sw$content[sw] seperator" height="5">&nbsp;</td></tr>
 <tr>
-       <td class="switch_sw$content[sw]" style="padding-left:5px">{--ADMIN_NETWORK_CHARSET--}:</td>
-       <td class="switch_sw$content[sw]">
+       <td class="switch_sw$content[sw] bottom" style="padding-left:5px">{--ADMIN_NETWORK_CHARSET--}:</td>
+       <td class="switch_sw$content[sw] bottom">
                <input type="text" name="network_charset[$content[network_id]]" class="admin_normal" size="15" maxlength="20" value="$content[network_charset]" />
        </td>
-       <td class="switch_sw$content[sw] seperator" colspan="2">&nbsp;</td>
+       <td class="switch_sw$content[sw] bottom seperator" colspan="2">&nbsp;</td>
 </tr>
-<tr><td colspan="4" class="bottom switch_sw$content[sw] seperator" height="6">&nbsp;</td></tr>