[TEP-COMMIT] [CVS catalog] adios dredded tep_date_raw() function!
anonymous-OfajU3CKLf1/[email protected] 16 Apr 2004 14:05:44 -0000
| Newsgroups | gmane.comp.web.oscommerce.cvs |
|---|---|
| Message-ID | <[email protected]> |
Commit in catalog/catalog on MAIN
account_edit.php +8 -5 1.66 -> 1.67
advanced_search.php +20 -27 1.51 -> 1.52
advanced_search_result.php +61 -80 1.74 -> 1.75
create_account.php +7 -4 1.72 -> 1.73
includes/functions/html_output.php +73 1.60 -> 1.61
includes/languages/english.php +3 -14 1.120 -> 1.121
/espanol.php +2 -13 1.113 -> 1.114
/german.php +3 -14 1.130 -> 1.131
+177 -157
8 modified files
adios dredded tep_date_raw() function!
introduction of a new date pull down menu function with javascript
to dynamically update the date pull down menu with the selected months
days, and takes leap years into consideration
the search results page should now work fine with search engine friendly
urls enabled
----------
catalog /catalog
account_edit.php 1.66 -> 1.67
diff -u -r1.66 -r1.67
--- account_edit.php 2003/11/17 20:45:28 1.66
+++ account_edit.php 2004/04/16 14:05:33 1.67
@@ -25,7 +25,7 @@
if (ACCOUNT_GENDER == 'true') $gender = tep_db_prepare_input($_POST['gender']);
$firstname = tep_db_prepare_input($_POST['firstname']);
$lastname = tep_db_prepare_input($_POST['lastname']);
- if (ACCOUNT_DOB == 'true') $dob = tep_db_prepare_input($_POST['dob']);
+ if (ACCOUNT_DOB == 'true') $dob = tep_db_prepare_input($_POST['dob_years']) . tep_db_prepare_input($_POST['dob_months']) . tep_db_prepare_input($_POST['dob_days']);
$email_address = tep_db_prepare_input($_POST['email_address']);
$telephone = tep_db_prepare_input($_POST['telephone']);
$fax = tep_db_prepare_input($_POST['fax']);
@@ -53,7 +53,9 @@
}
if (ACCOUNT_DOB == 'true') {
- if (!checkdate(substr(tep_date_raw($dob), 4, 2), substr(tep_date_raw($dob), 6, 2), substr(tep_date_raw($dob), 0, 4))) {
+ if (checkdate($_POST['dob_months'], $_POST['dob_days'], $_POST['dob_years'])) {
+ $dob = mktime(0, 0, 0, $_POST['dob_months'], $_POST['dob_days'], $_POST['dob_years']);
+ } else {
$error = true;
$messageStack->add('account_edit', ENTRY_DATE_OF_BIRTH_ERROR);
@@ -94,7 +96,7 @@
'customers_fax' => $fax);
if (ACCOUNT_GENDER == 'true') $sql_data_array['customers_gender'] = $gender;
- if (ACCOUNT_DOB == 'true') $sql_data_array['customers_dob'] = tep_date_raw($dob);
+ if (ACCOUNT_DOB == 'true') $sql_data_array['customers_dob'] = date('Ymd', $dob);
tep_db_perform(TABLE_CUSTOMERS, $sql_data_array, 'update', "customers_id = '" . (int)$osC_Customer->id . "'");
@@ -118,7 +120,7 @@
}
}
- $account_query = tep_db_query("select customers_gender, customers_firstname, customers_lastname, customers_dob, customers_email_address, customers_telephone, customers_fax from " . TABLE_CUSTOMERS . " where customers_id = '" . (int)$osC_Customer->id . "'");
+ $account_query = tep_db_query("select customers_gender, customers_firstname, customers_lastname, unix_timestamp(customers_dob) as customers_dob, customers_email_address, customers_telephone, customers_fax from " . TABLE_CUSTOMERS . " where customers_id = '" . (int)$osC_Customer->id . "'");
$account = tep_db_fetch_array($account_query);
$breadcrumb->add(NAVBAR_TITLE_1, tep_href_link(FILENAME_ACCOUNT, '', 'SSL'));
@@ -132,6 +134,7 @@
<base href="<?php echo (($request_type == 'SSL') ? HTTPS_SERVER : HTTP_SERVER) . DIR_WS_CATALOG; ?>">
<link rel="stylesheet" type="text/css" href="stylesheet.css">
<?php require('includes/form_check.js.php'); ?>
+<script language="javascript" src="includes/general.js"></script>
</head>
<body marginwidth="0" marginheight="0" topmargin="0" bottommargin="0" leftmargin="0" rightmargin="0">
<!-- header //-->
@@ -214,7 +217,7 @@
?>
<tr>
<td class="main"><?php echo ENTRY_DATE_OF_BIRTH; ?></td>
- <td class="main"><?php echo tep_draw_input_field('dob', tep_date_short($account['customers_dob'])) . ' ' . (tep_not_null(ENTRY_DATE_OF_BIRTH_TEXT) ? '<span class="inputRequirement">' . ENTRY_DATE_OF_BIRTH_TEXT . '</span>': ''); ?></td>
+ <td class="main"><?php echo tep_draw_date_pull_down_menu('dob', $account['customers_dob'], false, true, true, date('Y')-1901, -5) . ' ' . (tep_not_null(ENTRY_DATE_OF_BIRTH_TEXT) ? '<span class="inputRequirement">' . ENTRY_DATE_OF_BIRTH_TEXT . '</span>': ''); ?></td>
</tr>
<?php
}
----------
catalog /catalog
advanced_search.php 1.51 -> 1.52
diff -u -r1.51 -r1.52
--- advanced_search.php 2003/11/17 20:49:39 1.51
+++ advanced_search.php 2004/04/16 14:05:33 1.52
@@ -12,6 +12,9 @@
require('includes/application_top.php');
+ $products_date_query = tep_db_query("select min(year(products_date_added)) as min_year, max(year(products_date_added)) as max_year from " . TABLE_PRODUCTS . " limit 1");
+ $products_date = tep_db_fetch_array($products_date_query);
+
require(DIR_WS_LANGUAGES . $osC_Session->value('language') . '/' . FILENAME_ADVANCED_SEARCH);
$breadcrumb->add(NAVBAR_TITLE_1, tep_href_link(FILENAME_ADVANCED_SEARCH));
@@ -30,39 +33,31 @@
var error_found = false;
var error_field;
var keywords = document.advanced_search.keywords.value;
- var dfrom = document.advanced_search.dfrom.value;
- var dto = document.advanced_search.dto.value;
var pfrom = document.advanced_search.pfrom.value;
var pto = document.advanced_search.pto.value;
var pfrom_float;
var pto_float;
+ var dfrom;
+ var dfrom_days = document.advanced_search.datefrom_days.value;
+ var dfrom_months = document.advanced_search.datefrom_months.value;
+ var dfrom_years = document.advanced_search.datefrom_years.value;
+ var dto;
+ var dto_days = document.advanced_search.dateto_days.value;
+ var dto_months = document.advanced_search.dateto_months.value;
+ var dto_years = document.advanced_search.dateto_years.value;
- if ( ((keywords == '') || (keywords.length < 1)) && ((dfrom == '') || (dfrom == '<?php echo DOB_FORMAT_STRING; ?>') || (dfrom.length < 1)) && ((dto == '') || (dto == '<?php echo DOB_FORMAT_STRING; ?>') || (dto.length < 1)) && ((pfrom == '') || (pfrom.length < 1)) && ((pto == '') || (pto.length < 1)) ) {
- error_message = error_message + "* <?php echo ERROR_AT_LEAST_ONE_INPUT; ?>\n";
- error_field = document.advanced_search.keywords;
- error_found = true;
+ if ( (dfrom_days.length > 0) && (dfrom_months.length > 0) && (dfrom_years.length > 0) ) {
+ dfrom = dfrom_years + dfrom_months + dfrom_days;
}
- if ((dfrom.length > 0) && (dfrom != '<?php echo DOB_FORMAT_STRING; ?>')) {
- if (!IsValidDate(dfrom, '<?php echo DOB_FORMAT_STRING; ?>')) {
- error_message = error_message + "* <?php echo ERROR_INVALID_FROM_DATE; ?>\n";
- error_field = document.advanced_search.dfrom;
- error_found = true;
- }
- }
-
- if ((dto.length > 0) && (dto != '<?php echo DOB_FORMAT_STRING; ?>')) {
- if (!IsValidDate(dto, '<?php echo DOB_FORMAT_STRING; ?>')) {
- error_message = error_message + "* <?php echo ERROR_INVALID_TO_DATE; ?>\n";
- error_field = document.advanced_search.dto;
- error_found = true;
- }
+ if ( (dto_days.length > 0) && (dto_months.length > 0) && (dto_years.length > 0) ) {
+ dto = dto_years + dto_months + dto_days;
}
- if ((dfrom.length > 0) && (dfrom != '<?php echo DOB_FORMAT_STRING; ?>') && (IsValidDate(dfrom, '<?php echo DOB_FORMAT_STRING; ?>')) && (dto.length > 0) && (dto != '<?php echo DOB_FORMAT_STRING; ?>') && (IsValidDate(dto, '<?php echo DOB_FORMAT_STRING; ?>'))) {
- if (!CheckDateRange(document.advanced_search.dfrom, document.advanced_search.dto)) {
+ if ((dfrom.length > 0) && (dto.length > 0)) {
+ if (dfrom > dto) {
error_message = error_message + "* <?php echo ERROR_TO_DATE_LESS_THAN_FROM_DATE; ?>\n";
- error_field = document.advanced_search.dto;
+ error_field = document.advanced_search.dateto_days;
error_found = true;
}
}
@@ -102,8 +97,6 @@
error_field.focus();
return false;
} else {
- RemoveFormatString(document.advanced_search.dfrom, "<?php echo DOB_FORMAT_STRING; ?>");
- RemoveFormatString(document.advanced_search.dto, "<?php echo DOB_FORMAT_STRING; ?>");
return true;
}
}
@@ -216,11 +209,11 @@
</tr>
<tr>
<td class="fieldKey"><?php echo ENTRY_DATE_FROM; ?></td>
- <td class="fieldValue"><?php echo tep_draw_input_field('dfrom', DOB_FORMAT_STRING, 'onFocus="RemoveFormatString(this, \'' . DOB_FORMAT_STRING . '\')"'); ?></td>
+ <td class="fieldValue"><?php echo tep_draw_date_pull_down_menu('datefrom', '', false, true, true, date('Y') - $products_date['min_year'], 0); ?></td>
</tr>
<tr>
<td class="fieldKey"><?php echo ENTRY_DATE_TO; ?></td>
- <td class="fieldValue"><?php echo tep_draw_input_field('dto', DOB_FORMAT_STRING, 'onFocus="RemoveFormatString(this, \'' . DOB_FORMAT_STRING . '\')"'); ?></td>
+ <td class="fieldValue"><?php echo tep_draw_date_pull_down_menu('dateto', '', true, true, true, date('Y') - $products_date['max_year'], 0); ?></td>
</tr>
</table></td>
</tr>
----------
catalog /catalog
advanced_search_result.php 1.74 -> 1.75
diff -u -r1.74 -r1.75
--- advanced_search_result.php 2003/12/18 23:52:14 1.74
+++ advanced_search_result.php 2004/04/16 14:05:34 1.75
@@ -16,105 +16,86 @@
$error = false;
- if ( (isset($_GET['keywords']) && empty($_GET['keywords'])) &&
- (isset($_GET['dfrom']) && (empty($_GET['dfrom']) || ($_GET['dfrom'] == DOB_FORMAT_STRING))) &&
- (isset($_GET['dto']) && (empty($_GET['dto']) || ($_GET['dto'] == DOB_FORMAT_STRING))) &&
- (isset($_GET['pfrom']) && !is_numeric($_GET['pfrom'])) &&
- (isset($_GET['pto']) && !is_numeric($_GET['pto'])) ) {
- $error = true;
-
- $messageStack->add_session('search', ERROR_AT_LEAST_ONE_INPUT);
- } else {
- $dfrom = '';
- $dto = '';
- $pfrom = '';
- $pto = '';
- $keywords = '';
-
- if (isset($_GET['dfrom'])) {
- $dfrom = (($_GET['dfrom'] == DOB_FORMAT_STRING) ? '' : $_GET['dfrom']);
- }
-
- if (isset($_GET['dto'])) {
- $dto = (($_GET['dto'] == DOB_FORMAT_STRING) ? '' : $_GET['dto']);
- }
-
- if (isset($_GET['pfrom'])) {
- $pfrom = $_GET['pfrom'];
- }
-
- if (isset($_GET['pto'])) {
- $pto = $_GET['pto'];
+ $pfrom = '';
+ $pto = '';
+ $keywords = '';
+ $datefrom = '';
+ $dateto = '';
+
+ if (isset($_GET['datefrom_days']) && !empty($_GET['datefrom_days']) && isset($_GET['datefrom_months']) && !empty($_GET['datefrom_months']) && isset($_GET['datefrom_years']) && !empty($_GET['datefrom_years'])) {
+ if (checkdate($_GET['datefrom_months'], $_GET['datefrom_days'], $_GET['datefrom_years'])) {
+ $datefrom = mktime(0, 0, 0, $_GET['datefrom_months'], $_GET['datefrom_days'], $_GET['datefrom_years']);
+ } else {
+ $error = true;
+ $messageStack->add_session('search', ERROR_INVALID_FROM_DATE);
}
+ }
- if (isset($_GET['keywords'])) {
- $keywords = $_GET['keywords'];
+ if (isset($_GET['dateto_days']) && !empty($_GET['dateto_days']) && isset($_GET['dateto_months']) && !empty($_GET['dateto_months']) && isset($_GET['dateto_years']) && !empty($_GET['dateto_years'])) {
+ if (checkdate($_GET['dateto_months'], $_GET['dateto_days'], $_GET['dateto_years'])) {
+ $dateto = mktime(0, 0, 0, $_GET['dateto_months'], $_GET['dateto_days'], $_GET['dateto_years']);
+ } else {
+ $error = true;
+ $messageStack->add_session('search', ERROR_INVALID_TO_DATE);
}
-
- $date_check_error = false;
- if (tep_not_null($dfrom)) {
- if (!tep_checkdate($dfrom, DOB_FORMAT_STRING, $dfrom_array)) {
- $error = true;
- $date_check_error = true;
+ }
- $messageStack->add_session('search', ERROR_INVALID_FROM_DATE);
- }
- }
+ if (isset($_GET['pfrom'])) {
+ $pfrom = $_GET['pfrom'];
+ }
- if (tep_not_null($dto)) {
- if (!tep_checkdate($dto, DOB_FORMAT_STRING, $dto_array)) {
- $error = true;
- $date_check_error = true;
+ if (isset($_GET['pto'])) {
+ $pto = $_GET['pto'];
+ }
- $messageStack->add_session('search', ERROR_INVALID_TO_DATE);
- }
- }
+ if (isset($_GET['keywords'])) {
+ $keywords = $_GET['keywords'];
+ }
- if (($date_check_error == false) && tep_not_null($dfrom) && tep_not_null($dto)) {
- if (mktime(0, 0, 0, $dfrom_array[1], $dfrom_array[2], $dfrom_array[0]) > mktime(0, 0, 0, $dto_array[1], $dto_array[2], $dto_array[0])) {
- $error = true;
+ if (tep_not_null($datefrom) && tep_not_null($dateto)) {
+ if ($datefrom > $dateto) {
+ $error = true;
- $messageStack->add_session('search', ERROR_TO_DATE_LESS_THAN_FROM_DATE);
- }
+ $messageStack->add_session('search', ERROR_TO_DATE_LESS_THAN_FROM_DATE);
}
+ }
- $price_check_error = false;
- if (tep_not_null($pfrom)) {
- if (!settype($pfrom, 'double')) {
- $error = true;
- $price_check_error = true;
+ $price_check_error = false;
+ if (tep_not_null($pfrom)) {
+ if (!settype($pfrom, 'double')) {
+ $error = true;
+ $price_check_error = true;
- $messageStack->add_session('search', ERROR_PRICE_FROM_MUST_BE_NUM);
- }
+ $messageStack->add_session('search', ERROR_PRICE_FROM_MUST_BE_NUM);
}
+ }
- if (tep_not_null($pto)) {
- if (!settype($pto, 'double')) {
- $error = true;
- $price_check_error = true;
+ if (tep_not_null($pto)) {
+ if (!settype($pto, 'double')) {
+ $error = true;
+ $price_check_error = true;
- $messageStack->add_session('search', ERROR_PRICE_TO_MUST_BE_NUM);
- }
+ $messageStack->add_session('search', ERROR_PRICE_TO_MUST_BE_NUM);
}
+ }
- if (($price_check_error == false) && is_float($pfrom) && is_float($pto)) {
- if ($pfrom >= $pto) {
- $error = true;
+ if (($price_check_error == false) && is_float($pfrom) && is_float($pto)) {
+ if ($pfrom >= $pto) {
+ $error = true;
- $messageStack->add_session('search', ERROR_PRICE_TO_LESS_THAN_PRICE_FROM);
- }
+ $messageStack->add_session('search', ERROR_PRICE_TO_LESS_THAN_PRICE_FROM);
}
+ }
- if (tep_not_null($keywords)) {
- if (!tep_parse_search_string($keywords, $search_keywords)) {
- $error = true;
+ if (tep_not_null($keywords)) {
+ if (!tep_parse_search_string($keywords, $search_keywords)) {
+ $error = true;
- $messageStack->add_session('search', ERROR_INVALID_KEYWORDS);
- }
+ $messageStack->add_session('search', ERROR_INVALID_KEYWORDS);
}
}
- if (empty($dfrom) && empty($dto) && empty($pfrom) && empty($pto) && empty($keywords)) {
+ if (empty($datefrom) && empty($dateto) && empty($pfrom) && empty($pto) && empty($keywords)) {
$error = true;
$messageStack->add_session('search', ERROR_AT_LEAST_ONE_INPUT);
@@ -267,12 +248,12 @@
$where_str .= " )";
}
- if (tep_not_null($dfrom)) {
- $where_str .= " and p.products_date_added >= '" . tep_date_raw($dfrom) . "'";
+ if (tep_not_null($datefrom)) {
+ $where_str .= " and p.products_date_added >= '" . date('Ymd', $datefrom) . "'";
}
- if (tep_not_null($dto)) {
- $where_str .= " and p.products_date_added <= '" . tep_date_raw($dto) . "'";
+ if (tep_not_null($dateto)) {
+ $where_str .= " and p.products_date_added <= '" . date('Ymd', $dateto) . "'";
}
if (tep_not_null($pfrom)) {
----------
catalog /catalog
create_account.php 1.72 -> 1.73
diff -u -r1.72 -r1.73
--- create_account.php 2004/04/13 08:11:37 1.72
+++ create_account.php 2004/04/16 14:05:34 1.73
@@ -28,7 +28,7 @@
}
$firstname = tep_db_prepare_input($_POST['firstname']);
$lastname = tep_db_prepare_input($_POST['lastname']);
- if (ACCOUNT_DOB == 'true') $dob = tep_db_prepare_input($_POST['dob']);
+ if (ACCOUNT_DOB == 'true') $dob = tep_db_prepare_input($_POST['dob_years']) . tep_db_prepare_input($_POST['dob_months']) . tep_db_prepare_input($_POST['dob_days']);
$email_address = tep_db_prepare_input($_POST['email_address']);
if (ACCOUNT_COMPANY == 'true') $company = tep_db_prepare_input($_POST['company']);
$street_address = tep_db_prepare_input($_POST['street_address']);
@@ -84,7 +84,9 @@
}
if (ACCOUNT_DOB == 'true') {
- if (checkdate(substr(tep_date_raw($dob), 4, 2), substr(tep_date_raw($dob), 6, 2), substr(tep_date_raw($dob), 0, 4)) == false) {
+ if (checkdate($_POST['dob_months'], $_POST['dob_days'], $_POST['dob_years'])) {
+ $dob = mktime(0, 0, 0, $_POST['dob_months'], $_POST['dob_days'], $_POST['dob_years']);
+ } else {
$error = true;
$messageStack->add('create_account', ENTRY_DATE_OF_BIRTH_ERROR);
@@ -192,7 +194,7 @@
'customers_password' => tep_encrypt_password($password));
if (ACCOUNT_GENDER == 'true') $sql_data_array['customers_gender'] = $gender;
- if (ACCOUNT_DOB == 'true') $sql_data_array['customers_dob'] = tep_date_raw($dob);
+ if (ACCOUNT_DOB == 'true') $sql_data_array['customers_dob'] = date('Ymd', $dob);
tep_db_perform(TABLE_CUSTOMERS, $sql_data_array);
@@ -266,6 +268,7 @@
<base href="<?php echo (($request_type == 'SSL') ? HTTPS_SERVER : HTTP_SERVER) . DIR_WS_CATALOG; ?>">
<link rel="stylesheet" type="text/css" href="stylesheet.css">
<?php require('includes/form_check.js.php'); ?>
+<script language="javascript" src="includes/general.js"></script>
</head>
<body marginwidth="0" marginheight="0" topmargin="0" bottommargin="0" leftmargin="0" rightmargin="0">
<!-- header //-->
@@ -373,7 +376,7 @@
?>
<tr>
<td class="main"><?php echo ENTRY_DATE_OF_BIRTH; ?></td>
- <td class="main"><?php echo tep_draw_input_field('dob') . ' ' . (tep_not_null(ENTRY_DATE_OF_BIRTH_TEXT) ? '<span class="inputRequirement">' . ENTRY_DATE_OF_BIRTH_TEXT . '</span>': ''); ?></td>
+ <td class="main"><?php echo tep_draw_date_pull_down_menu('dob', '', false, true, true, date('Y')-1901, -5) . ' ' . (tep_not_null(ENTRY_DATE_OF_BIRTH_TEXT) ? '<span class="inputRequirement">' . ENTRY_DATE_OF_BIRTH_TEXT . '</span>': ''); ?></td>
</tr>
<?php
}
----------
catalog /catalog /includes /functions
html_output.php 1.60 -> 1.61
diff -u -r1.60 -r1.61
--- html_output.php 2004/04/13 08:10:15 1.60
+++ html_output.php 2004/04/16 14:05:36 1.61
@@ -295,4 +295,77 @@
return tep_draw_pull_down_menu($name, $countries_array, $selected, $parameters);
}
+
+ function tep_draw_date_pull_down_menu($name, $value = '', $default_today = true, $show_days = true, $use_month_names = true, $year_range_start = '0', $year_range_end = '1') {
+ $params = '';
+
+// days pull down menu
+ $days_select_string = '';
+
+ if ($show_days === true) {
+ $params = 'onChange="updateDatePullDownMenu(this.form, \'' . $name . '\');"';
+
+ $days_in_month = ($default_today === true) ? date('t') : 31;
+
+ $days_array = array();
+ for ($i=1; $i<=$days_in_month; $i++) {
+ $days_array[] = array('id' => $i,
+ 'text' => $i);
+ }
+
+ if (isset($GLOBALS[$name . '_days'])) {
+ $days_default = $GLOBALS[$name . '_days'];
+ } elseif (!empty($value)) {
+ $days_default = date('j', $value);
+ } elseif ($default_today === true) {
+ $days_default = date('j');
+ } else {
+ $days_default = 1;
+ }
+
+ $days_select_string = tep_draw_pull_down_menu($name . '_days', $days_array, $days_default);
+ }
+
+// months pull down menu
+ $months_array = array();
+ for ($i=1; $i<=12; $i++) {
+ $months_array[] = array('id' => $i,
+ 'text' => (($use_month_names === true) ? strftime('%B', mktime(0, 0, 0, $i)) : $i));
+ }
+
+ if (isset($GLOBALS[$name . '_months'])) {
+ $months_default = $GLOBALS[$name . '_months'];
+ } elseif (!empty($value)) {
+ $months_default = date('n', $value);
+ } elseif ($default_today === true) {
+ $months_default = date('n');
+ } else {
+ $months_default = 1;
+ }
+
+ $months_select_string = tep_draw_pull_down_menu($name . '_months', $months_array, $months_default, $params);
+
+// year pull down menu
+ $year = date('Y');
+
+ $years_array = array();
+ for ($i = ($year - $year_range_start); $i <= ($year + $year_range_end); $i++) {
+ $years_array[] = array('id' => $i,
+ 'text' => $i);
+ }
+
+ if (isset($GLOBALS[$name . '_years'])) {
+ $years_default = $GLOBALS[$name . '_years'];
+ } elseif (!empty($value)) {
+ $years_default = date('Y', $value);
+ } elseif ($default_today === true) {
+ $years_default = $year;
+ } else {
+ $years_default = $year - $year_range_start;
+ }
+
+ $years_select_string = tep_draw_pull_down_menu($name . '_years', $years_array, $years_default, $params);
+
+ return $days_select_string . $months_select_string . $years_select_string;
+ }
?>
----------
catalog /catalog /includes /languages
english.php 1.120 -> 1.121
diff -u -r1.120 -r1.121
--- english.php 2004/04/16 05:31:33 1.120
+++ english.php 2004/04/16 14:05:37 1.121
@@ -23,20 +23,9 @@
define('DATE_FORMAT', 'm/d/Y'); // this is used for date()
define('DATE_TIME_FORMAT', DATE_FORMAT_SHORT . ' %H:%M:%S');
-////
-// Return date in raw format
-// $date should be in format mm/dd/yyyy
-// raw date is in format YYYYMMDD, or DDMMYYYY
-function tep_date_raw($date, $reverse = false) {
- if ($reverse) {
- return substr($date, 3, 2) . substr($date, 0, 2) . substr($date, 6, 4);
- } else {
- return substr($date, 6, 4) . substr($date, 0, 2) . substr($date, 3, 2);
- }
-}
-
// if USE_DEFAULT_LANGUAGE_CURRENCY is true, use the following currency, instead of the applications default currency (used when changing language)
define('LANGUAGE_CURRENCY', 'USD');
+
define('NUMERIC_DECIMAL_SEPARATOR', '.');
define('NUMERIC_THOUSANDS_SEPARATOR', ',');
@@ -177,8 +166,8 @@
define('ENTRY_LAST_NAME_ERROR', 'Your Last Name must contain a minimum of ' . ENTRY_LAST_NAME_MIN_LENGTH . ' characters.');
define('ENTRY_LAST_NAME_TEXT', '*');
define('ENTRY_DATE_OF_BIRTH', 'Date of Birth:');
-define('ENTRY_DATE_OF_BIRTH_ERROR', 'Your Date of Birth must be in this format: MM/DD/YYYY (eg 05/21/1970)');
-define('ENTRY_DATE_OF_BIRTH_TEXT', '* (eg. 05/21/1970)');
+define('ENTRY_DATE_OF_BIRTH_ERROR', 'Your Date of Birth must be set correctly.');
+define('ENTRY_DATE_OF_BIRTH_TEXT', '*');
define('ENTRY_EMAIL_ADDRESS', 'E-Mail Address:');
define('ENTRY_EMAIL_ADDRESS_ERROR', 'Your E-Mail Address must contain a minimum of ' . ENTRY_EMAIL_ADDRESS_MIN_LENGTH . ' characters.');
define('ENTRY_EMAIL_ADDRESS_CHECK_ERROR', 'Your E-Mail Address does not appear to be valid - please make any necessary corrections.');
----------
catalog /catalog /includes /languages
espanol.php 1.113 -> 1.114
diff -u -r1.113 -r1.114
--- espanol.php 2004/04/16 05:31:33 1.113
+++ espanol.php 2004/04/16 14:05:38 1.114
@@ -23,20 +23,9 @@
define('DATE_FORMAT', 'd/m/Y'); // this is used for date()
define('DATE_TIME_FORMAT', DATE_FORMAT_SHORT . ' %H:%M:%S');
-////
-// Return date in raw format
-// $date should be in format mm/dd/yyyy
-// raw date is in format YYYYMMDD, or DDMMYYYY
-function tep_date_raw($date, $reverse = false) {
- if ($reverse) {
- return substr($date, 0, 2) . substr($date, 3, 2) . substr($date, 6, 4);
- } else {
- return substr($date, 6, 4) . substr($date, 3, 2) . substr($date, 0, 2);
- }
-}
-
// if USE_DEFAULT_LANGUAGE_CURRENCY is true, use the following currency, instead of the applications default currency (used when changing language)
define('LANGUAGE_CURRENCY', 'EUR');
+
define('NUMERIC_DECIMAL_SEPARATOR', '.');
define('NUMERIC_THOUSANDS_SEPARATOR', ',');
@@ -178,7 +167,7 @@
define('ENTRY_LAST_NAME_TEXT', '*');
define('ENTRY_DATE_OF_BIRTH', 'Fecha de Nacimiento:');
define('ENTRY_DATE_OF_BIRTH_ERROR', 'Su fecha de nacimiento debe tener este formato: DD/MM/AAAA (p.ej. 21/05/1970)');
-define('ENTRY_DATE_OF_BIRTH_TEXT', '* (p.ej. 21/05/1970)');
+define('ENTRY_DATE_OF_BIRTH_TEXT', '*');
define('ENTRY_EMAIL_ADDRESS', 'E-Mail:');
define('ENTRY_EMAIL_ADDRESS_ERROR', 'Su dirección de E-Mail debe tener al menos ' . ENTRY_EMAIL_ADDRESS_MIN_LENGTH . ' letras.');
define('ENTRY_EMAIL_ADDRESS_CHECK_ERROR', 'Su dirección de E-Mail no parece válida - por favor haga los cambios necesarios.');
----------
catalog /catalog /includes /languages
german.php 1.130 -> 1.131
diff -u -r1.130 -r1.131
--- german.php 2004/04/16 05:31:33 1.130
+++ german.php 2004/04/16 14:05:38 1.131
@@ -23,20 +23,9 @@
define('DATE_FORMAT', 'd.m.Y'); // this is used for strftime()
define('DATE_TIME_FORMAT', DATE_FORMAT_SHORT . ' %H:%M:%S');
-////
-// Return date in raw format
-// $date should be in format mm/dd/yyyy
-// raw date is in format YYYYMMDD, or DDMMYYYY
-function tep_date_raw($date, $reverse = false) {
- if ($reverse) {
- return substr($date, 0, 2) . substr($date, 3, 2) . substr($date, 6, 4);
- } else {
- return substr($date, 6, 4) . substr($date, 3, 2) . substr($date, 0, 2);
- }
-}
-
// if USE_DEFAULT_LANGUAGE_CURRENCY is true, use the following currency, instead of the applications default currency (used when changing language)
define('LANGUAGE_CURRENCY', 'EUR');
+
define('NUMERIC_DECIMAL_SEPARATOR', ',');
define('NUMERIC_THOUSANDS_SEPARATOR', '.');
@@ -177,8 +166,8 @@
define('ENTRY_LAST_NAME_ERROR', 'Der Nachname sollte mindestens ' . ENTRY_LAST_NAME_MIN_LENGTH . ' Zeichen enthalten.');
define('ENTRY_LAST_NAME_TEXT', '*');
define('ENTRY_DATE_OF_BIRTH', 'Geburtsdatum:');
-define('ENTRY_DATE_OF_BIRTH_ERROR', 'Bitte geben Sie Ihr Geburtsdatum in folgendem Format ein: TT.MM.JJJJ (z.B. 21.05.1970)');
-define('ENTRY_DATE_OF_BIRTH_TEXT', '* (z.B. 21.05.1970)');
+define('ENTRY_DATE_OF_BIRTH_ERROR', 'Bitte setzen Sie Ihr Geburtsdatum richtig an.');
+define('ENTRY_DATE_OF_BIRTH_TEXT', '*');
define('ENTRY_EMAIL_ADDRESS', 'eMail-Adresse:');
define('ENTRY_EMAIL_ADDRESS_ERROR', 'Die eMail Adresse sollte mindestens ' . ENTRY_EMAIL_ADDRESS_MIN_LENGTH . ' Zeichen enthalten.');
define('ENTRY_EMAIL_ADDRESS_CHECK_ERROR', 'Die eMail Adresse scheint nicht gültig zu sein - bitte korrigieren.');
CVSspam 0.2.8
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click