Even more fixes/improvements:

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index f010daf758244f3a06b1538c472f104d1515ac69..59f6307c2d1acffe013c6fa968bc7d629caf32b0 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -471,9 +471,6 @@ function loadEmailTemplate ($template, $content = array(), $userid = '0') {
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "content()=".count($content)." - AFTER<br />");
        } // END - if
 
-       // Translate M to male or F to female if present
-       if (isset($content['gender'])) $content['gender'] = translateGender($content['gender']);
-
        // Overwrite email from data if present
        if (isset($content['email'])) $email = $content['email'];
 
@@ -874,24 +871,24 @@ function translateUserStatus ($status) {
 // "Translates" 'visible' and 'locked' to a CSS class
 function translateMenuVisibleLocked ($content, $prefix = '') {
        // Translate 'visible' and keep an eye on the prefix
-       switch ($content[$prefix . 'visible']) {
+       switch ($content['visible']) {
                // Should be visible
-               case 'Y': $content[$prefix . 'visible_css'] = $prefix . 'menu_visible'  ; break;
-               case 'N': $content[$prefix . 'visible_css'] = $prefix . 'menu_invisible'; break;
+               case 'Y': $content['visible_css'] = $prefix . 'menu_visible'  ; break;
+               case 'N': $content['visible_css'] = $prefix . 'menu_invisible'; break;
                default:
                        // Please report this
-                       debug_report_bug(__FUNCTION__, __LINE__, 'Unsupported visible value detected. content=<pre>'.print_r($content, true).'</pre>');
+                       debug_report_bug(__FUNCTION__, __LINE__, 'Unsupported visible value detected. content=<pre>' . print_r($content, true) . '</pre>');
                        break;
        } // END - switch
 
        // Translate 'locked' and keep an eye on the prefix
-       switch ($content[$prefix . 'locked']) {
+       switch ($content['locked']) {
                // Should be locked
-               case 'Y': $content[$prefix . 'locked_css'] = $prefix . 'menu_locked'  ; break;
-               case 'N': $content[$prefix . 'locked_css'] = $prefix . 'menu_unlocked'; break;
+               case 'Y': $content['locked_css'] = $prefix . 'menu_locked'  ; break;
+               case 'N': $content['locked_css'] = $prefix . 'menu_unlocked'; break;
                default:
                        // Please report this
-                       debug_report_bug(__FUNCTION__, __LINE__, 'Unsupported locked value detected. content=<pre>'.print_r($content, true).'</pre>');
+                       debug_report_bug(__FUNCTION__, __LINE__, 'Unsupported locked value detected. content=<pre>' . print_r($content, true) . '</pre>');
                        break;
        } // END - switch
 
@@ -899,6 +896,25 @@ function translateMenuVisibleLocked ($content, $prefix = '') {
        return $content;
 }
 
+// "Getter" for menu CSS classes, mainly used in templates
+function getMenuCssClasses ($data) {
+       // $data needs to be converted into an array
+       $content = explode('|', $data);
+
+       // Non-existent index 2 will happen in menu blocks
+       if (!isset($content[2])) $content[2] = '';
+
+       // Re-construct the array: 0=visible,1=locked,2=prefix
+       $content['visible'] = $content[0];
+       $content['locked']  = $content[1];
+
+       // Call our "translator" function
+       $content = translateMenuVisibleLocked($content, $content[2]);
+
+       // Return CSS classes
+       return ($content['visible_css'] . ' ' . $content['locked_css']);
+}
+
 // Generates an URL for the dereferer
 function generateDerefererUrl ($URL) {
        // Don't de-refer our own links!
@@ -1109,7 +1125,7 @@ function compileRawCode ($code, $simple = false, $constants = true, $full = true
                        if ($fuzzyFound === true) continue;
 
                        // Take all string elements
-                       if ((is_string($matches[4][$key])) && (!isset($matchesFound[$match])) && (!isset($matchesFound[$key."_" . $matches[4][$key]]))) {
+                       if ((is_string($matches[4][$key])) && (!isset($matchesFound[$match])) && (!isset($matchesFound[$key.'_' . $matches[4][$key]]))) {
                                // Replace it in the code
                                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "key={$key},match={$match}<br />");
                                $newMatch = str_replace('[', "['", str_replace(']', "']", $match));
@@ -1190,7 +1206,7 @@ function addSelectionBox ($type, $default, $prefix = '', $id = '0', $class = 're
                $OUT .= '<select name="' . $prefix . '" class="' . $class . '" size="1">';
        } else {
                // Begin with regular selection box here
-               if (!empty($prefix)) $prefix .= "_";
+               if (!empty($prefix)) $prefix .= '_';
                $type2 = $type;
                if ($id > 0) $type2 .= '[' . $id . ']';
                $OUT .= '<select name="' . strtolower($prefix . $type2) . '" class="' . $class . '" size="1">';
@@ -2611,11 +2627,11 @@ function getMessageFromErrorCode ($code) {
                case getCode('COOKIES_DISABLED')   : $message = getMessage('LOGIN_COOKIES_DISABLED'); break;
                case getCode('BEG_SAME_AS_OWN')    : $message = getMessage('BEG_SAME_UID_AS_OWN'); break;
                case getCode('LOGIN_FAILED')       : $message = getMessage('LOGIN_FAILED_GENERAL'); break;
-               case getCode('MODULE_MEM_ONLY')    : $message = getMaskedMessage('MODULE_MEM_ONLY', getRequestParameter('mod')); break;
+               case getCode('MODULE_MEMBER_ONLY') : $message = getMaskedMessage('MODULE_MEMBER_ONLY', getRequestParameter('mod')); break;
                case getCode('OVERLENGTH')         : $message = getMessage('MEMBER_TEXT_OVERLENGTH'); break;
                case getCode('URL_FOUND')          : $message = getMessage('MEMBER_TEXT_CONTAINS_URL'); break;
                case getCode('SUBJ_URL')           : $message = getMessage('MEMBER_SUBJ_CONTAINS_URL'); break;
-               case getCode('BLIST_URL')          : $message = "{--MEMBER_URL_BLACK_LISTED--}<br />\n{--MEMBER_BLIST_TIME--}: ".generateDateTime(getRequestParameter('blist'), 0); break;
+               case getCode('BLIST_URL')          : $message = '{--MEMBER_URL_BLACK_LISTED--}<br />{--MEMBER_BLIST_TIME--}: ' . generateDateTime(getRequestParameter('blist'), 0); break;
                case getCode('NO_RECS_LEFT')       : $message = getMessage('MEMBER_SELECTED_MORE_RECS'); break;
                case getCode('INVALID_TAGS')       : $message = getMessage('MEMBER_HTML_INVALID_TAGS'); break;
                case getCode('MORE_POINTS')        : $message = getMessage('MEMBER_MORE_POINTS_NEEDED'); break;
@@ -3666,9 +3682,6 @@ function sendModeMails ($mod, $modes) {
                        // Load the data
                        $content = getUserDataArray();
 
-                       // Translate gender
-                       $content['gender'] = translateGender($content['gender']);
-
                        // Clear/init the content variable
                        $content['message'] = '';