hpdl
|
1820
|
1
|
<html>
|
|
2
|
<head>
|
|
3
|
<META http-equiv="Content-Type" content="text/html; charset=windows-1252">
|
|
4
|
<title>osCommerce Online Merchant v2.2 RC1 Upgrade Notes</title>
|
|
5
|
<style>
|
|
6
|
/* Default heading font (outside of tables) */
|
|
7
|
body { font-family: sans-serif; font-size: 11pt; }
|
|
8
|
|
|
9
|
td { vertical-align: top; padding-left: 4px; padding-right: 4px; }
|
|
10
|
|
|
11
|
/* File Difference Report styles - Color */
|
|
12
|
table.fc { border-top: 1px solid Black; border-left: 1px solid Black; width: 100%; font-family: monospace; font-size: 10pt; }
|
|
13
|
|
|
14
|
tr.secBegin td { border-left: none; border-top: none; border-right: 1px solid Black; }
|
|
15
|
tr.secMiddle td { border-left: none; border-top: none; border-right: 1px solid Black; }
|
|
16
|
tr.secEnd td { border-left: none; border-top: none; border-bottom: 1px solid Black; border-right: 1px solid Black; }
|
|
17
|
tr.secAll td { border-left: none; border-top: none; border-bottom: 1px solid Black; border-right: 1px solid Black; }
|
|
18
|
tr.secSubEnd td { border-left: none; border-top: none; border-bottom: 1px solid Gray; border-right: 1px solid Black; }
|
|
19
|
tr.secSubAll td { border-left: none; border-top: none; border-bottom: 1px solid Gray; border-right: 1px solid Black; }
|
|
20
|
tr.secGap td { font-size: 4px; border-left: none; border-top: none; border-bottom: 1px solid Black; border-right: 1px solid Black; }
|
|
21
|
|
|
22
|
td.LineNum { text-align: right; }
|
|
23
|
td.LineRange { font-family: sans-serif; }
|
|
24
|
td.SubLineRange { font-family: sans-serif; border-bottom: none; }
|
|
25
|
|
|
26
|
td.AlignLeft { text-align: left; }
|
|
27
|
td.AlignRight { text-align: right; }
|
|
28
|
td.AlignCenter { text-align: center; }
|
|
29
|
td.Caption { text-align: left; background-color: #E7E7E7; padding-top: 8px; }
|
|
30
|
|
|
31
|
td.Normal { }
|
|
32
|
td.HasSimilar { background-color: #F0F0FF; }
|
|
33
|
td.HasMismatch { background-color: #FFF0F0; }
|
|
34
|
td.HasOrphan { background-color: #FFF0F0; }
|
|
35
|
td.Added { background-color: #FFF0F0; }
|
|
36
|
td.Deleted { background-color: #FFF0F0; text-decoration: line-through; }
|
|
37
|
td.UAdded { background-color: #F0F0FF; }
|
|
38
|
td.UDeleted { background-color: #F0F0FF; text-decoration: line-through; }
|
|
39
|
|
|
40
|
.ttSigDiff { color: #FF0000; }
|
|
41
|
.ttInsigDiff { color: #0000FF; }
|
|
42
|
.ttAdded { color: #FF0000; }
|
|
43
|
.ttDeleted { text-decoration: line-through; }
|
|
44
|
|
|
45
|
/* Directory Comparison Report styles - Color */
|
|
46
|
table.dc { border-top: 1px solid Black; border-left: 1px solid Black; width: 100%; font-family: sans-serif; font-size: 10pt; }
|
|
47
|
|
|
48
|
table.dc tr.secBegin td { border-bottom: 1px solid Silver; }
|
|
49
|
table.dc tr.secMiddle td { border-bottom: 1px solid Silver; }
|
|
50
|
|
|
51
|
.ttNewer { color: #FF0000; }
|
|
52
|
.ttOlder { color: #808080; }
|
|
53
|
.ttOrphan { color: #0000FF; }
|
|
54
|
.ttGhosted { color: #008080; }
|
|
55
|
|
|
56
|
.affectedFiles { border: 1px #cccccc dotted; background-color: #eeeeee; font-style: italic; }
|
|
57
|
.sqlBox { border: 1px #84F0B5 solid; background-color: #EAF5DE; }
|
|
58
|
</style>
|
|
59
|
</head>
|
|
60
|
<body>
|
|
61
|
|
|
62
|
<h1>osCommerce Online Merchant v2.2 RC1 Upgrade Notes</h1>
|
|
63
|
|
|
64
|
<p>The following upgrade guide is based on the osCommerce 2.2 Milestone 2 Update 060817 release. If you have not yet updated to this release please review its upgrade guide in the extras directory (<a href="update-20060817.txt">update-20060817.txt</a>) before applying these changes.</p>
|
|
65
|
|
|
66
|
<p>The following changes should be performed in order on your installation to upgrade it to osCommerce Online Merchant v2.2 RC1. Please note that the following changes are only the recommended changes to make and does not include the new Administration Tool login routine or the Administration Tool index page summary modules that are available with new installations. This is to avoid a conflict with existing Administration Tool securing mechanisms already in place.</p>
|
|
67
|
|
|
68
|
<ul>
|
|
69
|
<li>[BUGFIX] Caching of the Manufacturers Box</li>
|
|
70
|
<li>[IMPROVEMENT] Database Backup</li>
|
|
71
|
<li>[IMPROVEMENT] Input Fields on Checkout Confirmation Page</li>
|
|
72
|
<li>[IMPROVEMENT] register_globals Compatibility for PHP 4.3+ Servers</li>
|
|
73
|
<li>[BUGFIX] Currency Case-Sensitivity</li>
|
|
74
|
<li>[BUGFIX] Invoice and Packing Slip Billing Address</li>
|
|
75
|
<li>[IMPROVEMENT] Configuration -> Minimum Values Settings</li>
|
|
76
|
<li>[BUGFIX] Compatibility Array Index</li>
|
|
77
|
<li>[IMPROVEMENT] MySQL Database Connection Identifier Link</li>
|
|
78
|
<li>[BUGFIX] Product Sorting SQL Injection Vulnerability</li>
|
|
79
|
<li>[BUGFIX] Product Price Calculations</li>
|
|
80
|
<li>[BUGFIX] Country Name on the Order History Page</li>
|
|
81
|
<li>[BUGFIX] Shopping Cart Product Quantity as Integer Value</li>
|
|
82
|
<li>[IMPROVEMENT] Maximum Order Product Quantities [+SQL]</li>
|
|
83
|
<li>[IMPROVEMENT] Accepting State Names</li>
|
|
84
|
<li>[BUGFIX] Load the Order Total Modules Before Loading the Payment Modules</li>
|
|
85
|
<li>[BUGFIX] Payment Module Selection</li>
|
|
86
|
<li>[BUGFIX] Category Image Removal</li>
|
|
87
|
<li>[BUGFIX] Add the Session ID to GET Based Forms</li>
|
|
88
|
<li>[BUGFIX] Fix Typo on the Products New Page</li>
|
|
89
|
<li>[BUGFIX] Process the Order Total Modules Earlier on the Checkout Confirmation Page</li>
|
|
90
|
<li>[BUGFIX] PHP < 4.1 Compatibility Update</li>
|
|
91
|
<li>[BUGFIX] Strip Additional Slashes When Editing Reviews</li>
|
|
92
|
<li>[IMPROVEMENT] New Public Title for Payment Modules</li>
|
|
93
|
<li>[IMPROVEMENT] Navigation History Parameter Filter</li>
|
|
94
|
<li>[IMPROVEMENT] Increase Configuration Key and Title Database Field Sizes [SQL]</li>
|
|
95
|
<li>[BUGFIX] Strip Additional Slashes When Editing Files Through the File Manager</li>
|
|
96
|
</Ul>
|
|
97
|
|
|
98
|
<h3>[BUGFIX] Caching of the Manufacturers Box</h3>
|
|
99
|
|
|
100
|
<p>Fix a spelling mistake preventing the manufacturers box being cached.</p>
|
|
101
|
|
|
102
|
<p class="affectedFiles"><b>Affected Files</b><br />
|
|
103
|
catalog/includes/functions/cache.php</p>
|
|
104
|
|
|
105
|
<span class="affectedFiles">File: catalog/includes/functions/cache.php</span>
|
|
106
|
|
|
107
|
<table class="fc" cellspacing="0" cellpadding="0">
|
|
108
|
<tr class="secBegin">
|
|
109
|
<td class="LineNum">119</td>
|
|
110
|
<td class="Normal"> function tep_cache_manufacturers_box($auto_expire = false, $refresh = false) {</td>
|
|
111
|
<td class="AlignCenter">=</td>
|
|
112
|
<td class="LineNum">119</td>
|
|
113
|
<td class="Normal"> function tep_cache_manufacturers_box($auto_expire = false, $refresh = false) {</td>
|
|
114
|
</tr>
|
|
115
|
<tr class="secMiddle">
|
|
116
|
<td class="LineNum">120</td>
|
|
117
|
<td class="Normal"> global $HTTP_GET_VARS, $language;</td>
|
|
118
|
<td class="AlignCenter"> </td>
|
|
119
|
<td class="LineNum">120</td>
|
|
120
|
<td class="Normal"> global $HTTP_GET_VARS, $language;</td>
|
|
121
|
</tr>
|
|
122
|
<tr class="secMiddle">
|
|
123
|
<td class="LineNum">121</td>
|
|
124
|
<td class="Normal"> </td>
|
|
125
|
<td class="AlignCenter"> </td>
|
|
126
|
<td class="LineNum">121</td>
|
|
127
|
<td class="Normal"> </td>
|
|
128
|
</tr>
|
|
129
|
<tr class="secMiddle">
|
|
130
|
<td class="LineNum">122</td>
|
|
131
|
<td class="Normal"> $cache_output = '';</td>
|
|
132
|
<td class="AlignCenter"> </td>
|
|
133
|
<td class="LineNum">122</td>
|
|
134
|
<td class="Normal"> $cache_output = '';</td>
|
|
135
|
</tr>
|
|
136
|
<tr class="secMiddle">
|
|
137
|
<td class="LineNum">123</td>
|
|
138
|
<td class="Normal"> </td>
|
|
139
|
<td class="AlignCenter"> </td>
|
|
140
|
<td class="LineNum">123</td>
|
|
141
|
<td class="Normal"> </td>
|
|
142
|
</tr>
|
|
143
|
<tr class="secEnd">
|
|
144
|
<td class="LineNum">124</td>
|
|
145
|
<td class="Normal"> $manufacturers_id = '';</td>
|
|
146
|
<td class="AlignCenter"> </td>
|
|
147
|
<td class="LineNum">124</td>
|
|
148
|
<td class="Normal"> $manufacturers_id = '';</td>
|
|
149
|
</tr>
|
|
150
|
<tr class="secAll">
|
|
151
|
<td class="LineNum">125</td>
|
|
152
|
<td class="HasMismatch"> if (isset($HTTP_GET_VARS['manufactuers_id']) && is_numeric($HTTP_GET_VARS['manufacturers_id'])) {</td>
|
|
153
|
<td class="AlignCenter"><></td>
|
|
154
|
<td class="LineNum">125</td>
|
|
155
|
<td class="HasMismatch"> if (isset($HTTP_GET_VARS['manufactu<span class="ttSigDiff">r</span>ers_id']) && is_numeric($HTTP_GET_VARS['manufacturers_id'])) {</td>
|
|
156
|
</tr>
|
|
157
|
<tr class="secBegin">
|
|
158
|
<td class="LineNum">126</td>
|
|
159
|
<td class="Normal"> $manufacturers_id = $HTTP_GET_VARS['manufacturers_id'];</td>
|
|
160
|
<td class="AlignCenter">=</td>
|
|
161
|
<td class="LineNum">126</td>
|
|
162
|
<td class="Normal"> $manufacturers_id = $HTTP_GET_VARS['manufacturers_id'];</td>
|
|
163
|
</tr>
|
|
164
|
<tr class="secMiddle">
|
|
165
|
<td class="LineNum">127</td>
|
|
166
|
<td class="Normal"> }</td>
|
|
167
|
<td class="AlignCenter"> </td>
|
|
168
|
<td class="LineNum">127</td>
|
|
169
|
<td class="Normal"> }</td>
|
|
170
|
</tr>
|
|
171
|
<tr class="secMiddle">
|
|
172
|
<td class="LineNum">128</td>
|
|
173
|
<td class="Normal"> </td>
|
|
174
|
<td class="AlignCenter"> </td>
|
|
175
|
<td class="LineNum">128</td>
|
|
176
|
<td class="Normal"> </td>
|
|
177
|
</tr>
|
|
178
|
<tr class="secMiddle">
|
|
179
|
<td class="LineNum">129</td>
|
|
180
|
<td class="Normal"> if (($refresh == true) || !read_cache($cache_output, 'manufacturers_box-' . $language . '.cache' . $manufacturers_id, $auto_expire)) {</td>
|
|
181
|
<td class="AlignCenter"> </td>
|
|
182
|
<td class="LineNum">129</td>
|
|
183
|
<td class="Normal"> if (($refresh == true) || !read_cache($cache_output, 'manufacturers_box-' . $language . '.cache' . $manufacturers_id, $auto_expire)) {</td>
|
|
184
|
</tr>
|
|
185
|
<tr class="secMiddle">
|
|
186
|
<td class="LineNum">130</td>
|
|
187
|
<td class="Normal"> ob_start();</td>
|
|
188
|
<td class="AlignCenter"> </td>
|
|
189
|
<td class="LineNum">130</td>
|
|
190
|
<td class="Normal"> ob_start();</td>
|
|
191
|
</tr>
|
|
192
|
<tr class="secEnd">
|
|
193
|
<td class="LineNum">131</td>
|
|
194
|
<td class="Normal"> include(DIR_WS_BOXES . 'manufacturers.php');</td>
|
|
195
|
<td class="AlignCenter"> </td>
|
|
196
|
<td class="LineNum">131</td>
|
|
197
|
<td class="Normal"> include(DIR_WS_BOXES . 'manufacturers.php');</td>
|
|
198
|
</tr>
|
|
199
|
</table>
|
|
200
|
|
|
201
|
<h3>[IMPROVEMENT] Database Backup</h3>
|
|
202
|
|
|
203
|
<p>Don't store the session and whos online database tables in the database backups.</p>
|
|
204
|
|
|
205
|
<p class="affectedFiles"><b>Affected Files</b><br />
|
|
206
|
catalog/admin/backup.php</p>
|
|
207
|
|
|
208
|
<span class="affectedFiles">File: catalog/admin/backup.php</span>
|
|
209
|
|
|
210
|
<table class="fc" cellspacing="0" cellpadding="0">
|
|
211
|
<tr class="secBegin">
|
|
212
|
<td class="LineNum">70</td>
|
|
213
|
<td class="Normal"> $keys_query = tep_db_query("show keys from " . $table);</td>
|
|
214
|
<td class="AlignCenter">=</td>
|
|
215
|
<td class="LineNum">70</td>
|
|
216
|
<td class="Normal"> $keys_query = tep_db_query("show keys from " . $table);</td>
|
|
217
|
</tr>
|
|
218
|
<tr class="secMiddle">
|
|
219
|
<td class="LineNum">71</td>
|
|
220
|
<td class="Normal"> while ($keys = tep_db_fetch_array($keys_query)) {</td>
|
|
221
|
<td class="AlignCenter"> </td>
|
|
222
|
<td class="LineNum">71</td>
|
|
223
|
<td class="Normal"> while ($keys = tep_db_fetch_array($keys_query)) {</td>
|
|
224
|
</tr>
|
|
225
|
<tr class="secMiddle">
|
|
226
|
<td class="LineNum">72</td>
|
|
227
|
<td class="Normal"> $kname = $keys['Key_name'];</td>
|
|
228
|
<td class="AlignCenter"> </td>
|
|
229
|
<td class="LineNum">72</td>
|
|
230
|
<td class="Normal"> $kname = $keys['Key_name'];</td>
|
|
231
|
</tr>
|
|
232
|
<tr class="secMiddle">
|
|
233
|
<td class="LineNum">73</td>
|
|
234
|
<td class="Normal"> </td>
|
|
235
|
<td class="AlignCenter"> </td>
|
|
236
|
<td class="LineNum">73</td>
|
|
237
|
<td class="Normal"> </td>
|
|
238
|
</tr>
|
|
239
|
<tr class="secMiddle">
|
|
240
|
<td class="LineNum">74</td>
|
|
241
|
<td class="Normal"> if (!isset($index[$kname])) {</td>
|
|
242
|
<td class="AlignCenter"> </td>
|
|
243
|
<td class="LineNum">74</td>
|
|
244
|
<td class="Normal"> if (!isset($index[$kname])) {</td>
|
|
245
|
</tr>
|
|
246
|
<tr class="secEnd">
|
|
247
|
<td class="LineNum">75</td>
|
|
248
|
<td class="Normal"> $index[$kname] = array('unique' => !$keys['Non_unique'],</td>
|
|
249
|
<td class="AlignCenter"> </td>
|
|
250
|
<td class="LineNum">75</td>
|
|
251
|
<td class="Normal"> $index[$kname] = array('unique' => !$keys['Non_unique'],</td>
|
|
252
|
</tr>
|
|
253
|
<tr class="secAll">
|
|
254
|
<td class="LineNum"> </td>
|
|
255
|
<td class="HasOrphan"> </td>
|
|
256
|
<td class="AlignCenter">-+</td>
|
|
257
|
<td class="LineNum">76</td>
|
|
258
|
<td class="HasOrphan"><span class="ttSigDiff"> 'fulltext' => ($keys['Index_type'] == 'FULLTEXT' ? '1' : '0'),</span></td>
|
|
259
|
</tr>
|
|
260
|
<tr class="secBegin">
|
|
261
|
<td class="LineNum">76</td>
|
|
262
|
<td class="Normal"> 'columns' => array());</td>
|
|
263
|
<td class="AlignCenter">=</td>
|
|
264
|
<td class="LineNum">77</td>
|
|
265
|
<td class="Normal"> 'columns' => array());</td>
|
|
266
|
</tr>
|
|
267
|
<tr class="secMiddle">
|
|
268
|
<td class="LineNum">77</td>
|
|
269
|
<td class="Normal"> }</td>
|
|
270
|
<td class="AlignCenter"> </td>
|
|
271
|
<td class="LineNum">78</td>
|
|
272
|
<td class="Normal"> }</td>
|
|
273
|
</tr>
|
|
274
|
<tr class="secMiddle">
|
|
275
|
<td class="LineNum">78</td>
|
|
276
|
<td class="Normal"> </td>
|
|
277
|
<td class="AlignCenter"> </td>
|
|
278
|
<td class="LineNum">79</td>
|
|
279
|
<td class="Normal"> </td>
|
|
280
|
</tr>
|
|
281
|
<tr class="secMiddle">
|
|
282
|
<td class="LineNum">79</td>
|
|
283
|
<td class="Normal"> $index[$kname]['columns'][] = $keys['Column_name'];</td>
|
|
284
|
<td class="AlignCenter"> </td>
|
|
285
|
<td class="LineNum">80</td>
|
|
286
|
<td class="Normal"> $index[$kname]['columns'][] = $keys['Column_name'];</td>
|
|
287
|
</tr>
|
|
288
|
<tr class="secMiddle">
|
|
289
|
<td class="LineNum">80</td>
|
|
290
|
<td class="Normal"> }</td>
|
|
291
|
<td class="AlignCenter"> </td>
|
|
292
|
<td class="LineNum">81</td>
|
|
293
|
<td class="Normal"> }</td>
|
|
294
|
</tr>
|
|
295
|
<tr class="secEnd">
|
|
296
|
<td class="LineNum">81</td>
|
|
297
|
<td class="Normal"> </td>
|
|
298
|
<td class="AlignCenter"> </td>
|
|
299
|
<td class="LineNum">82</td>
|
|
300
|
<td class="Normal"> </td>
|
|
301
|
</tr>
|
|
302
|
<tr class="secGap"><td colspan="5"> </td></tr>
|
|
303
|
<tr class="secBegin">
|
|
304
|
<td class="LineNum">83</td>
|
|
305
|
<td class="Normal"> $schema .= ',' . "\n";</td>
|
|
306
|
<td class="AlignCenter">=</td>
|
|
307
|
<td class="LineNum">84</td>
|
|
308
|
<td class="Normal"> $schema .= ',' . "\n";</td>
|
|
309
|
</tr>
|
|
310
|
<tr class="secMiddle">
|
|
311
|
<td class="LineNum">84</td>
|
|
312
|
<td class="Normal"> </td>
|
|
313
|
<td class="AlignCenter"> </td>
|
|
314
|
<td class="LineNum">85</td>
|
|
315
|
<td class="Normal"> </td>
|
|
316
|
</tr>
|
|
317
|
<tr class="secMiddle">
|
|
318
|
<td class="LineNum">85</td>
|
|
319
|
<td class="Normal"> $columns = implode($info['columns'], ', ');</td>
|
|
320
|
<td class="AlignCenter"> </td>
|
|
321
|
<td class="LineNum">86</td>
|
|
322
|
<td class="Normal"> $columns = implode($info['columns'], ', ');</td>
|
|
323
|
</tr>
|
|
324
|
<tr class="secMiddle">
|
|
325
|
<td class="LineNum">86</td>
|
|
326
|
<td class="Normal"> </td>
|
|
327
|
<td class="AlignCenter"> </td>
|
|
328
|
<td class="LineNum">87</td>
|
|
329
|
<td class="Normal"> </td>
|
|
330
|
</tr>
|
|
331
|
<tr class="secMiddle">
|
|
332
|
<td class="LineNum">87</td>
|
|
333
|
<td class="Normal"> if ($kname == 'PRIMARY') {</td>
|
|
334
|
<td class="AlignCenter"> </td>
|
|
335
|
<td class="LineNum">88</td>
|
|
336
|
<td class="Normal"> if ($kname == 'PRIMARY') {</td>
|
|
337
|
</tr>
|
|
338
|
<tr class="secEnd">
|
|
339
|
<td class="LineNum">88</td>
|
|
340
|
<td class="Normal"> $schema .= ' PRIMARY KEY (' . $columns . ')';</td>
|
|
341
|
<td class="AlignCenter"> </td>
|
|
342
|
<td class="LineNum">89</td>
|
|
343
|
<td class="Normal"> $schema .= ' PRIMARY KEY (' . $columns . ')';</td>
|
|
344
|
</tr>
|
|
345
|
<tr class="secBegin">
|
|
346
|
<td class="LineNum"> </td>
|
|
347
|
<td class="HasOrphan"> </td>
|
|
348
|
<td class="AlignCenter">-+</td>
|
|
349
|
<td class="LineNum">90</td>
|
|
350
|
<td class="HasOrphan"><span class="ttSigDiff"> } elseif ( $info['fulltext'] == '1' ) {</span></td>
|
|
351
|
</tr>
|
|
352
|
<tr class="secEnd">
|
|
353
|
<td class="LineNum"> </td>
|
|
354
|
<td class="HasOrphan"> </td>
|
|
355
|
<td class="AlignCenter"> </td>
|
|
356
|
<td class="LineNum">91</td>
|
|
357
|
<td class="HasOrphan"><span class="ttSigDiff"> $schema .= ' FULLTEXT ' . $kname . ' (' . $columns . ')';</span></td>
|
|
358
|
</tr>
|
|
359
|
<tr class="secBegin">
|
|
360
|
<td class="LineNum">89</td>
|
|
361
|
<td class="Normal"> } elseif ($info['unique']) {</td>
|
|
362
|
<td class="AlignCenter">=</td>
|
|
363
|
<td class="LineNum">92</td>
|
|
364
|
<td class="Normal"> } elseif ($info['unique']) {</td>
|
|
365
|
</tr>
|
|
366
|
<tr class="secMiddle">
|
|
367
|
<td class="LineNum">90</td>
|
|
368
|
<td class="Normal"> $schema .= ' UNIQUE ' . $kname . ' (' . $columns . ')';</td>
|
|
369
|
<td class="AlignCenter"> </td>
|
|
370
|
<td class="LineNum">93</td>
|
|
371
|
<td class="Normal"> $schema .= ' UNIQUE ' . $kname . ' (' . $columns . ')';</td>
|
|
372
|
</tr>
|
|
373
|
<tr class="secMiddle">
|
|
374
|
<td class="LineNum">91</td>
|
|
375
|
<td class="Normal"> } else {</td>
|
|
376
|
<td class="AlignCenter"> </td>
|
|
377
|
<td class="LineNum">94</td>
|
|
378
|
<td class="Normal"> } else {</td>
|
|
379
|
</tr>
|
|
380
|
<tr class="secMiddle">
|
|
381
|
<td class="LineNum">92</td>
|
|
382
|
<td class="Normal"> $schema .= ' KEY ' . $kname . ' (' . $columns . ')';</td>
|
|
383
|
<td class="AlignCenter"> </td>
|
|
384
|
<td class="LineNum">95</td>
|
|
385
|
<td class="Normal"> $schema .= ' KEY ' . $kname . ' (' . $columns . ')';</td>
|
|
386
|
</tr>
|
|
387
|
<tr class="secMiddle">
|
|
388
|
<td class="LineNum">93</td>
|
|
389
|
<td class="Normal"> }</td>
|
|
390
|
<td class="AlignCenter"> </td>
|
|
391
|
<td class="LineNum">96</td>
|
|
392
|
<td class="Normal"> }</td>
|
|
393
|
</tr>
|
|
394
|
<tr class="secMiddle">
|
|
395
|
<td class="LineNum">94</td>
|
|
396
|
<td class="Normal"> }</td>
|
|
397
|
<td class="AlignCenter"> </td>
|
|
398
|
<td class="LineNum">97</td>
|
|
399
|
<td class="Normal"> }</td>
|
|
400
|
</tr>
|
|
401
|
<tr class="secMiddle">
|
|
402
|
<td class="LineNum">95</td>
|
|
403
|
<td class="Normal"> </td>
|
|
404
|
<td class="AlignCenter"> </td>
|
|
405
|
<td class="LineNum">98</td>
|
|
406
|
<td class="Normal"> </td>
|
|
407
|
</tr>
|
|
408
|
<tr class="secMiddle">
|
|
409
|
<td class="LineNum">96</td>
|
|
410
|
<td class="Normal"> $schema .= "\n" . ');' . "\n\n";</td>
|
|
411
|
<td class="AlignCenter"> </td>
|
|
412
|
<td class="LineNum">99</td>
|
|
413
|
<td class="Normal"> $schema .= "\n" . ');' . "\n\n";</td>
|
|
414
|
</tr>
|
|
415
|
<tr class="secMiddle">
|
|
416
|
<td class="LineNum">97</td>
|
|
417
|
<td class="Normal"> fputs($fp, $schema);</td>
|
|
418
|
<td class="AlignCenter"> </td>
|
|
419
|
<td class="LineNum">100</td>
|
|
420
|
<td class="Normal"> fputs($fp, $schema);</td>
|
|
421
|
</tr>
|
|
422
|
<tr class="secMiddle">
|
|
423
|
<td class="LineNum">98</td>
|
|
424
|
<td class="Normal"> </td>
|
|
425
|
<td class="AlignCenter"> </td>
|
|
426
|
<td class="LineNum">101</td>
|
|
427
|
<td class="Normal"> </td>
|
|
428
|
</tr>
|
|
429
|
<tr class="secEnd">
|
|
430
|
<td class="LineNum">99</td>
|
|
431
|
<td class="Normal">// dump the data</td>
|
|
432
|
<td class="AlignCenter"> </td>
|
|
433
|
<td class="LineNum">102</td>
|
|
434
|
<td class="Normal">// dump the data</td>
|
|
435
|
</tr>
|
|
436
|
<tr class="secBegin">
|
|
437
|
<td class="LineNum"> </td>
|
|
438
|
<td class="HasOrphan"> </td>
|
|
439
|
<td class="AlignCenter"><></td>
|
|
440
|
<td class="LineNum">103</td>
|
|
441
|
<td class="HasOrphan"><span class="ttSigDiff"> if ( ($table != TABLE_SESSIONS ) && ($table != TABLE_WHOS_ONLINE) ) {</span></td>
|
|
442
|
</tr>
|
|
443
|
<tr class="secMiddle">
|
|
444
|
<td class="LineNum">100</td>
|
|
445
|
<td class="HasMismatch"> $rows_query = tep_db_query("select " . implode(',', $table_list) . " from " . $table);</td>
|
|
446
|
<td class="AlignCenter"> </td>
|
|
447
|
<td class="LineNum">104</td>
|
|
448
|
<td class="HasMismatch"> <span class="ttSigDiff"> </span>$rows_query = tep_db_query("select " . implode(',', $table_list) . " from " . $table);</td>
|
|
449
|
</tr>
|
|
450
|
<tr class="secMiddle">
|
|
451
|
<td class="LineNum">101</td>
|
|
452
|
<td class="HasMismatch"> while ($rows = tep_db_fetch_array($rows_query)) {</td>
|
|
453
|
<td class="AlignCenter"> </td>
|
|
454
|
<td class="LineNum">105</td>
|
|
455
|
<td class="HasMismatch"> <span class="ttSigDiff"> </span>while ($rows = tep_db_fetch_array($rows_query)) {</td>
|
|
456
|
</tr>
|
|
457
|
<tr class="secEnd">
|
|
458
|
<td class="LineNum">102</td>
|
|
459
|
<td class="HasMismatch"> $schema = 'insert into ' . $table . ' (' . implode(', ', $table_list) . ') values (';</td>
|
|
460
|
<td class="AlignCenter"> </td>
|
|
461
|
<td class="LineNum">106</td>
|
|
462
|
<td class="HasMismatch"> <span class="ttSigDiff"> </span>$schema = 'insert into ' . $table . ' (' . implode(', ', $table_list) . ') values (';</td>
|
|
463
|
</tr>
|
|
464
|
<tr class="secAll">
|
|
465
|
<td class="LineNum">103</td>
|
|
466
|
<td class="Normal"> </td>
|
|
467
|
<td class="AlignCenter">=</td>
|
|
468
|
<td class="LineNum">107</td>
|
|
469
|
<td class="Normal"> </td>
|
|
470
|
</tr>
|
|
471
|
<tr class="secBegin">
|
|
472
|
<td class="LineNum">104</td>
|
|
473
|
<td class="HasMismatch"> reset($table_list);</td>
|
|
474
|
<td class="AlignCenter"><></td>
|
|
475
|
<td class="LineNum">108</td>
|
|
476
|
<td class="HasMismatch"> <span class="ttSigDiff"> </span>reset($table_list);</td>
|
|
477
|
</tr>
|
|
478
|
<tr class="secMiddle">
|
|
479
|
<td class="LineNum">105</td>
|
|
480
|
<td class="HasMismatch"> while (list(,$i) = each($table_list)) {</td>
|
|
481
|
<td class="AlignCenter"> </td>
|
|
482
|
<td class="LineNum">109</td>
|
|
483
|
<td class="HasMismatch"> <span class="ttSigDiff"> </span>while (list(,$i) = each($table_list)) {</td>
|
|
484
|
</tr>
|
|
485
|
<tr class="secMiddle">
|
|
486
|
<td class="LineNum">106</td>
|
|
487
|
<td class="HasMismatch"> if (!isset($rows[$i])) {</td>
|
|
488
|
<td class="AlignCenter"> </td>
|
|
489
|
<td class="LineNum">110</td>
|
|
490
|
<td class="HasMismatch"> <span class="ttSigDiff"> </span>if (!isset($rows[$i])) {</td>
|
|
491
|
</tr>
|
|
492
|
<tr class="secMiddle">
|
|
493
|
<td class="LineNum">107</td>
|
|
494
|
<td class="HasMismatch"> $schema .= 'NULL, ';</td>
|
|
495
|
<td class="AlignCenter"> </td>
|
|
496
|
<td class="LineNum">111</td>
|
|
497
|
<td class="HasMismatch"> <span class="ttSigDiff"> </span>$schema .= 'NULL, ';</td>
|
|
498
|
</tr>
|
|
499
|
<tr class="secMiddle">
|
|
500
|
<td class="LineNum">108</td>
|
|
501
|
<td class="HasMismatch"> } elseif (tep_not_null($rows[$i])) {</td>
|
|
502
|
<td class="AlignCenter"> </td>
|
|
503
|
<td class="LineNum">112</td>
|
|
504
|
<td class="HasMismatch"> <span class="ttSigDiff"> </span>} elseif (tep_not_null($rows[$i])) {</td>
|
|
505
|
</tr>
|
|
506
|
<tr class="secMiddle">
|
|
507
|
<td class="LineNum">109</td>
|
|
508
|
<td class="HasMismatch"> $row = addslashes($rows[$i]);</td>
|
|
509
|
<td class="AlignCenter"> </td>
|
|
510
|
<td class="LineNum">113</td>
|
|
511
|
<td class="HasMismatch"> <span class="ttSigDiff"> </span>$row = addslashes($rows[$i]);</td>
|
|
512
|
</tr>
|
|
513
|
<tr class="secEnd">
|
|
514
|
<td class="LineNum">110</td>
|
|
515
|
<td class="HasMismatch"> $row = ereg_replace("\n#", "\n".'\#', $row);</td>
|
|
516
|
<td class="AlignCenter"> </td>
|
|
517
|
<td class="LineNum">114</td>
|
|
518
|
<td class="HasMismatch"> <span class="ttSigDiff"> </span>$row = ereg_replace("\n#", "\n".'\#', $row);</td>
|
|
519
|
</tr>
|
|
520
|
<tr class="secAll">
|
|
521
|
<td class="LineNum">111</td>
|
|
522
|
<td class="Normal"> </td>
|
|
523
|
<td class="AlignCenter">=</td>
|
|
524
|
<td class="LineNum">115</td>
|
|
525
|
<td class="Normal"> </td>
|
|
526
|
</tr>
|
|
527
|
<tr class="secBegin">
|
|
528
|
<td class="LineNum">112</td>
|
|
529
|
<td class="HasMismatch"> $schema .= '\'' . $row . '\', ';</td>
|
|
530
|
<td class="AlignCenter"><></td>
|
|
531
|
<td class="LineNum">116</td>
|
|
532
|
<td class="HasMismatch"> <span class="ttSigDiff"> </span>$schema .= '\'' . $row . '\', ';</td>
|
|
533
|
</tr>
|
|
534
|
<tr class="secMiddle">
|
|
535
|
<td class="LineNum">113</td>
|
|
536
|
<td class="HasMismatch"> } else {</td>
|
|
537
|
<td class="AlignCenter"> </td>
|
|
538
|
<td class="LineNum">117</td>
|
|
539
|
<td class="HasMismatch"> <span class="ttSigDiff"> </span>} else {</td>
|
|
540
|
</tr>
|
|
541
|
<tr class="secMiddle">
|
|
542
|
<td class="LineNum">114</td>
|
|
543
|
<td class="HasMismatch"> $schema .= '\'\', ';</td>
|
|
544
|
<td class="AlignCenter"> </td>
|
|
545
|
<td class="LineNum">118</td>
|
|
546
|
<td class="HasMismatch"> <span class="ttSigDiff"> </span>$schema .= '\'\', ';</td>
|
|
547
|
</tr>
|
|
548
|
<tr class="secEnd">
|
|
549
|
<td class="LineNum"> </td>
|
|
550
|
<td class="HasOrphan"> </td>
|
|
551
|
<td class="AlignCenter"> </td>
|
|
552
|
<td class="LineNum">119</td>
|
|
553
|
<td class="HasOrphan"><span class="ttSigDiff"> }</span></td>
|
|
554
|
</tr>
|
|
555
|
<tr class="secAll">
|
|
556
|
<td class="LineNum">115</td>
|
|
557
|
<td class="Normal"> }</td>
|
|
558
|
<td class="AlignCenter">=</td>
|
|
559
|
<td class="LineNum">120</td>
|
|
560
|
<td class="Normal"> }</td>
|
|
561
|
</tr>
|
|
562
|
<tr class="secBegin">
|
|
563
|
<td class="LineNum"> </td>
|
|
564
|
<td class="HasOrphan"> </td>
|
|
565
|
<td class="AlignCenter">-+</td>
|
|
566
|
<td class="LineNum">121</td>
|
|
567
|
<td class="HasOrphan"> </td>
|
|
568
|
</tr>
|
|
569
|
<tr class="secMiddle">
|
|
570
|
<td class="LineNum"> </td>
|
|
571
|
<td class="HasOrphan"> </td>
|
|
572
|
<td class="AlignCenter"> </td>
|
|
573
|
<td class="LineNum">122</td>
|
|
574
|
<td class="HasOrphan"><span class="ttSigDiff"> $schema = ereg_replace(', $', '', $schema) . ');' . "\n";</span></td>
|
|
575
|
</tr>
|
|
576
|
<tr class="secEnd">
|
|
577
|
<td class="LineNum"> </td>
|
|
578
|
<td class="HasOrphan"> </td>
|
|
579
|
<td class="AlignCenter"> </td>
|
|
580
|
<td class="LineNum">123</td>
|
|
581
|
<td class="HasOrphan"><span class="ttSigDiff"> fputs($fp, $schema);</span></td>
|
|
582
|
</tr>
|
|
583
|
<tr class="secAll">
|
|
584
|
<td class="LineNum">116</td>
|
|
585
|
<td class="Normal"> }</td>
|
|
586
|
<td class="AlignCenter">=</td>
|
|
587
|
<td class="LineNum">124</td>
|
|
588
|
<td class="Normal"> }</td>
|
|
589
|
</tr>
|
|
590
|
<tr class="secBegin">
|
|
591
|
<td class="LineNum">117</td>
|
|
592
|
<td class="HasOrphan"> </td>
|
|
593
|
<td class="AlignCenter">+-</td>
|
|
594
|
<td class="LineNum"> </td>
|
|
595
|
<td class="HasOrphan"> </td>
|
|
596
|
</tr>
|
|
597
|
<tr class="secMiddle">
|
|
598
|
<td class="LineNum">118</td>
|
|
599
|
<td class="HasOrphan"><span class="ttSigDiff"> $schema = ereg_replace(', $', '', $schema) . ');' . "\n";</span></td>
|
|
600
|
<td class="AlignCenter"> </td>
|
|
601
|
<td class="LineNum"> </td>
|
|
602
|
<td class="HasOrphan"> </td>
|
|
603
|
</tr>
|
|
604
|
<tr class="secMiddle">
|
|
605
|
<td class="LineNum">119</td>
|
|
606
|
<td class="HasOrphan"><span class="ttSigDiff"> fputs($fp, $schema);</span></td>
|
|
607
|
<td class="AlignCenter"> </td>
|
|
608
|
<td class="LineNum"> </td>
|
|
609
|
<td class="HasOrphan"> </td>
|
|
610
|
</tr>
|
|
611
|
<tr class="secEnd">
|
|
612
|
<td class="LineNum">120</td>
|
|
613
|
<td class="HasOrphan"> </td>
|
|
614
|
<td class="AlignCenter"> </td>
|
|
615
|
<td class="LineNum"> </td>
|
|
616
|
<td class="HasOrphan"> </td>
|
|
617
|
</tr>
|
|
618
|
<tr class="secBegin">
|
|
619
|
<td class="LineNum">121</td>
|
|
620
|
<td class="Normal"> }</td>
|
|
621
|
<td class="AlignCenter">=</td>
|
|
622
|
<td class="LineNum">125</td>
|
|
623
|
<td class="Normal"> }</td>
|
|
624
|
</tr>
|
|
625
|
<tr class="secMiddle">
|
|
626
|
<td class="LineNum">122</td>
|
|
627
|
<td class="Normal"> }</td>
|
|
628
|
<td class="AlignCenter"> </td>
|
|
629
|
<td class="LineNum">126</td>
|
|
630
|
<td class="Normal"> }</td>
|
|
631
|
</tr>
|
|
632
|
<tr class="secMiddle">
|
|
633
|
<td class="LineNum">123</td>
|
|
634
|
<td class="Normal"> </td>
|
|
635
|
<td class="AlignCenter"> </td>
|
|
636
|
<td class="LineNum">127</td>
|
|
637
|
<td class="Normal"> </td>
|
|
638
|
</tr>
|
|
639
|
<tr class="secMiddle">
|
|
640
|
<td class="LineNum">124</td>
|
|
641
|
<td class="Normal"> fclose($fp);</td>
|
|
642
|
<td class="AlignCenter"> </td>
|
|
643
|
<td class="LineNum">128</td>
|
|
644
|
<td class="Normal"> fclose($fp);</td>
|
|
645
|
</tr>
|
|
646
|
<tr class="secMiddle">
|
|
647
|
<td class="LineNum">125</td>
|
|
648
|
<td class="Normal"> </td>
|
|
649
|
<td class="AlignCenter"> </td>
|
|
650
|
<td class="LineNum">129</td>
|
|
651
|
<td class="Normal"> </td>
|
|
652
|
</tr>
|
|
653
|
<tr class="secEnd">
|
|
654
|
<td class="LineNum">126</td>
|
|
655
|
<td class="Normal"> if (isset($HTTP_POST_VARS['download']) && ($HTTP_POST_VARS['download'] == 'yes')) {</td>
|
|
656
|
<td class="AlignCenter"> </td>
|
|
657
|
<td class="LineNum">130</td>
|
|
658
|
<td class="Normal"> if (isset($HTTP_POST_VARS['download']) && ($HTTP_POST_VARS['download'] == 'yes')) {</td>
|
|
659
|
</tr>
|
|
660
|
<tr class="secGap"><td colspan="5"> </td></tr>
|
|
661
|
<tr class="secBegin">
|
|
662
|
<td class="LineNum">247</td>
|
|
663
|
<td class="Normal"> tep_db_query("drop table if exists address_book, address_format, banners, banners_history, categories, categories_description, configuration, configuration_group, counter, counter_history, countries, currencies, customers, customers_basket, customers_basket_attributes, customers_info, languages, manufacturers, manufacturers_info, orders, orders_products, orders_status, orders_status_history, orders_products_attributes, orders_products_download, products, products_attributes, products_attributes_download, prodcts_description, products_options, products_options_values, products_options_values_to_products_options, products_to_categories, reviews, reviews_description, sessions, specials, tax_class, tax_rates, geo_zones, whos_online, zones, zones_to_geo_zones");</td>
|
|
664
|
<td class="AlignCenter">=</td>
|
|
665
|
<td class="LineNum">251</td>
|
|
666
|
<td class="Normal"> tep_db_query("drop table if exists address_book, address_format, banners, banners_history, categories, categories_description, configuration, configuration_group, counter, counter_history, countries, currencies, customers, customers_basket, customers_basket_attributes, customers_info, languages, manufacturers, manufacturers_info, orders, orders_products, orders_status, orders_status_history, orders_products_attributes, orders_products_download, products, products_attributes, products_attributes_download, prodcts_description, products_options, products_options_values, products_options_values_to_products_options, products_to_categories, reviews, reviews_description, sessions, specials, tax_class, tax_rates, geo_zones, whos_online, zones, zones_to_geo_zones");</td>
|
|
667
|
</tr>
|
|
668
|
<tr class="secMiddle">
|
|
669
|
<td class="LineNum">248</td>
|
|
670
|
<td class="Normal"> </td>
|
|
671
|
<td class="AlignCenter"> </td>
|
|
672
|
<td class="LineNum">252</td>
|
|
673
|
<td class="Normal"> </td>
|
|
674
|
</tr>
|
|
675
|
<tr class="secMiddle">
|
|
676
|
<td class="LineNum">249</td>
|
|
677
|
<td class="Normal"> for ($i=0, $n=sizeof($sql_array); $i<$n; $i++) {</td>
|
|
678
|
<td class="AlignCenter"> </td>
|
|
679
|
<td class="LineNum">253</td>
|
|
680
|
<td class="Normal"> for ($i=0, $n=sizeof($sql_array); $i<$n; $i++) {</td>
|
|
681
|
</tr>
|
|
682
|
<tr class="secMiddle">
|
|
683
|
<td class="LineNum">250</td>
|
|
684
|
<td class="Normal"> tep_db_query($sql_array[$i]);</td>
|
|
685
|
<td class="AlignCenter"> </td>
|
|
686
|
<td class="LineNum">254</td>
|
|
687
|
<td class="Normal"> tep_db_query($sql_array[$i]);</td>
|
|
688
|
</tr>
|
|
689
|
<tr class="secMiddle">
|
|
690
|
<td class="LineNum">251</td>
|
|
691
|
<td class="Normal"> }</td>
|
|
692
|
<td class="AlignCenter"> </td>
|
|
693
|
<td class="LineNum">255</td>
|
|
694
|
<td class="Normal"> }</td>
|
|
695
|
</tr>
|
|
696
|
<tr class="secEnd">
|
|
697
|
<td class="LineNum">252</td>
|
|
698
|
<td class="Normal"> </td>
|
|
699
|
<td class="AlignCenter"> </td>
|
|
700
|
<td class="LineNum">256</td>
|
|
701
|
<td class="Normal"> </td>
|
|
702
|
</tr>
|
|
703
|
<tr class="secBegin">
|
|
704
|
<td class="LineNum"> </td>
|
|
705
|
<td class="HasOrphan"> </td>
|
|
706
|
<td class="AlignCenter">-+</td>
|
|
707
|
<td class="LineNum">257</td>
|
|
708
|
<td class="HasOrphan"><span class="ttSigDiff"> tep_session_close();</span></td>
|
|
709
|
</tr>
|
|
710
|
<tr class="secMiddle">
|
|
711
|
<td class="LineNum"> </td>
|
|
712
|
<td class="HasOrphan"> </td>
|
|
713
|
<td class="AlignCenter"> </td>
|
|
714
|
<td class="LineNum">258</td>
|
|
715
|
<td class="HasOrphan"> </td>
|
|
716
|
</tr>
|
|
717
|
<tr class="secMiddle">
|
|
718
|
<td class="LineNum"> </td>
|
|
719
|
<td class="HasOrphan"> </td>
|
|
720
|
<td class="AlignCenter"> </td>
|
|
721
|
<td class="LineNum">259</td>
|
|
722
|
<td class="HasOrphan"><span class="ttSigDiff"> tep_db_query("delete from " . TABLE_WHOS_ONLINE);</span></td>
|
|
723
|
</tr>
|
|
724
|
<tr class="secMiddle">
|
|
725
|
<td class="LineNum"> </td>
|
|
726
|
<td class="HasOrphan"> </td>
|
|
727
|
<td class="AlignCenter"> </td>
|
|
728
|
<td class="LineNum">260</td>
|
|
729
|
<td class="HasOrphan"><span class="ttSigDiff"> tep_db_query("delete from " . TABLE_SESSIONS);</span></td>
|
|
730
|
</tr>
|
|
731
|
<tr class="secEnd">
|
|
732
|
<td class="LineNum"> </td>
|
|
733
|
<td class="HasOrphan"> </td>
|
|
734
|
<td class="AlignCenter"> </td>
|
|
735
|
<td class="LineNum">261</td>
|
|
736
|
<td class="HasOrphan"> </td>
|
|
737
|
</tr>
|
|
738
|
<tr class="secBegin">
|
|
739
|
<td class="LineNum">253</td>
|
|
740
|
<td class="Normal"> tep_db_query("delete from " . TABLE_CONFIGURATION . " where configuration_key = 'DB_LAST_RESTORE'");</td>
|
|
741
|
<td class="AlignCenter">=</td>
|
|
742
|
<td class="LineNum">262</td>
|
|
743
|
<td class="Normal"> tep_db_query("delete from " . TABLE_CONFIGURATION . " where configuration_key = 'DB_LAST_RESTORE'");</td>
|
|
744
|
</tr>
|
|
745
|
<tr class="secMiddle">
|
|
746
|
<td class="LineNum">254</td>
|
|
747
|
<td class="Normal"> tep_db_query("insert into " . TABLE_CONFIGURATION . " values ('', 'Last Database Restore', 'DB_LAST_RESTORE', '" . $read_from . "', 'Last database restore file', '6', '', '', now(), '', '')");</td>
|
|
748
|
<td class="AlignCenter"> </td>
|
|
749
|
<td class="LineNum">263</td>
|
|
750
|
<td class="Normal"> tep_db_query("insert into " . TABLE_CONFIGURATION . " values ('', 'Last Database Restore', 'DB_LAST_RESTORE', '" . $read_from . "', 'Last database restore file', '6', '', '', now(), '', '')");</td>
|
|
751
|
</tr>
|
|
752
|
<tr class="secMiddle">
|
|
753
|
<td class="LineNum">255</td>
|
|
754
|
<td class="Normal"> </td>
|
|
755
|
<td class="AlignCenter"> </td>
|
|
756
|
<td class="LineNum">264</td>
|
|
757
|
<td class="Normal"> </td>
|
|
758
|
</tr>
|
|
759
|
<tr class="secMiddle">
|
|
760
|
<td class="LineNum">256</td>
|
|
761
|
<td class="Normal"> if (isset($remove_raw) && ($remove_raw == true)) {</td>
|
|
762
|
<td class="AlignCenter"> </td>
|
|
763
|
<td class="LineNum">265</td>
|
|
764
|
<td class="Normal"> if (isset($remove_raw) && ($remove_raw == true)) {</td>
|
|
765
|
</tr>
|
|
766
|
<tr class="secMiddle">
|
|
767
|
<td class="LineNum">257</td>
|
|
768
|
<td class="Normal"> unlink($restore_from);</td>
|
|
769
|
<td class="AlignCenter"> </td>
|
|
770
|
<td class="LineNum">266</td>
|
|
771
|
<td class="Normal"> unlink($restore_from);</td>
|
|
772
|
</tr>
|
|
773
|
<tr class="secEnd">
|
|
774
|
<td class="LineNum">258</td>
|
|
775
|
<td class="Normal"> }</td>
|
|
776
|
<td class="AlignCenter"> </td>
|
|
777
|
<td class="LineNum">267</td>
|
|
778
|
<td class="Normal"> }</td>
|
|
779
|
</tr>
|
|
780
|
</table>
|
|
781
|
|
|
782
|
<h3>[IMPROVEMENT] Input Fields on Checkout Confirmation Page</h3>
|
|
783
|
|
|
784
|
<p>Allow payment modules to display input fields on the checkout confirmation page. This is for PCI conformance where the credit card number can be directly passed to the payment gateway.</p>
|
|
785
|
|
|
786
|
<p class="affectedFiles"><b>Affected Files</b><br />
|
|
787
|
catalog/checkout_confirmation.php</p>
|
|
788
|
|
|
789
|
<span class="affectedFiles">File: catalog/checkout_confirmation.php</span>
|
|
790
|
|
|
791
|
<table class="fc" cellspacing="0" cellpadding="0">
|
|
792
|
<tr class="secBegin">
|
|
793
|
<td class="LineNum">107</td>
|
|
794
|
<td class="Normal"><?php require(DIR_WS_INCLUDES . 'column_left.php'); ?></td>
|
|
795
|
<td class="AlignCenter">=</td>
|
|
796
|
<td class="LineNum">107</td>
|
|
797
|
<td class="Normal"><?php require(DIR_WS_INCLUDES . 'column_left.php'); ?></td>
|
|
798
|
</tr>
|
|
799
|
<tr class="secMiddle">
|
|
800
|
<td class="LineNum">108</td>
|
|
801
|
<td class="Normal"><!-- left_navigation_eof //--></td>
|
|
802
|
<td class="AlignCenter"> </td>
|
|
803
|
<td class="LineNum">108</td>
|
|
804
|
<td class="Normal"><!-- left_navigation_eof //--></td>
|
|
805
|
</tr>
|
|
806
|
<tr class="secMiddle">
|
|
807
|
<td class="LineNum">109</td>
|
|
808
|
<td class="Normal"> </table></td></td>
|
|
809
|
<td class="AlignCenter"> </td>
|
|
810
|
<td class="LineNum">109</td>
|
|
811
|
<td class="Normal"> </table></td></td>
|
|
812
|
</tr>
|
|
813
|
<tr class="secMiddle">
|
|
814
|
<td class="LineNum">110</td>
|
|
815
|
<td class="Normal"><!-- body_text //--></td>
|
|
816
|
<td class="AlignCenter"> </td>
|
|
817
|
<td class="LineNum">110</td>
|
|
818
|
<td class="Normal"><!-- body_text //--></td>
|
|
819
|
</tr>
|
|
820
|
<tr class="secMiddle">
|
|
821
|
<td class="LineNum">111</td>
|
|
822
|
<td class="Normal"> <td width="100%" valign="top"><table border="0" width="100%" cellspacing="0" cellpadding="0"></td>
|
|
823
|
<td class="AlignCenter"> </td>
|
|
824
|
<td class="LineNum">111</td>
|
|
825
|
<td class="Normal"> <td width="100%" valign="top"><table border="0" width="100%" cellspacing="0" cellpadding="0"></td>
|
|
826
|
</tr>
|
|
827
|
<tr class="secEnd">
|
|
828
|
<td class="LineNum">112</td>
|
|
829
|
<td class="Normal"> <tr></td>
|
|
830
|
<td class="AlignCenter"> </td>
|
|
831
|
<td class="LineNum">112</td>
|
|
832
|
<td class="Normal"> <tr></td>
|
|
833
|
</tr>
|
|
834
|
<tr class="secBegin">
|
|
835
|
<td class="LineNum"> </td>
|
|
836
|
<td class="HasOrphan"> </td>
|
|
837
|
<td class="AlignCenter"><></td>
|
|
838
|
<td class="LineNum">113</td>
|
|
839
|
<td class="HasOrphan"><span class="ttSigDiff"> <td></span></td>
|
|
840
|
</tr>
|
|
841
|
<tr class="secMiddle">
|
|
842
|
<td class="LineNum"> </td>
|
|
843
|
<td class="HasOrphan"> </td>
|
|
844
|
<td class="AlignCenter"> </td>
|
|
845
|
<td class="LineNum">114</td>
|
|
846
|
<td class="HasOrphan"><span class="ttSigDiff"><?php</span></td>
|
|
847
|
</tr>
|
|
848
|
<tr class="secMiddle">
|
|
849
|
<td class="LineNum"> </td>
|
|
850
|
<td class="HasOrphan"> </td>
|
|
851
|
<td class="AlignCenter"> </td>
|
|
852
|
<td class="LineNum">115</td>
|
|
853
|
<td class="HasOrphan"><span class="ttSigDiff"> if (isset($$payment->form_action_url)) {</span></td>
|
|
854
|
</tr>
|
|
855
|
<tr class="secMiddle">
|
|
856
|
<td class="LineNum"> </td>
|
|
857
|
<td class="HasOrphan"> </td>
|
|
858
|
<td class="AlignCenter"> </td>
|
|
859
|
<td class="LineNum">116</td>
|
|
860
|
<td class="HasOrphan"><span class="ttSigDiff"> $form_action_url = $$payment->form_action_url;</span></td>
|
|
861
|
</tr>
|
|
862
|
<tr class="secMiddle">
|
|
863
|
<td class="LineNum"> </td>
|
|
864
|
<td class="HasOrphan"> </td>
|
|
865
|
<td class="AlignCenter"> </td>
|
|
866
|
<td class="LineNum">117</td>
|
|
867
|
<td class="HasOrphan"><span class="ttSigDiff"> } else {</span></td>
|
|
868
|
</tr>
|
|
869
|
<tr class="secMiddle">
|
|
870
|
<td class="LineNum"> </td>
|
|
871
|
<td class="HasOrphan"> </td>
|
|
872
|
<td class="AlignCenter"> </td>
|
|
873
|
<td class="LineNum">118</td>
|
|
874
|
<td class="HasOrphan"><span class="ttSigDiff"> $form_action_url = tep_href_link(FILENAME_CHECKOUT_PROCESS, '', 'SSL');</span></td>
|
|
875
|
</tr>
|
|
876
|
<tr class="secMiddle">
|
|
877
|
<td class="LineNum"> </td>
|
|
878
|
<td class="HasOrphan"> </td>
|
|
879
|
<td class="AlignCenter"> </td>
|
|
880
|
<td class="LineNum">119</td>
|
|
881
|
<td class="HasOrphan"><span class="ttSigDiff"> }</span></td>
|
|
882
|
</tr>
|
|
883
|
<tr class="secMiddle">
|
|
884
|
<td class="LineNum"> </td>
|
|
885
|
<td class="HasOrphan"> </td>
|
|
886
|
<td class="AlignCenter"> </td>
|
|
887
|
<td class="LineNum">120</td>
|
|
888
|
<td class="HasOrphan"> </td>
|
|
889
|
</tr>
|
|
890
|
<tr class="secMiddle">
|
|
891
|
<td class="LineNum"> </td>
|
|
892
|
<td class="HasOrphan"> </td>
|
|
893
|
<td class="AlignCenter"> </td>
|
|
894
|
<td class="LineNum">121</td>
|
|
895
|
<td class="HasOrphan"><span class="ttSigDiff"> echo tep_draw_form('checkout_confirmation', $form_action_url, 'post');</span></td>
|
|
896
|
</tr>
|
|
897
|
<tr class="secMiddle">
|
|
898
|
<td class="LineNum"> </td>
|
|
899
|
<td class="HasOrphan"> </td>
|
|
900
|
<td class="AlignCenter"> </td>
|
|
901
|
<td class="LineNum">122</td>
|
|
902
|
<td class="HasOrphan"><span class="ttSigDiff">?></span></td>
|
|
903
|
</tr>
|
|
904
|
<tr class="secEnd">
|
|
905
|
<td class="LineNum">113</td>
|
|
906
|
<td class="HasMismatch"> <t<span class="ttSigDiff">d><t</span>able border="0" width="100%" cellspacing="0" cellpadding="0"></td>
|
|
907
|
<td class="AlignCenter"> </td>
|
|
908
|
<td class="LineNum">123</td>
|
|
909
|
<td class="HasMismatch"> <table border="0" width="100%" cellspacing="0" cellpadding="0"></td>
|
|
910
|
</tr>
|
|
911
|
<tr class="secBegin">
|
|
912
|
<td class="LineNum">114</td>
|
|
913
|
<td class="Normal"> <tr></td>
|
|
914
|
<td class="AlignCenter">=</td>
|
|
915
|
<td class="LineNum">124</td>
|
|
916
|
<td class="Normal"> <tr></td>
|
|
917
|
</tr>
|
|
918
|
<tr class="secMiddle">
|
|
919
|
<td class="LineNum">115</td>
|
|
920
|
<td class="Normal"> <td class="pageHeading"><?php echo HEADING_TITLE; ?></td></td>
|
|
921
|
<td class="AlignCenter"> </td>
|
|
922
|
<td class="LineNum">125</td>
|
|
923
|
<td class="Normal"> <td class="pageHeading"><?php echo HEADING_TITLE; ?></td></td>
|
|
924
|
</tr>
|
|
925
|
<tr class="secMiddle">
|
|
926
|
<td class="LineNum">116</td>
|
|
927
|
<td class="Normal"> <td class="pageHeading" align="right"><?php echo tep_image(DIR_WS_IMAGES . 'table_background_confirmation.gif', HEADING_TITLE, HEADING_IMAGE_WIDTH, HEADING_IMAGE_HEIGHT); ?></td></td>
|
|
928
|
<td class="AlignCenter"> </td>
|
|
929
|
<td class="LineNum">126</td>
|
|
930
|
<td class="Normal"> <td class="pageHeading" align="right"><?php echo tep_image(DIR_WS_IMAGES . 'table_background_confirmation.gif', HEADING_TITLE, HEADING_IMAGE_WIDTH, HEADING_IMAGE_HEIGHT); ?></td></td>
|
|
931
|
</tr>
|
|
932
|
<tr class="secMiddle">
|
|
933
|
<td class="LineNum">117</td>
|
|
934
|
<td class="Normal"> </tr></td>
|
|
935
|
<td class="AlignCenter"> </td>
|
|
936
|
<td class="LineNum">127</td>
|
|
937
|
<td class="Normal"> </tr></td>
|
|
938
|
</tr>
|
|
939
|
<tr class="secMiddle">
|
|
940
|
<td class="LineNum">118</td>
|
|
941
|
<td class="Normal"> </table></td></td>
|
|
942
|
<td class="AlignCenter"> </td>
|
|
943
|
<td class="LineNum">128</td>
|
|
944
|
<td class="Normal"> </table></td></td>
|
|
945
|
</tr>
|
|
946
|
<tr class="secEnd">
|
|
947
|
<td class="LineNum">119</td>
|
|
948
|
<td class="Normal"> </tr></td>
|
|
949
|
<td class="AlignCenter"> </td>
|
|
950
|
<td class="LineNum">129</td>
|
|
951
|
<td class="Normal"> </tr></td>
|
|
952
|
</tr>
|
|
953
|
<tr class="secGap"><td colspan="5"> </td></tr>
|
|
954
|
<tr class="secBegin">
|
|
955
|
<td class="LineNum">306</td>
|
|
956
|
<td class="Normal">?></td>
|
|
957
|
<td class="AlignCenter">=</td>
|
|
958
|
<td class="LineNum">316</td>
|
|
959
|
<td class="Normal">?></td>
|
|
960
|
</tr>
|
|
961
|
<tr class="secMiddle">
|
|
962
|
<td class="LineNum">307</td>
|
|
963
|
<td class="Normal"> <tr></td>
|
|
964
|
<td class="AlignCenter"> </td>
|
|
965
|
<td class="LineNum">317</td>
|
|
966
|
<td class="Normal"> <tr></td>
|
|
967
|
</tr>
|
|
968
|
<tr class="secMiddle">
|
|
969
|
<td class="LineNum">308</td>
|
|
970
|
<td class="Normal"> <td><table border="0" width="100%" cellspacing="0" cellpadding="0"></td>
|
|
971
|
<td class="AlignCenter"> </td>
|
|
972
|
<td class="LineNum">318</td>
|
|
973
|
<td class="Normal"> <td><table border="0" width="100%" cellspacing="0" cellpadding="0"></td>
|
|
974
|
</tr>
|
|
975
|
<tr class="secMiddle">
|
|
976
|
<td class="LineNum">309</td>
|
|
977
|
<td class="Normal"> <tr></td>
|
|
978
|
<td class="AlignCenter"> </td>
|
|
979
|
<td class="LineNum">319</td>
|
|
980
|
<td class="Normal"> <tr></td>
|
|
981
|
</tr>
|
|
982
|
<tr class="secMiddle">
|
|
983
|
<td class="LineNum">310</td>
|
|
984
|
<td class="Normal"> <td align="right" class="main"></td>
|
|
985
|
<td class="AlignCenter"> </td>
|
|
986
|
<td class="LineNum">320</td>
|
|
987
|
<td class="Normal"> <td align="right" class="main"></td>
|
|
988
|
</tr>
|
|
989
|
<tr class="secEnd">
|
|
990
|
<td class="LineNum">311</td>
|
|
991
|
<td class="Normal"><?php</td>
|
|
992
|
<td class="AlignCenter"> </td>
|
|
993
|
<td class="LineNum">321</td>
|
|
994
|
<td class="Normal"><?php</td>
|
|
995
|
</tr>
|
|
996
|
<tr class="secBegin">
|
|
997
|
<td class="LineNum">312</td>
|
|
998
|
<td class="HasOrphan"><span class="ttSigDiff"> if (isset($$payment->form_action_url)) {</span></td>
|
|
999
|
<td class="AlignCenter">+-</td>
|
|
1000
|
<td class="LineNum"> </td>
|
|
1001
|
<td class="HasOrphan"> </td>
|
|
1002
|
</tr>
|
|
1003
|
<tr class="secMiddle">
|
|
1004
|
<td class="LineNum">313</td>
|
|
1005
|
<td class="HasOrphan"><span class="ttSigDiff"> $form_action_url = $$payment->form_action_url;</span></td>
|
|
1006
|
<td class="AlignCenter"> </td>
|
|
1007
|
<td class="LineNum"> </td>
|
|
1008
|
<td class="HasOrphan"> </td>
|
|
1009
|
</tr>
|
|
1010
|
<tr class="secMiddle">
|
|
1011
|
<td class="LineNum">314</td>
|
|
1012
|
<td class="HasOrphan"><span class="ttSigDiff"> } else {</span></td>
|
|
1013
|
<td class="AlignCenter"> </td>
|
|
1014
|
<td class="LineNum"> </td>
|
|
1015
|
<td class="HasOrphan"> </td>
|
|
1016
|
</tr>
|
|
1017
|
<tr class="secMiddle">
|
|
1018
|
<td class="LineNum">315</td>
|
|
1019
|
<td class="HasOrphan"><span class="ttSigDiff"> $form_action_url = tep_href_link(FILENAME_CHECKOUT_PROCESS, '', 'SSL');</span></td>
|
|
1020
|
<td class="AlignCenter"> </td>
|
|
1021
|
<td class="LineNum"> </td>
|
|
1022
|
