Cases (switch command) on numbers fixed, German language strings fixed

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index 64fb5c3a211c466035b40e7898cdcc9ca7b6b207..dce5f6d7af0763d8fd08e702e2199e24ca399f0e 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -709,10 +709,10 @@ function generateDateTime ($time, $mode = '0') {
        switch (getLanguage()) {
                case 'de': // German date / time format
                        switch ($mode) {
-                               case 0: $ret = date("d.m.Y \u\m H:i \U\h\\r", $time); break;
-                               case 1: $ret = strtolower(date('d.m.Y - H:i', $time)); break;
-                               case 2: $ret = date('d.m.Y|H:i', $time); break;
-                               case 3: $ret = date('d.m.Y', $time); break;
+                               case '0': $ret = date("d.m.Y \u\m H:i \U\h\\r", $time); break;
+                               case '1': $ret = strtolower(date('d.m.Y - H:i', $time)); break;
+                               case '2': $ret = date('d.m.Y|H:i', $time); break;
+                               case '3': $ret = date('d.m.Y', $time); break;
                                default:
                                        logDebugMessage(__FUNCTION__, __LINE__, sprintf("Invalid date mode %s detected.", $mode));
                                        break;
@@ -721,10 +721,10 @@ function generateDateTime ($time, $mode = '0') {
 
                default: // Default is the US date / time format!
                        switch ($mode) {
-                               case 0: $ret = date('r', $time); break;
-                               case 1: $ret = date('Y-m-d - g:i A', $time); break;
-                               case 2: $ret = date('y-m-d|H:i', $time); break;
-                               case 3: $ret = date('y-m-d', $time); break;
+                               case '0': $ret = date('r', $time); break;
+                               case '1': $ret = date('Y-m-d - g:i A', $time); break;
+                               case '2': $ret = date('y-m-d|H:i', $time); break;
+                               case '3': $ret = date('y-m-d', $time); break;
                                default:
                                        logDebugMessage(__FUNCTION__, __LINE__, sprintf("Invalid date mode %s detected.", $mode));
                                        break;
@@ -3186,9 +3186,6 @@ function determineReferalId () {
                // Default is not found
                $found = false;
 
-               // Set current userid here if no member
-               if (!isMember()) setCurrentUserId($GLOBALS['refid']);
-
                // Do we have nickname or userid set?
                if (isNicknameUsed($GLOBALS['refid'])) {
                        // Nickname in URL, so load the id