'close' not 'Close' and PagePeel added to ext-network

diff --git a/DOCS/de/network/README.txt b/DOCS/de/network/README.txt
index fcb231be992c9ad6f87fc54e3d898bf51b1ed1f5..00e1a5189fa3e3e41ec15abdbc7b537f923a6aa8 100644 (file)
--- a/DOCS/de/network/README.txt
+++ b/DOCS/de/network/README.txt
@@ -3,7 +3,9 @@ Verwendbar Platzhalter fuer URLs:
 
 ID = Ihre Werbenetz-Id (meistens die Sie zum Einloggen verwenden)
 SID = Die Seiten-Id Ihrer Eingetragen Webseite
+BID = Banner-Id (z.B. Forcedbanner oder Bannerklick/-view)
 
-Diese Platzhalter muessen in Prozenten eingeschlossen in die URL eingebunden sein. Beispiel:
+Diese Platzhalter muessen in Prozenten eingeschlossen in die URL eingebunden sein.
 
+Beispiel:
 http://www.anbieter-name.invalid/code/t-mail.php?id=%ID%&sid=%SID%

diff --git a/inc/functions.php b/inc/functions.php
index f54d18693db3cc0ef999edbe1683b2e2665e991e..267aa18fe387779e27ab8d990e9404f96e2e1be9 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1764,7 +1764,7 @@ function sendGetRequest ($script, $data = array()) {
        $request .= 'Cache-Control: no-cache' . getConfig('HTTP_EOL');
        $request .= 'Content-Type: text/plain' . getConfig('HTTP_EOL');
        $request .= 'Content-Length: '.strlen($body) . getConfig('HTTP_EOL');
-       $request .= 'Connection: Close' . getConfig('HTTP_EOL') . getConfig('HTTP_EOL');
+       $request .= 'Connection: close' . getConfig('HTTP_EOL') . getConfig('HTTP_EOL');
 
        // Send the raw request
        $response = sendRawRequest($host, $request);
@@ -1795,7 +1795,7 @@ function sendPostRequest ($script, $postData) {
        $request .= 'User-Agent: ' . getConfig('TITLE') . '/' . getConfig('FULL_VERSION') . getConfig('HTTP_EOL');
        $request .= 'Cache-Control: no-cache' . getConfig('HTTP_EOL');
        $request .= 'Content-Type: application/x-www-form-urlencoded' . getConfig('HTTP_EOL');
-       $request .= 'Connection: Close' . getConfig('HTTP_EOL') . getConfig('HTTP_EOL');
+       $request .= 'Connection: close' . getConfig('HTTP_EOL') . getConfig('HTTP_EOL');
        $request .= $body;
 
        // Send the raw request

diff --git a/inc/language/network_de.php b/inc/language/network_de.php
index 23d04a3f4de161b6b71ecb0cc097d9fc27ec04ea..1891b50a2b8b2b8ba1c7ed97765784470ec38391 100644 (file)
--- a/inc/language/network_de.php
+++ b/inc/language/network_de.php
@@ -104,6 +104,7 @@ addMessages(array(
        'ADMIN_NETWORK_TYPE_LEAD' => "Lead",
        'ADMIN_NETWORK_TYPE_SALE' => "Sale",
        'ADMIN_NETWORK_TYPE_PAYPERACTIVE' => "PayPerAktiv",
+       'ADMIN_NETWORK_TYPE_PAGEPEEL' => "Page-Peel",
        // - Sponsor networks
        'ADMIN_NETWORK_NONE_SUPPORTED' => "Es sind noch keine Werbenetzwerke eingerichtet.",
        'ADMIN_NETWORK_SHORT_NAME' => "Kurzname",

diff --git a/inc/modules/admin/what-list_network_types.php b/inc/modules/admin/what-list_network_types.php
index 2a584e54b74c3fa4176074a562be3f7efd161561..1ac9a764aaaac87d0a94be7227680e70f1633107 100644 (file)
--- a/inc/modules/admin/what-list_network_types.php
+++ b/inc/modules/admin/what-list_network_types.php
@@ -66,7 +66,7 @@ FROM
 WHERE
        `network_id`=%s
 ORDER BY
-       `network_type_id` ASC",
+       `network_type_handle` ASC",
                array(getRequestElement('network')), __FILE__, __LINE__);
 
        // Do we have entries?

diff --git a/templates/de/html/admin/admin_add_network_type.tpl b/templates/de/html/admin/admin_add_network_type.tpl
index 217a572e939f9336f95dcefb4481e43651035815..8d6d54be1a29ac669d03cf01af3924c70288eae6 100644 (file)
--- a/templates/de/html/admin/admin_add_network_type.tpl
+++ b/templates/de/html/admin/admin_add_network_type.tpl
@@ -25,6 +25,7 @@
                                <option value="lead">{--ADMIN_NETWORK_TYPE_LEAD--}</option>
                                <option value="sale">{--ADMIN_NETWORK_TYPE_SALE--}</option>
                                <option value="payperactive">{--ADMIN_NETWORK_TYPE_PAYPERACTIVE--}</option>
+                               <option value="pagepeel">{--ADMIN_NETWORK_TYPE_PAGEPEEL--}</option>
                        </select>
                </td>
        </tr>