More fixes/missing language id added

diff --git a/inc/language/coupon_de.php b/inc/language/coupon_de.php
index 58efbaf453b08ddc6b8c0abc0c585816ab7bcd7b..81493bcf2113f897227ebc21036aa7103bfc6b16 100644 (file)
--- a/inc/language/coupon_de.php
+++ b/inc/language/coupon_de.php
@@ -57,6 +57,7 @@ addMessages(array(
        'ADMIN_SEND_COUPON' => "Gutschein versenden",
        'ADMIN_SEND_COUPON_POINTS_NOT_ENTERED' => "Bitte geben Sie eine Vergütung (in {?POINTS?}) ein.",
        'ADMIN_SEND_COUPON_DESCRIPTION_NOT_ENTERED' => "Bitte geben Sie eine kurze Beschreibung (oder einen Hinweis an Ihre Mitglieder) ein.",
+       'ADMIN_SEND_COUPON_USER_404' => "Es wurden keine empfangsbereiten Mitglieder gefunden!",
        'ADMIN_SEND_COUPON_DONE' => "Es wurde ein Gutschein an alle empfangsbereiten Mitglieder versendet.",
 
        // Admin - More

diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index f1c329ea0b8b5f06d6ebb068aef9407e32033330..20d35c2ce7ea735a8b882016511ea22486a368a8 100644 (file)
--- a/inc/libs/register_functions.php
+++ b/inc/libs/register_functions.php
@@ -305,7 +305,7 @@ function doRegistration () {
        } // END - if
 
        // Second: active rallye
-       if (!isBonusNewMemberNotifyEnabled()) {
+       if ((isExtensionActive('bonus')) && (!isBonusNewMemberNotifyEnabled())) {
                $GLOBALS['register_sql_columns'] .= ', `bonus_rallye_enable_notify`, `bonus_rallye_disable_notify`';
                $GLOBALS['register_sql_data']    .= ', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()';
        } // END - if

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 5afeccf214ffddec9ce887fae0741f8ef6e39162..8936a5a27ab69acb59aaaa1a4801cb423dba2324 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -2068,7 +2068,7 @@ function getPointsColumnNameFromExtensionNameLocked ($ext_name, $isLocked) {
        } // END - if
 
        // Return the result
-       return $columName;
+       return $columnName;
 }
 
 // Determines the payment method for given extension and 'locked'
@@ -2086,7 +2086,7 @@ function getPaymentMethodFromExtensionName ($ext_name) {
        $paymentMethod = $pointsData['payment_method'];
 
        // Return the result
-       return $columName;
+       return $paymentMethod;
 }
 
 // [EOF]

diff --git a/inc/template-functions.php b/inc/template-functions.php
index 7d5e670a2c2eb9b2c4bb0ed47aa5c6da240476c8..829c80fea130af34e936297b514061d4897d51ed 100644 (file)
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -694,7 +694,7 @@ function addSelectionBox ($type, $default, $prefix = '', $id = '0', $class = 'fo
                        $year = getYear();
 
                        // Use configured min age or fixed?
-                       if (isExtensionInstalledAndNewer('order', '0.2.1')) {
+                       if (isExtensionInstalledAndNewer('other', '0.2.1')) {
                                // Configured
                                $startYear = $year - getConfig('min_age');
                        } else {
@@ -721,7 +721,7 @@ function addSelectionBox ($type, $default, $prefix = '', $id = '0', $class = 'fo
                                // Get current year and subtract the configured minimum age
                                $OUT .= '<option value="' . ($minYear - 1) . '">&lt;' . $minYear . '</option>';
                                // Calculate earliest year depending on extension version
-                               if (isExtensionInstalledAndNewer('order', '0.2.1')) {
+                               if (isExtensionInstalledAndNewer('other', '0.2.1')) {
                                        // Use configured minimum age
                                        $year = getYear() - getConfig('min_age');
                                } else {