// Male/female or company?
switch ($gender) {
- case 'M': $ret = '{--GENDER_M--}'; break;
- case 'F': $ret = '{--GENDER_F--}'; break;
- case 'C': $ret = '{--GENDER_C--}'; break;
+ case 'M': // Male
+ case 'F': // Female
+ case 'C': // Company
+ $ret = sprintf("{--GENDER_%s--}", $gender);
+ break;
+
default:
// Please report bugs on unknown genders
debug_report_bug(__FUNCTION__, __LINE__, sprintf("Unknown gender %s detected.", $gender));
case 'UNCONFIRMED':
case 'CONFIRMED':
case 'LOCKED':
- $ret = sprintf("{--ACCOUNT_%s--}", $status);
+ $ret = sprintf("{--ACCOUNT_STATUS_%s--}", $status);
break;
case '':
case null:
- $ret = '{--ACCOUNT_DELETED--}';
+ $ret = '{--ACCOUNT_STATUS_DELETED--}';
break;
default:
// Please report all unknown status
- debug_report_bug(__FUNCTION__, __LINE__, sprintf("Unknown status %s detected.", $status));
+ debug_report_bug(__FUNCTION__, __LINE__, sprintf("Unknown status %s(%s) detected.", $status, gettype($status)));
break;
} // END - switch
} // END - if
// Default error code if unknown account status
- $errorCode = getCode('UNKNOWN_STATUS');
+ $errorCode = getCode('ACCOUNT_STATUS_UNKNOWN');
// Generate constant name
- $codeName = sprintf("ACCOUNT_%s", strtoupper($status));
+ $codeName = sprintf("ACCOUNT_STATUS_%s", strtoupper($status));
// Is the constant there?
if (isCodeSet($codeName)) {
case getCode('ACCOUNT_UNCONFIRMED'): $message = '{--LOGIN_STATUS_UNCONFIRMED--}'; break;
case getCode('COOKIES_DISABLED') : $message = '{--LOGIN_COOKIES_DISABLED--}'; break;
case getCode('BEG_SAME_AS_OWN') : $message = '{--BEG_SAME_UID_AS_OWN--}'; break;
- case getCode('LOGIN_FAILED') : $message = '{--LOGIN_FAILED_GENERAL--}'; break;
+ case getCode('LOGIN_FAILED') : $message = '{--GUEST_LOGIN_FAILED_GENERAL--}'; break;
case getCode('MODULE_MEMBER_ONLY') : $message = getMaskedMessage('MODULE_MEMBER_ONLY', getRequestParameter('mod')); break;
case getCode('OVERLENGTH') : $message = '{--MEMBER_TEXT_OVERLENGTH--}'; break;
case getCode('URL_FOUND') : $message = '{--MEMBER_TEXT_CONTAINS_URL--}'; break;