} elseif (!IS_MEMBER()) {
LOAD_URL("modules.php?module=index");
} elseif ((!EXT_IS_ACTIVE("order")) && (!IS_ADMIN())) {
- ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "order");
+ addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "order");
return;
}
ADD_DESCR("member", __FILE__);
$URL = ""; $id = 0;
-$whereStatement = " WHERE visible='Y'";
+$whereStatement = " WHERE `visible`='Y'";
// Set undefined array elements
if (empty($_GET['msg'])) $_GET['msg'] = "";
} // END - if
$result_mmails = SQL_QUERY_ESC("SELECT userid, receive_mails, mail_orders, ".$HOLIDAY."
-FROM "._MYSQL_PREFIX."_user_data
+FROM `{!_MYSQL_PREFIX!}_user_data`
WHERE userid=%s AND max_mails > 0 LIMIT 1",
array($GLOBALS['userid']), __FILE__, __LINE__);
//
// First we would like to store the data and get it's pool position back...
$result = SQL_QUERY_ESC("SELECT id, data_type
-FROM "._MYSQL_PREFIX."_pool
+FROM `{!_MYSQL_PREFIX!}_pool`
WHERE sender=%s AND url='%s' AND timestamp > (UNIX_TIMESTAMP() - %s) LIMIT 1",
array($GLOBALS['userid'], $_POST['url'], getConfig('url_tlock')), __FILE__, __LINE__);
// Test submitted text against some filters (length, URLs in text etc.)
if ((strpos(strtolower($_POST['text']), "https://") > -1) || (strpos(strtolower($_POST['text']), "http://") > -1) || (strpos(strtolower($_POST['text']), "www") > -1)) {
// URL found!
- $URL = URL."/modules.php?module=login&what=order&msg=".CODE_URL_FOUND;
+ $URL = "modules.php?module=login&what=order&msg=".constant('CODE_URL_FOUND');
} // END - if
// Remove new-line and carriage-return characters
// Text length within allowed length?
if (strlen($TEST) > getConfig('max_tlength')) {
// Text is too long!
- $URL = URL."/modules.php?module=login&what=order&msg=".CODE_OVERLENGTH;
+ $URL = "modules.php?module=login&what=order&msg=".constant('CODE_OVERLENGTH');
} // END - if
} // END - if
$_POST['subject'] = str_replace("\\", "[nl]", substr($_POST['subject'], 0, 200));
if ((strpos(strtolower($_POST['subject']), "http://") > -1) || (strpos(strtolower($_POST['subject']), "www") > -1)) {
// URL in subject found
- $URL = URL."/modules.php?module=login&what=order&msg=".CODE_SUBJ_URL;
+ $URL = "modules.php?module=login&what=order&msg=".constant('CODE_SUBJ_URL');
} // END - if
} // END - if
// And shall I check that his URL is not in the black list?
if (getConfig('url_blacklist') == "Y") {
// Ok, I do that for you know...
- $result = SQL_QUERY_ESC("SELECT UNIX_TIMESTAMP(`timestamp`) AS tstamp FROM `"._MYSQL_PREFIX."_url_blacklist` WHERE `url`='%s' LIMIT 1",
+ $result = SQL_QUERY_ESC("SELECT UNIX_TIMESTAMP(`timestamp`) AS tstamp FROM `{!_MYSQL_PREFIX!}_url_blacklist` WHERE `url`='%s' LIMIT 1",
array($_POST['url']), __FILE__, __LINE__);
if (SQL_NUMROWS($result) == 1) {
list($blist) = SQL_FETCHROW($result);
// Create redirect-URL
- $URL = URL."/modules.php?module=login&what=order&msg=".CODE_BLIST_URL."&blist=".$blist;
+ $URL = "modules.php?module=login&what=order&msg=".constant('CODE_BLIST_URL')."&blist=".$blist;
} // END - if
// Free result
// Enougth receivers entered?
if (($_POST['receiver'] < getConfig('order_min')) && (!IS_ADMIN())) {
// Less than allowed receivers entered!
- $URL = URL."/modules.php?module=login&what=order&msg=".CODE_MORE_RECEIVERS3;
+ $URL = "modules.php?module=login&what=order&msg=".constant('CODE_MORE_RECEIVERS3');
} // END - if
// Validate URL
if (!VALIDATE_URL($_POST['url'])) {
// URL is invalid!
- $URL = URL."/modules.php?module=login&what=order&msg=".CODE_INVALID_URL;
+ $URL = "modules.php?module=login&what=order&msg=".constant('CODE_INVALID_URL');
} // END - if
// Probe for HTML extension
$_POST['text'] = HTML_CHECK_TAGS($_POST['text']);
// Maybe invalid tags found?
- if (empty($_POST['text'])) $URL = URL."/modules.php?module=login&what=order&msg=".CODE_INVALID_TAGS."&id=".$id;
+ if (empty($_POST['text'])) $URL = "modules.php?module=login&what=order&msg=".constant('CODE_INVALID_TAGS')."&id=".$id;
} else {
// Remove any HTML code
$_POST['text'] = str_replace("<", "{OPEN_HTML}", str_replace(">", "{CLOSE_HTML}", $_POST['text']));
}
} elseif (!IS_ADMIN()) {
// He has already sent a mail within a specific time
- $URL = URL."/modules.php?module=login&what=order&msg=".CODE_URL_TLOCK."&id=".$id;
+ $URL = "modules.php?module=login&what=order&msg=".constant('CODE_URL_TLOCK')."&id=".$id;
}
// Still no error?
} // END - if
// Check for userids
- $result = SQL_QUERY_ESC("SELECT DISTINCT c.userid FROM "._MYSQL_PREFIX."_user_cats AS c
-LEFT JOIN `"._MYSQL_PREFIX."_user_data` AS d
+ $result = SQL_QUERY_ESC("SELECT DISTINCT c.userid FROM `{!_MYSQL_PREFIX!}_user_cats` AS c
+LEFT JOIN `{!_MYSQL_PREFIX!}_user_data` AS d
ON c.userid=d.userid
-WHERE c.cat_id=%s AND c.userid != '%s' AND d.status='CONFIRMED' AND d.receive_mails > 0".$ADD."
+WHERE c.cat_id=%s AND c.userid != '%s' AND d.`status`='CONFIRMED' AND d.receive_mails > 0".$ADD."
ORDER BY d.%s %s",
array(
bigintval($_POST['cat']),
while (list($REC) = SQL_FETCHROW($result)) {
if ($HOLIDAY) {
// Check for his holiday status
- $result_holiday = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_user_holidays
+ $result_holiday = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_user_holidays`
WHERE userid=%s AND holiday_start < UNIX_TIMESTAMP() AND holiday_end > UNIX_TIMESTAMP() LIMIT 1",
array(bigintval($REC)), __FILE__, __LINE__);
if (SQL_NUMROWS($result_holiday) == 1) $REC = 0; // Exclude user who are in holiday
$MAX_SEND = count($TEST);
// Update receiver list
- $result = SQL_QUERY_ESC("UPDATE `"._MYSQL_PREFIX."_user_data` SET receive_mails=receive_mails-1 WHERE userid IN (%s) LIMIT %s",
+ SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET receive_mails=receive_mails-1 WHERE userid IN (%s) LIMIT %s",
array(str_replace(";", ", ", $RECEIVER), $MAX_SEND), __FILE__, __LINE__);
// Is calculated max receivers larger than wanted receivers then reset it
$id = 0;
if (EXT_IS_ACTIVE("html_mail")) {
// HTML extension is active
- $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_pool (sender, subject, text, receivers, payment_id, data_type, timestamp, url, cat_id, target_send, zip, html_msg)
+ SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_pool` (sender, subject, text, receivers, payment_id, data_type, timestamp, url, cat_id, target_send, zip, html_msg)
VALUES ('%s','%s','%s','%s','%s','TEMP','%s','%s','%s','%s','%s','%s')",
array(
$GLOBALS['userid'],
), __FILE__, __LINE__);
} else {
// No HTML extension is active
- $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_pool (sender, subject, text, receivers, payment_id, data_type, timestamp, url, cat_id, target_send, zip)
+ SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_pool` (sender, subject, text, receivers, payment_id, data_type, timestamp, url, cat_id, target_send, zip)
VALUES ('%s','%s','%s','%s','%s','TEMP','%s','%s','%s','%s','%s')",
array(
$GLOBALS['userid'],
// Change current order
if (EXT_IS_ACTIVE("html_mail")) {
// HTML extension is active
- $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_pool SET
+ SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_pool` SET
subject='%s',
text='%s',
receivers='%s',
), __FILE__, __LINE__);
} else {
// No HTML extension is active
- $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_pool SET
+ SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_pool` SET
subject='%s',
text='%s',
receivers='%s',
// Do we need to get the ID number?
if ($id == 0) {
// Order is placed as temporary. We need to get it's id for the frametester
- $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_pool WHERE sender=%s AND subject='%s' AND payment_id=%s AND data_type='TEMP' AND timestamp=%s LIMIT 1",
+ $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_pool` WHERE sender=%s AND subject='%s' AND payment_id=%s AND data_type='TEMP' AND timestamp=%s LIMIT 1",
array(
$GLOBALS['userid'],
$_POST['subject'],
}
// ID is received so we can redirect the user, used points will be added when he send's out the mail
- $URL = URL."/modules.php?module=frametester&order=".$id."";
+ $URL = "modules.php?module=frametester&order=".$id."";
} elseif ($MAX_SEND == 0) {
// Not enougth receivers found which can receive mails
- $URL = URL."/modules.php?module=login&what=order&msg=".CODE_MORE_RECEIVERS2;
+ $URL = "modules.php?module=login&what=order&msg=".constant('CODE_MORE_RECEIVERS2');
} else {
// No enougth points left!
- $URL = URL."/modules.php?module=login&what=order&msg=".CODE_MORE_POINTS;
+ $URL = "modules.php?module=login&what=order&msg=".constant('CODE_MORE_POINTS');
}
} else {
// Ordered more mails than he can send in this category
- $URL = URL."/modules.php?module=login&what=order&msg=".CODE_NO_RECS_LEFT;
+ $URL = "modules.php?module=login&what=order&msg=".constant('CODE_NO_RECS_LEFT');
}
}
} elseif ($_POST['receiver'] == "0") {
// Not enougth receivers selected
- $URL = URL."/modules.php?module=login&what=order&msg=".CODE_MORE_RECEIVERS1;
+ $URL = "modules.php?module=login&what=order&msg=".constant('CODE_MORE_RECEIVERS1');
} elseif (($ALLOWED == 0) && (getConfig('order_max_full') == "ORDER")) {
// No more mail orders allowed
- LOAD_TEMPLATE("admin_settings_saved", false, MEMBER_ORDER_ALLOWED_EXHAUSTED);
+ LOAD_TEMPLATE("admin_settings_saved", false, getMessage('MEMBER_ORDER_ALLOWED_EXHAUSTED'));
} elseif (($links < getConfig('unconfirmed')) && ($mmails == "1")) {
// Display order form
- $result_cats = SQL_QUERY("SELECT id, cat FROM "._MYSQL_PREFIX."_cats".$whereStatement." ORDER BY sort", __FILE__, __LINE__);
+ $result_cats = SQL_QUERY("SELECT id, cat FROM `{!_MYSQL_PREFIX!}_cats`".$whereStatement." ORDER BY `sort`", __FILE__, __LINE__);
if (SQL_NUMROWS($result_cats) > 0) {
if ($TOTAL > 0) {
// Initialize array...
$CATS['name'][] = $cat;
// Select users in current category
- $result_uids = SQL_QUERY_ESC("SELECT userid FROM "._MYSQL_PREFIX."_user_cats WHERE cat_id=%s AND userid != '%s' ORDER BY userid",
- array(bigintval($id), $GLOBALS['userid']), __FILE__, __LINE__);
+ $result_uids = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_cats` WHERE cat_id=%s AND userid != '%s' ORDER BY userid",
+ array(bigintval($id), $GLOBALS['userid']), __FILE__, __LINE__);
$uid_cnt = 0;
while (list($ucat) = SQL_FETCHROW($result_uids)) {
$HOL_ACTIVE = false;
if ($HOLIDAY) {
// Check user's holiday status
- $result_holiday = SQL_QUERY_ESC("SELECT DISTINCT d.userid FROM `"._MYSQL_PREFIX."_user_data` AS d
-LEFT JOIN "._MYSQL_PREFIX."_user_holidays AS h
+ $result_holiday = SQL_QUERY_ESC("SELECT DISTINCT d.userid FROM `{!_MYSQL_PREFIX!}_user_data` AS d
+LEFT JOIN `{!_MYSQL_PREFIX!}_user_holidays` AS h
ON d.userid=h.userid
-WHERE d.userid=%s AND d.receive_mails > 0 AND d.status='CONFIRMED' AND d.holiday_active='Y'
+WHERE d.userid=%s AND d.receive_mails > 0 AND d.`status`='CONFIRMED' AND d.holiday_active='Y'
AND h.holiday_start < UNIX_TIMESTAMP() AND h.holiday_end > UNIX_TIMESTAMP()
LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
if (SQL_NUMROWS($result_holiday) == 1) {
if (!$HOL_ACTIVE) {
// Check if the user want's to receive mails?
- $result_ver = SQL_QUERY_ESC("SELECT zip FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s".$HTML." AND receive_mails > 0 AND status='CONFIRMED' LIMIT 1",
- array(bigintval($ucat)), __FILE__, __LINE__);
+ $result_ver = SQL_QUERY_ESC("SELECT zip FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s".$HTML." AND receive_mails > 0 AND `status`='CONFIRMED' LIMIT 1",
+ array(bigintval($ucat)), __FILE__, __LINE__);
if ((SQL_NUMROWS($result_ver) == 1) && (!empty($_POST['zip'])) && (getConfig('order_multi_page') == "Y")) {
list($zip) = SQL_FETCHROW($result_ver);
SQL_FREERESULT($result_cats);
// Now we need to load the mail types...
- $result = SQL_QUERY("SELECT id, price, payment, mail_title FROM "._MYSQL_PREFIX."_payments ORDER BY payment", __FILE__, __LINE__);
+ $result = SQL_QUERY("SELECT id, price, payment, mail_title FROM `{!_MYSQL_PREFIX!}_payments` ORDER BY payment", __FILE__, __LINE__);
$typeS = array();
if (SQL_NUMROWS($result) > 0) {
$MSG = "";
switch ($_GET['msg'])
{
- case CODE_URL_TLOCK:
- $result = SQL_QUERY_ESC("SELECT timestamp FROM "._MYSQL_PREFIX."_pool WHERE id=%s LIMIT 1",
+ case constant('CODE_URL_TLOCK'):
+ $result = SQL_QUERY_ESC("SELECT timestamp FROM `{!_MYSQL_PREFIX!}_pool` WHERE id=%s LIMIT 1",
array(bigintval($_GET['id'])), __FILE__, __LINE__);
// Load timestamp from last order
$SEC = getConfig('url_tlock') - $STD * 60 * 60 - $MIN * 60;
// Finally contruct the message
- $MSG = MEMBER_URL_TIME_LOCK."<br />".CONFIG_URL_TLOCK." ".$STD." ".
- _HOURS.", ".$MIN." "._MINUTES." "._AND." ".$SEC." "._SECONDS."<br />".
- MEMBER_LAST_TLOCK.": ".$LORDER;
+ // @TODO Rewrite this old lost code to a template
+ $MSG = "{!MEMBER_URL_TIME_LOCK!}<br />{!CONFIG_URL_TLOCK!} ".$STD."
+ {!_HOURS!}, ".$MIN." {!_MINUTES!} {!_AND!} ".$SEC." {!_SECONDS!}<br />
+ {!MEMBER_LAST_TLOCK!}: ".$LORDER;
break;
- case CODE_OVERLENGTH:
- $MSG = MEMBER_TEXT_OVERLENGTH;
+ case constant('CODE_OVERLENGTH'):
+ $MSG = getMessage('MEMBER_TEXT_OVERLENGTH');
break;
- case CODE_URL_FOUND:
- $MSG = MEMBER_TEXT_CONTAINS_URL;
+ case constant('CODE_URL_FOUND'):
+ $MSG = getMessage('MEMBER_TEXT_CONTAINS_URL');
break;
- case CODE_SUBJ_URL:
- $MSG = MEMBER_SUBJ_CONTAINS_URL;
+ case constant('CODE_SUBJ_URL'):
+ $MSG = getMessage('MEMBER_SUBJ_CONTAINS_URL');
break;
- case CODE_BLIST_URL:
- $MSG = MEMBER_URL_BLACK_LISTED."<br />\n".MEMBER_BLIST_TIME.": ".MAKE_DATETIME($_GET['blist'], "0");
+ case constant('CODE_BLIST_URL'):
+ $MSG = "{!MEMBER_URL_BLACK_LISTED!}<br />\n{!MEMBER_BLIST_TIME!}: ".MAKE_DATETIME($_GET['blist'], "0");
break;
- case CODE_NO_RECS_LEFT:
- $MSG = MEMBER_SELECTED_MORE_RECS;
+ case constant('CODE_NO_RECS_LEFT'):
+ $MSG = getMessage('MEMBER_SELECTED_MORE_RECS');
break;
- case CODE_INVALID_TAGS:
- $MSG = MEMBER_HTML_INVALID_TAGS;
+ case constant('CODE_INVALID_TAGS'):
+ $MSG = getMessage('MEMBER_HTML_INVALID_TAGS');
break;
- case CODE_MORE_POINTS:
- $MSG = MEMBER_MORE_POINTS_NEEDED;
+ case constant('CODE_MORE_POINTS'):
+ $MSG = getMessage('MEMBER_MORE_POINTS_NEEDED');
break;
- case CODE_MORE_RECEIVERS1:
- $MSG = MEMBER_ENTER_MORE_RECEIVERS;
+ case constant('CODE_MORE_RECEIVERS1'):
+ $MSG = getMessage('MEMBER_ENTER_MORE_RECEIVERS');
break;
- case CODE_MORE_RECEIVERS2:
- $MSG = MEMBER_NO_MORE_RECEIVERS_FOUND;
+ case constant('CODE_MORE_RECEIVERS2'):
+ $MSG = getMessage('MEMBER_NO_MORE_RECEIVERS_FOUND');
break;
- case CODE_MORE_RECEIVERS3:
- $MSG = MEMBER_ENTER_MORE_MIN_RECEIVERS_1.getConfig('order_min').MEMBER_ENTER_MORE_MIN_RECEIVERS_2;
+ case constant('CODE_MORE_RECEIVERS3'):
+ $MSG = "{!MEMBER_ENTER_MORE_MIN_RECEIVERS_1!}".getConfig('order_min')."{!MEMBER_ENTER_MORE_MIN_RECEIVERS_2!}";
break;
- case CODE_INVALID_URL:
- $MSG = MEMBER_ENTER_INVALID_URL;
+ case constant('CODE_INVALID_URL'):
+ $MSG = getMessage('MEMBER_ENTER_INVALID_URL');
break;
case "": // When no error code is included in the URL we do not need to output an error message as well...
default:
DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown error code %s detected.", $_GET['msg']));
- $MSG = UNKNOWN_CODE_1.$_GET['msg'].UNKNOWN_CODE_2;
+ $MSG = "{!UNKNOWN_CODE_1!}".$_GET['msg']."{!UNKNOWN_CODE_2!}";
break;
}
switch (getConfig('order_max_full'))
{
case "MAX": // He is allowed to send as much as possible
- define('ORDER_MAX_VALUE', ORDER_ALLOED_MAX);
+ define('ORDER_MAX_VALUE', getMessage('ORDER_ALLOWED_MAX'));
break;
case "ORDER": // He is allowed to send as much as he setup the receiving value
default: // Unknown/invalid
DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown order_mas_full config detected.", getConfig('order_max_full')));
- define('ORDER_MAX_VALUE', ORDER_ALLOED_UNKNOWN);
+ define('ORDER_MAX_VALUE', getMessage('ORDER_ALLOWED_UNKNOWN'));
break;
}
$OLD_ORDER = false; $subject = ""; $text = ""; $target = "";
// Check if we already have an order placed and make it editable
- $result = SQL_QUERY_ESC("SELECT subject, text, payment_id, timestamp, url, target_send, cat_id, zip FROM "._MYSQL_PREFIX."_pool WHERE sender=%s AND data_type='TEMP' LIMIT 1",
+ $result = SQL_QUERY_ESC("SELECT subject, text, payment_id, timestamp, url, target_send, cat_id, zip FROM `{!_MYSQL_PREFIX!}_pool` WHERE sender=%s AND data_type='TEMP' LIMIT 1",
array($GLOBALS['userid']), __FILE__, __LINE__);
if (SQL_NUMROWS($result) == 1) {
// Old order found
list($subject, $text, $payment, $tstamp, $url, $target, $cat, $zip) = SQL_FETCHROW($result);
- SQL_FREERESULT($result);
// Fix max receivers when it is too much
- if ($target > $CATS['uids'][$cat]) $target = $CATS['uids'][$cat];
+ if ((isset($CATS['uids'][$cat])) && ($target > $CATS['uids'][$cat])) $target = $CATS['uids'][$cat];
// Old order is grabbed
$OLD_ORDER = true;
$url = "http://";
}
- // 01 2 21 12 2 23 443 3 3210
- if ((!empty($_POST['data'])) || ((getConfig('order_multi_page') == "N") && ((!IS_ADMIN()) && (!EXT_IS_ACTIVE("html_mail"))))) {
+ // Free result
+ SQL_FREERESULT($result);
+
+ // 01 2 21 12 2 23 443 3 3210
+ if ((!empty($_POST['data'])) || ((getConfig('order_multi_page') != "Y") && ((!IS_ADMIN()) && (!EXT_IS_ACTIVE("html_mail"))))) {
// Pre-output categories
$CAT = "";
foreach ($CATS['id'] as $key => $value) {
- $CAT .= " <OPTION value=\"".$value."\"";
+ $CAT .= " <option value=\"".$value."\"";
if (($OLD_ORDER) && ($cat == $value)) $CAT .= " selected=\"selected\"";
- $CAT .= ">".$CATS['name'][$key]." (".$CATS['uids'][$key]." ".USER_IN_CAT.")</OPTION>\n";
+ $CAT .= ">".$CATS['name'][$key]." (".$CATS['uids'][$key]." {!USER_IN_CAT!})</option>\n";
} // END - foreach
// Mail type
$P = TRANSLATE_COMMA($typeS[$key][1]);
if (is_array($value)) {
// Output option line
- $type .= " <OPTION value=\"".$typeS[$key][0]."\"";
+ $type .= " <option value=\"".$typeS[$key][0]."\"";
if (($OLD_ORDER) && ($payment == $typeS[$key][0])) $type .= " selected=\"selected\"";
- $type .= ">".$P." ".PER_MAIL." - ".$typeS[$key][3]." - ".round($typeS[$key][2])." ".PAYMENT."</OPTION>\n";
+ $type .= ">".$P." {!PER_MAIL!} - ".$typeS[$key][3]." - ".round($typeS[$key][2])." {!PAYMENT!}</option>\n";
} // END - if
} // END - foreach
// Output entered ZIP code
define('ZIP_OUTPUT', LOAD_TEMPLATE("member_order-zip2", true, $_POST['zip']));
} else {
- define('ZIP_OUTPUT', "<TR><TD colspan=\"5\" height=\"5\" class=\"seperator\"> </TD></TR>");
+ define('ZIP_OUTPUT', "<tr><td colspan=\"5\" height=\"5\" class=\"seperator\"> </td></tr>");
}
// HTML extension
define('MEMBER_HTML_EXTENSION', LOAD_TEMPLATE("member_order-html_ext", true, HTML_ADD_VALID_TAGS()));
} else {
// Extension not active and/or class not uploaded
- define('MEMBER_HTML_EXTENSION', "<TR><TD colspan=\"5\"><INPUT type=\"hidden\" name=\"html\" value=\"N\"></TD></TR>");
+ define('MEMBER_HTML_EXTENSION', "<tr><td colspan=\"5\"><input type=\"hidden\" name=\"html\" value=\"N\"> /</td></tr>");
}
// Output form for page 2
$ADD = "";
if (EXT_IS_ACTIVE("html_mail")) {
// Add some content when html extension is active
- if ((getConfig('order_multi_page') == "Y") || (IS_ADMIN())) $ADD = "<TR><TD colspan=\"2\" class=\"seperator bottom2\" height=\"5\"> </TD></TR>\n";
+ if ((getConfig('order_multi_page') == "Y") || (IS_ADMIN())) $ADD = "<tr><td colspan=\"2\" class=\"seperator bottom2\" height=\"5\"> </td></tr>\n";
define('MEMBER_HTML_EXTENSION', LOAD_TEMPLATE("member_order-html_intro", true));
} else {
// No HTML extension installed
- define('MEMBER_HTML_EXTENSION', "<TR><TD colspan=\"2\"><INPUT type=\"hidden\" name=\"html\" value=\"N\"></TD></TR>");
+ define('MEMBER_HTML_EXTENSION', "<tr><td colspan=\"2\"><input type=\"hidden\" name=\"html\" value=\"N\" /></td></tr>");
}
// Do we want ZIP code or not?
if ((getConfig('order_multi_page') == "Y") || (IS_ADMIN())) {
// Yes
- $content = array(
- 'zip' => bigintval($_POST['zip']),
- 'add' => $ADD
- );
+ if ($_POST['zip'] > 0) {
+ $content = array(
+ 'zip' => bigintval($_POST['zip']),
+ 'add' => $ADD
+ );
+ } else {
+ $content = array(
+ 'zip' => "",
+ 'add' => $ADD
+ );
+ }
define('MEMBER_ZIP_CONTENT', LOAD_TEMPLATE("member_order-zip1", true, $content));
} else {
// No
}
} else {
// No mail types defined
- OUTPUT_HTML("<STRONG><SPAN class=\"member_failed\">".MEMBER_NO_PAYMENTS."</SPAN></STRONG>");
+ LOAD_TEMPLATE("admin_settings_saved", false, "<span class=\"member_failed\">{!MEMBER_NO_PAYMENTS!}</span>");
}
} else {
// No points left!
- OUTPUT_HTML("<STRONG><SPAN class=\"member_failed\">".MEMBER_NO_POINTS."</SPAN></STRONG>");
+ LOAD_TEMPLATE("admin_settings_saved", false, "<span class=\"member_failed\">{!MEMBER_NO_POINTS!}</span>");
}
} else {
// No cateogries are defined yet
- OUTPUT_HTML("<STRONG><SPAN class=\"member_failed\">".MEMBER_NO_CATS."</SPAN></STRONG>");
+ LOAD_TEMPLATE("admin_settings_saved", false, "<span class=\"member_failed\">{!MEMBER_NO_CATS!}</span>");
}
} elseif ($mmails == "0") {
// Please set more than 0 mails per day!
- LOAD_TEMPLATE("admin_settings_saved", false, MEMBER_HAS_ZERO_MMAILS);
+ LOAD_TEMPLATE("admin_settings_saved", false, getMessage('MEMBER_HAS_ZERO_MMAILS'));
} else {
// Please confirm some mails first!
LOAD_TEMPLATE("admin_settings_saved", false, MEMBER_LINKS_LEFT_1.$links.MEMBER_LINKS_LEFT_2.getConfig('unconfirmed').MEMBER_LINKS_LEFT_3);