* Member template added for the surfbar which notifies the user that the URL is

[mailer.git] / inc / extensions / ext-transfer.php

diff --git a/inc/extensions/ext-transfer.php b/inc/extensions/ext-transfer.php
index 9f8f0731b51191e5dea3597208ea1ec099ff9a2c..9f984f1c1d5ef3d42c82c48cd2b470333e993294 100644 (file)
--- a/inc/extensions/ext-transfer.php
+++ b/inc/extensions/ext-transfer.php
@@ -83,7 +83,7 @@ PRIMARY KEY(id)
 ) Type=MyISAM";
 
        // Admin menu
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('transfer', '', '{!POINTS!}-Transfer', 'Verwalten Sie hier die {!POINTS!}-Transaktionen zwischen Ihren Mitgliedern.', 7)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('transfer', NULL, '{!POINTS!}-Transfer', 'Verwalten Sie hier die {!POINTS!}-Transaktionen zwischen Ihren Mitgliedern.', 7)";
        $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('transfer', 'list_transfer', 'Auflisten', 'Hier bekommen Sie alle ein- und ausgehende Transaktionen aufgelistet.', 1)";
        $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('transfer', 'config_transfer', 'Einstellungen', 'Stellen Sie ein, wie viele Transaktionen aufgelistet werden sollen und wie alt diese werden dürfen. Die evtl. installierte autopurge-Erweiterung kann dann automatisch die veralteten Transktionen löschen.', 2)";
        $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('transfer', 'del_transfer', 'Manuell löschen', 'Hier können Sie - abgesehen von der automatischen Löschung - Transaktionen selber löschen. Bitte beachten Sie, dass immer aus- und eingehende Transaktionen gleichzeitig gelöscht werden.', 3)";
@@ -237,9 +237,9 @@ case "update": // Update an extension
                break;
 
        case "0.2.3": // SQL queries for v0.2.3
-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu_las (la_id, la_action, la_what) VALUES ('member', '', 'list_transfer')";
-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu_las (la_id, la_action, la_what) VALUES ('member', '', 'del_transfer')";
-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu_las (la_id, la_action, la_what) VALUES ('config', '', 'config_transfer')";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu_las (la_id, la_action, la_what) VALUES ('member', NULL, 'list_transfer')";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu_las (la_id, la_action, la_what) VALUES ('member', NULL, 'del_transfer')";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu_las (la_id, la_action, la_what) VALUES ('config', NULL, 'config_transfer')";
 
                // Depends on sql_patches (or you have to execute these both SQL statements by phpMyAdmin
                $EXT_UPDATE_DEPENDS = "sql_patches";
@@ -283,22 +283,11 @@ case "update": // Update an extension
        break;
 
 default: // Do stuff when extension is loaded
-       $DUMMY = LOAD_CONFIG("0");
-       // Maximum of listed transfers for out- and in-transfers
-       $_CONFIG['transfer_max']     = $DUMMY['transfer_max'];
-       // Age in seconds
-       $_CONFIG['transfer_age']     = $DUMMY['transfer_age'];
-       // Lock timeout for member settings
-       $_CONFIG['transfer_timeout'] = $DUMMY['transfer_timeout'];
-       // Balance after points transfer
-       $_CONFIG['transfer_balance'] = $DUMMY['transfer_balance'];
-       // Length of touring code
-       $_CONFIG['transfer_code']    = $DUMMY['transfer_code'];
-       // Length of touring code
-       $_CONFIG['ap_transfer']      = $DUMMY['ap_transfer'];
-       unset($DUMMY);
-
-       if ((defined('__DAILY_RESET')) && ($_CONFIG['ap_transfer'] == 'Y'))
+       $dummy = LOAD_CONFIG();
+       $_CONFIG = array_merge($_CONFIG, $dummy);
+       unset($dummy);
+
+       if ((defined('__DAILY_RESET')) && ($_CONFIG['ap_transfer'] == "Y"))
        {
                // Automatically remove outdated or not displayed transactions
                TRANSFER_AUTPPURGE($_CONFIG['transfer_max'], $_CONFIG['transfer_age']);
@@ -309,7 +298,7 @@ default: // Do stuff when extension is loaded
 $EXT_LANG_PREFIX = "transfer";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = 'N';
+$EXT_ALWAYS_ACTIVE = "N";
 
 //
 ?>