[TEP-COMMIT] CVS: catalog/catalog checkout_payment.php,1.116,1.117 create_account.php,1.66,1.67 privacy.php,1.23,1.24
Mark Evans <[email protected]>
| Newsgroups | gmane.comp.web.oscommerce.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/tep/catalog/catalog
In directory sc8-pr-cvs1:/tmp/cvs-serv11644
Modified Files:
checkout_payment.php create_account.php privacy.php
Log Message:
Add privacy statement functionality as part of workboard 69
Index: checkout_payment.php
===================================================================
RCS file: /cvsroot/tep/catalog/catalog/checkout_payment.php,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- checkout_payment.php 4 Dec 2003 14:12:16 -0000 1.116
+++ checkout_payment.php 17 Dec 2003 16:16:16 -0000 1.117
@@ -119,11 +119,6 @@
function rowOutEffect(object) {
if (object.className == 'moduleRowOver') object.className = 'moduleRow';
}
-
-function changeSelection(selection) {
- box = eval(selection);
- box.checked = !box.checked;
-}
//--></script>
<?php echo $payment_modules->javascript_validation(); ?>
</head>
@@ -180,7 +175,7 @@
<td><table border="0" width="100%" cellspacing="0" cellpadding="2">
<tr>
<td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- <td class="main"><?php echo TEXT_CONDITIONS_DESCRIPTION . '<br><br>' . tep_draw_checkbox_field('conditions', '1') . ' <span onClick="changeSelection(document.checkout_payment.conditions)">' . TEXT_CONDITIONS_CONFIRM . '</span>'; ?></td>
+ <td class="main"><?php echo TEXT_CONDITIONS_DESCRIPTION . '<br><br>' . tep_draw_checkbox_field('conditions', '1', false, 'id="conditions"') . '<label for="conditions"> ' . TEXT_CONDITIONS_CONFIRM . '</label>'; ?></td>
<td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
</tr>
</table></td>
Index: create_account.php
===================================================================
RCS file: /cvsroot/tep/catalog/catalog/create_account.php,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- create_account.php 17 Nov 2003 21:01:50 -0000 1.66
+++ create_account.php 17 Dec 2003 16:16:16 -0000 1.67
@@ -56,6 +56,13 @@
$error = false;
+ if (DISPLAY_PRIVACY_CONDITIONS == 'true') {
+ if (!isset($_POST['privacy_conditions']) || ($_POST['privacy_conditions'] != '1')) {
+ $error = true;
+ $messageStack->add('create_account', ERROR_PRIVACY_STATEMENT_NOT_ACCEPTED, 'error');
+ }
+ }
+
if (ACCOUNT_GENDER == 'true') {
if ( ($gender != 'm') && ($gender != 'f') ) {
$error = true;
@@ -293,6 +300,33 @@
</tr>
<?php
}
+ if (DISPLAY_PRIVACY_CONDITIONS == 'true') {
+?>
+ <tr>
+ <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
+ <tr>
+ <td class="main"><b><?php echo TABLE_HEADING_PRIVACY_CONDITIONS; ?></b></td>
+ </tr>
+ </table></td>
+ </tr>
+ <tr>
+ <td><table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
+ <tr class="infoBoxContents">
+ <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
+ <tr>
+ <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
+ <td class="main"><?php echo TEXT_PRIVACY_CONDITIONS_DESCRIPTION . '<br><br>' . tep_draw_checkbox_field('privacy_conditions', '1', false, 'id="privacy"') . '<label for="privacy"> ' . TEXT_PRIVACY_CONDITIONS_CONFIRM . '</label>'; ?></td>
+ <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
+ </tr>
+ </table></td>
+ </tr>
+ </table></td>
+ </tr>
+ <tr>
+ <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
+ </tr>
+<?php
+ }
?>
<tr>
<td><table border="0" width="100%" cellspacing="0" cellpadding="2">
@@ -506,7 +540,7 @@
<td><table border="0" width="100%" cellspacing="0" cellpadding="2">
<tr>
<td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- <td><?php echo tep_image_submit('button_continue.gif', IMAGE_BUTTON_CONTINUE); ?></td>
+ <td align="right"><?php echo tep_image_submit('button_continue.gif', IMAGE_BUTTON_CONTINUE); ?></td>
<td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
</tr>
</table></td>
Index: privacy.php
===================================================================
RCS file: /cvsroot/tep/catalog/catalog/privacy.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- privacy.php 17 Nov 2003 21:00:43 -0000 1.23
+++ privacy.php 17 Dec 2003 16:16:16 -0000 1.24
@@ -60,6 +60,27 @@
<tr>
<td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
</tr>
+<?php
+ if (isset($navigation->path[sizeof($navigation->path)-2]) && ($navigation->path[sizeof($navigation->path)-2]['page'] == FILENAME_CREATE_ACCOUNT)) {
+?>
+ <tr>
+ <td><table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
+ <tr class="infoBoxContents">
+ <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
+ <tr>
+ <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
+ <td class="main"><?php echo '<b>' . TITLE_CONTINUE_CREATE_ACCOUNT . '</b><br>' . TEXT_CONTINUE_CREATE_ACCOUNT; ?></td>
+ <td align="right"><?php echo '<a href="' . tep_href_link(FILENAME_CREATE_ACCOUNT) . '">' . tep_image_button('button_continue.gif', IMAGE_BUTTON_CONTINUE) . '</a>'; ?></td>
+ <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
+ </tr>
+ </table></td>
+ </tr>
+ </table></td>
+ </tr>
+ </table></td>
+<?php
+ } else {
+?>
<tr>
<td><table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
<tr class="infoBoxContents">
@@ -74,6 +95,9 @@
</table></td>
</tr>
</table></td>
+<?php
+ }
+?>
<!-- body_text_eof //-->
<td width="<?php echo BOX_WIDTH; ?>" valign="top"><table border="0" width="<?php echo BOX_WIDTH; ?>" cellspacing="0" cellpadding="2">
<!-- right_navigation //-->
-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills. Sign up for IBM's
Free Linux Tutorials. Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click