forked from osCommerce/oscommerce2
-
Notifications
You must be signed in to change notification settings - Fork 1
/
upgrade.html
5952 lines (5680 loc) · 652 KB
/
upgrade.html
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
<html>
<head>
<title>osCommerce Online Merchant v2.2 RC2 Upgrade Notes</title>
<style>
/* HTML tag styles */
body{ font-family:Verdana,Arial,sans-serif; line-height:1.166; margin:0px; padding:10px; background-color:#fafafa; font-size: 13px; }
a:link, a:visited, a:hover { text-decoration:none; }
a:link, a:hover { color: #036; }
a:visited { color:#158; }
a:hover { text-decoration: underline; }
/**** Global Box Colours & Icons ****/
/* INTERNAL BORDER COLOUR */
.genericPane .dirPane .welcomePane, #fileTable, .ftFileRow td, .ftFileRowDeleted td, .history,
.searchItemDirectory, .searchItemRevision, .searchItemFile, .searchTabResults td, .changesetList
{ border-top:1px #ccc solid }
.searchTabResults tr.startOfGroup td { border-top:2px #777 solid }
/* ITEM TYPE ICONS */
.searchItemDirectory{ background: url(images/directoryIcon.gif) top left no-repeat }
.searchItemRevision{ background: url(images/revisionIcon.gif) top left no-repeat }
.searchItemRevision, .history{ background: url(images/revisionIcon.gif) top left no-repeat }
.changesetDetail, .changesetList{ background: url(images/changesetIcon.gif) top left no-repeat }
/* FILE TYPE ICONS */
.searchItemFile, .ftIconCol{ background: url(images/fileIconGeneric.gif) top left no-repeat }
.ftFileRowDeleted td.ftIconCol{ background:#f0f0f0 url(images/fileIconDeleted.gif) top left no-repeat }
/* SUBDIRECTORY TREE ICONS */
.folder{ padding-left:20px; /* background:url(images/folderIcon.gif) top left no-repeat; */}
/* SUBDIRECTORY TREE filename styles */
.folderPlain{}
.folderEmpty{ color: #777; }
.folderHidden{ font-style: italic; }
.folderHiddenEmpty{ font-style: italic; color: #777 }
/* Basic Box Styles */
.box{ padding: 0px; margin: 0 0 7px 0; background-color:#fff; }
.box h3
{ color:#0a0a0a; font-size:.7em; font-family:Tahoma, Arial, Helvetica, sans-serif; border-width:0 0 1px 0;
background-color: #f9f9ff; padding:2px 0 2px 10px; margin:0px; }
.boxMessage
{ background:#fff; font-size:.75em; font-style:italic; color:#000000; margin:0px; padding:5px 5px 5px 30px; }
.boxBody{ font-size:0.75em; padding: 0 15px 0 15px;}
.boxIcon{ float:right;font-weight:normal;font-size:0.9em; margin:0; padding:0; }
.boxIcon img{ border-width:0px; margin-right:5px; }
.boxIconText{ vertical-align:top; margin-right:5px; }
/* Pane with Centred Text */
.centrePane{ text-align:center; font-size:0.75em;padding:10px; }
.centrePane p{ margin:0; }
/* tour */
#tourTop{background:url(tour/t_top.gif) top left no-repeat; padding-top:10px;}
#tourRight{ background:url(tour/t_right.gif) top right no-repeat; padding-right:21px; }
#tourBody{ background:url(tour/t_body.gif) top left repeat; padding:0px 10px; }
#tourCorner{ background:url(tour/t_corner.gif) top right no-repeat; padding-right:21px; }
#tourBottom{ background:url(tour/t_bottom.gif) top left no-repeat;padding-top:23px }
.tourTitle{ font-size:0.7em; position:absolute; left:15px; top:12px; font-weight:bold;}
.tourControls{ font-size:0.7em; position:absolute; right:18px; top:12px; font-weight:bold;}
.tourDescription{ font-size:0.8em; padding:20px 15px 0px 15px; }
.tourDescription p{ margin:0; padding-bottom:3px;}
.tourDescription a{ font-weight:bold;}
.tourDescription code{ font-size:120%; }
table.tourEg td { font-size:0.8em; }
table.tourEg { margin-left: 2px; border:1px solid #999;}
.bubbleLeft, .bubbleRight, .bubbleBelow, .bubbleAbove, .bubbleBelowRight { z-index:99; position:absolute; }
.bubbleBelow { margin: 20px 5px 0 15px; width:436px; background:url(tour/uparrow.gif) no-repeat top left; padding-top:37px; }
.bubbleBelowRight { margin-top:16px; width:436px; right:16px; background:url(tour/uparrowRight.gif) no-repeat top left; padding-top:37px; }
.bubbleBelow .bubbleText, .bubbleBelowRight .bubbleText { background:url(tour/upbottom.gif) bottom left no-repeat; padding:0px 25px 30px 25px; }
.bubbleAbove { margin-top: -70px; margin-left:15px; width:436px; background:url(tour/downarrow.gif) no-repeat bottom left; padding-bottom:37px; }
.bubbleAbove .bubbleText { background:url(tour/belowtop.gif) top left no-repeat; padding:15px 7px 0px 19px; }
.bubbleRight { left: 310px; margin-top:10px; width:292px; background:url(tour/leftarrow.gif) no-repeat top right; padding-top:19px; }
.bubbleLeft { left:30px; margin-top:10px; width:292px; background:url(tour/rightarrow.gif) no-repeat top right; padding-top:19px }
.bubbleLeft .bubbleText, .bubbleRight .bubbleText { background:url(tour/rightbottom.gif) bottom right no-repeat; padding:0px 25px 30px 25px; }
.bubbleText { font-family: Tahoma, Helvetica, sans-serif; font-size:11px; color:#000; font-weight:bold; text-align:center; }
/* file history styles */
.history{ display:block; color:#000000; font-size:.75em; padding:5px 5px 5px 30px; }
.history pre{ font-size:1em; margin:3px 0 3px 0; }
.history p{ margin:0; }
/* changeset styles */
.changesetDetail, .changesetList { display:block; color:#000000; font-size:.7em; }
.changesetDetail{ margin-top:10px; padding:5px 5px 10px 35px; }
.changesetDetail ul{ padding:0;margin:0; }
.changesetList{ padding:5px 5px 5px 30px; }
.changesetDetail pre, .changesetList pre{ font-size:105% }
.changesetList pre{ margin:3px 0 3px 0; }
.changesetDetail p{ margin:3px 0 3px 0; }
.changesetList p{ margin:0; }
.csId, .csAuthor{ font-weight:bold; }
.csAge{ display:inline; }
.csComment
{ padding:3px; margin-top:2px; font-size:1.08em; font-family:Monaco, "Lucida Console", "Courier New", Courier, monospace;
display:block; background-color:#fcfefe; }
.changesetDetail .csComment {
margin-top:8px;
}
li.csFilename{ list-style-type:none; padding-top:4px; white-space:nowrap; }
.changesetDetail li.csFilename { margin-top: 0px; }
.diffPaneChangset{ margin:10px; }
.controls{ padding-top:10px; }
.controls a, .controls a:link, .controls a:hover, .controls a:visited{ color:green; cursor:pointer; }
.csMore{ font-style:italic; }
/* linehistory style */
.linehistory{padding:5px 3px 5px 3px; font-size:small; text-align:center;}
.linehistory img{ width:300px; border:0;}
/* file table styles */
#fileTable{ border-width:0; width:100%;}
#ftTitle{ font-size:.7em; font-weight:bold;}
#ftTitle td{ padding:4px 0 4px 0; }
.ftIconCol{width:35px;vertical-align:top;}
.ftIconCol img{ margin:2px 0 0 6px; }
.ftFileRow td, .ftFileRowDeleted td{ font-size:.7em; border-width:1px 0 0 0; padding: 4px 0 0 0;}
.ftFileRowDeleted, .ftFileRowDeletedComment{ background-color:#f0f0f0 }
.ftFileName{ font-weight:bold; }
.ftRev{}
.ftAuthor{}
.ftComment{ font-size:.65em; padding:0 0 4px 0; }
/* form styles */
.formPane{ padding:5px; margin:0; white-space:nowrap; }
.formPane table{ font-size:0.7em; }
.formPane input, .formPane select, .formPane td{ font-size:100%; vertical-align:middle }
.formPane form{ margin:0; padding:0; }
.formPane td{ padding-left:10px; white-space:nowrap; vertical-align:middle; }
/* Admin Stuff #TODO: Fix this shite!! */
.label, .verb, .errorLabel { font-weight:bold; text-align:right; }
.checkboxLabel {font-size:140%;}
.verbDisabled {color:#a0a0a0; }
.errorLabel, .errorMessage, .checkboxErrorLabel { color:#cc3300; }
.statusMessage { color:#22aa00;}
.verb a:link, .verb a:hover, .verb a:visited { text-decoration:underline }
.adminTable { margin:5px; border:1px solid #ddd }
.adminTable th { background-color:#eee; }
.adminTable td, .adminTable th { padding:3px 6px; white-space:normal; }
.confirm
{ font-size:.7em; background:#ffffe1 url(images/infoIcon.gif) top left no-repeat; border:#ddd 1px solid;
text-align:center; line-height:2em; padding: 10px; margin: 6px }
.formPane h4 { font-size:0.8em; margin:10px 0 5px 5px; }
.description { font-style:italic }
.adminSubHeading { text-decoration:underline;font-weight:bold; }
/* search styles */
.searchCriteria{ padding:5px; }
.searchCriteria .formPane td { vertical-align:top; padding:5px 0 5px 0; }
.searchResults{ padding:0 0 5px 0; }
.searchItemDirectory, .searchItemRevision, .searchItemFile
{ display:block; font-size:.7em; padding:5px 5px 5px 30px; }
.searchItemDirectory pre, .searchItemRevision pre, .searchItemFile pre
{ font-size:100%; margin:3px 0 3px 0; }
.searchItemDirectory p, .searchItemRevision p, .searchItemFile p{ margin:0; }
.searchResultsSubItem { font-size:100%;margin-top:3px; padding-left:20px; }
.searchResultsSubItem pre{ font-size:100%; margin:0 0 3px 0; }
table.searchTabResults {font-size:.7em; margin:0; padding:0; }
.searchTabResults th, .searchTabResults td {text-align: left; margin:0; padding-right: 3px; vertical-align: top}
.searchTabResults td.numberTabCell {text-align: right;}
.pagination { font-size:.68em; padding:5px 10px 5px 10px; text-align:right; margin:0 }
/* quicksearch results */
.qsResult{ display:block; font-size:.7em; padding:0px 5px 0px 15px; margin:0; }
.qsSummary{ float:right; text-transform:none; font-weight:normal; padding-right:3px; }
.qsResult h4{ font-size:100%; margin:10px 0 0 0; }
.qsResult dt{ margin-top:5px; }
.qsResult dd{ padding-left:0; margin-left:15px; }
.qsResult p{ padding-left:15px; margin: 3px 0 0 0;}
.qsKeyword, .qsNumber{ font-weight:bold; }
.qsFileDir{ display:block; margin-top:3px; }
.qsFiles{ padding-left:15px; display:block; }
/* subdir tree styles */
.toolBar
{ text-align:right; font-size:0.65em; padding:0px 3px 0 3px; font-family:Tahoma, Arial, Helvetica, sans-serif;
/*border-bottom:1px solid #ccc;*/ }
.toolBarHidden, .toolBarEmpty, .toolBarSort
{ float:right; padding:2px 3px 2px 3px; background-color:#eee; border:1px solid #ccc; margin-top:4px }
.warningToolBar{ font-size:100%; padding:2px 3px; margin-top:4px; }
.prop .dirPane {padding-left:10px}
.dirPane{ padding:10px 10px 10px 0px; font-size:0.7em; font-family:Tahoma, Arial, Helvetica, sans-serif; }
.dirPane a:link, .dirPane a:hover, .dirPane a:visited{ color:#000; }
.dirPane ul, .dirPane ul ul{ margin:0; padding:0; }
.dirPane ul li, .dirPane ul ul li{ margin:0; padding:0; list-style-type:none; list-style-position:inside; }
.dirPane ul li{ margin-top:4px; }
.dirPane ul ul li{ margin-top:4px; margin-left:17px; }
/* subdir tree styles */
.helpPane{ padding:0px 10px 10px 10px;font-size:0.7em; font-family:Verdana, Arial, Helvetica, sans-serif;width:190px; }
.helpPane ul{ margin:0;padding:0; }
.helpPane ul li{ margin-top:5px; list-style-type:none;font-weight:bold; }
.helpPane ul ul li{ margin-left:10px; list-style-position:inside; list-style-type:square; font-weight:normal; }
.helpPaneContents{ color:#111; padding:10px 10px 10px 15px; font-size:0.75em; }
.helpPaneContents h4{ color:#222; margin:0; }
.helpPaneContents p{ margin:0 0 7px 0; }
code { font-size:120% }
.helpPaneContents dt{ font-size:.95em; margin-left:10px; font-weight:bold; font-style:italic; color:#444 }
.helpPaneContents dd{ margin:4px 0 7px 20px; }
/* Diff Sytles */
.diffPane{ padding: 10px 20px; }
.diff{ font-size:100%; white-space:nowrap; margin:0; padding:0; border:1px solid #ccc; }
.diffFile, .diffFileA, .diffFileB, .diffCS{ font-size:.9em; text-align:right; font-weight:bold; }
.diffCS{ font-weight:normal }
.diffWarning td.diffContent, .diffSkipped td.diffContent{ vertical-align:middle; padding:0 5px 0 5px; font-size:.9em; }
.diffWarning td.diffContent{ background:#ffffe1; }
.diffSkipped td.diffContent{ background:#fafafa; color:#444; }
.diffSection{ }
.diffPre { font-size:100%; margin:0; padding:0; }
.diffNav{ vertical-align:top; white-space:nowrap; }
/* Note A=Deleted B=Added */
.diffLineNumbers, .diffLineNumbersA, .diffLineNumbersB{ text-align:right; vertical-align:top; }
.diffMarkerCol, .diffMarkerColA, .diffMarkerColB, .diffWarning td.diffMarkerCol, .diffSkipped td.diffMarkerCol
{ padding-right:5px; text-align:center; vertical-align:middle; }
.diffMarkerCol{ border-right:1px solid #ccc }
.diffMarkerColA{ border-right:1px solid red; }
.diffMarkerColB{ border-right:1px solid green; }
.diffWarning td.diffMarkerCol{ border-right:1px solid yellow; }
.diffSkipped td.diffMarkerCol{ border-right:1px solid orange; }
.diffSkipped td.diffLineNumbers{ font-size:.9em; font-style:italic; }
.diffSkipped td.diffLineNumbers a:link, .diffSkipped td.diffLineNumbers a:visited{ color:orange; }
.diffContent, .diffContentA, .diffContentB, .ediffContentA, .ediffContentB{ padding-left:4px; text-align:left; vertical-align:top; }
/*
.diffContentA, .ediffContentA{ border-top:1px solid yellow; }
.diffContentB, .ediffContentB{ border-bottom:1px solid #dcfadc; }
*/
.diffLineNumbersA, .diffContentA, a.diffFileA:link, a.diffFileA:hover, a.diffFileA:visited, .ediffChangedA
{ color:red; background-color:#ffc; }
.diffLineNumbersB, .diffContentB, a.diffFileB:link, a.diffFileB:hover, a.diffFileB:visited, .ediffChangedB
{ color:green; background-color:#f0fff0 }
.ediffChangedA{ }
.ediffChangedB{ }
.ediffContentA{ background-color:#ffffed; }
.ediffContentB{ background-color:#fafffa; }
/* annotation styles */
.annPaneLegend{ font-size:.7em; padding:9px 5px 9px 9px; }
.annLegend{ font-size:0.9em; padding:0px; margin:8px 0 0 0; }
.annLegend td{ border:1px solid #ccc; padding:2px; margin-right:2px; text-align:center; }
.annPane{ font-size:.75em; padding:5px 10px 5px 10px; }
.annPane table{ font-size:100%; white-space:nowrap; margin:0; padding:0; border:1px solid #ccc; }
.annPane td{ text-align:right; vertical-align:top; padding:0 3px 0 5px; }
.annPane pre {margin: 0px; padding-bottom: 0px;}
.annPane span.annLine {font-family: monospace;}
td.annWarning, span.annWarning {text-align:left; font-size:.75em; border-right:1px solid yellow; background:#ffffe1; }
/**** changelog styles ****/
.chJoggerPane{ padding:5px 0 5px 1px; }
.chJogger{ font-size:.65em; padding:0; margin:0; white-space:nowrap }
.chJogger td{ text-align:center; vertical-align:top; padding:0; margin:0;}
td.chJoggerFrom{ text-align:left; padding-left:1px; }
td.chJoggerTo{ text-align:right; }
/* calendar */
.calPane{ text-align:center; padding:0 10px 5px 10px; margin:0; white-space:nowrap; }
.calPane a:link, .calPane a:hover, .calPane a:visited{ color:#000; text-decoration:none; }
.calPane a:hover{ text-decoration:underline; }
.calPane table{ font-size:.7em; margin:5px auto 0 auto;}
.calPane input, .calPane select, .calPane td{ font-size:100%; vertical-align:middle; white-space:nowrap; }
.calPane td{ font-size:100%; text-align:center}
.calDays{ }
.calDays td, .calMonths td{ border:1px solid #eee; }
.caldays td{ width:14%; background-color:#fbfff9; }
.calDays td.calDayCell{ border-bottom:1px solid #999; background-color:#fff; }
.calMonths td{ width:14%; background-color:#fbfff9; }
.calPane form{ margin:0; padding:0; }
.changelogMatching{ }
.caldays td.changelogShowing{ background-color:#ccffaa; color: #000 }
.caldays td.changelogShowing:hover{ background-color:#66FF00; }
.changelogMatchingCount{ font-size:.72em ; vertical-align:super }
/* "commandline" output */
.cmdlineHelpPane { margin:15px auto 0 auto; }
.cmdlineHelpPane { padding: 0 0px 0 15px;}
.cmdlineHelpPane a:link, .cmdlineHelpPane a:hover, .cmdlineHelpPane a:visited { text-decoration:underline }
.prefsTable {border: 1px solid #ccc; border-collapse:collapse;}
.prefsHeaderRow {padding: 3px 5px; background:#eee; font-weight:bold; border-top: 1px solid #ccc; border-bottom: 1px solid #ccc;}
.loading {font-family: Tahoma, Helvetica, Arial, sans-serif; font-size:0.9em; color:#666}
/* new diff styling */
/*
* Source Styles
*/
table.diff {
font-size:100%;
}
.diff td {
font-family:monospace;
font-size:small;
}
.unifiedDiff td.lineContent {
width:99%;
}
.sidebysideDiff td.lineContent {
width:49%;
}
.hardDiff td.lineContent {
white-space:pre;
}
.softDiff td.lineContent {
white-space:normal;
vertical-align:top;
}
.diff .commentForm {
/*border:1px solid orange;*/
background-color:#FFE7C6;
margin:0;
padding:5px 10px;
}
.diff td.lineNumber,
.diff td.diffLineNumbers {
text-align:right;
padding-right:9px;
padding-left:5px;
color:#999;
}
.diffNav{
vertical-align:top;
white-space:nowrap;
}
/* Note A=Deleted B=Added */
.diffLineNumbers,
.diffLineNumbersA,
.diffLineNumbersB {
text-align:right;
vertical-align:middle;
padding-right:9px;
}
.diffMarkerCol,
.diffMarkerColA,
.diffMarkerColB,
.diffWarning td.diffMarkerCol,
.diffSkipped td.diffMarkerCol {
padding-right: 5px;
text-align: center;
vertical-align: middle;
}
.diffMarkerCol {
border-right: 1px solid #ccc
}
.diffMarkerColA {
border-right: 1px solid red;
}
.diffMarkerColB {
border-right: 1px solid green;
}
.diffWarning td.diffMarkerCol {
border-right: 1px solid yellow;
}
.diffSkipped td.diffMarkerCol {
border-right: 1px solid orange;
}
.diffSkipped td.diffLineNumbers {
font-style: italic;
}
.diffSkipped td.diffLineNumbers a:link,
.diffSkipped td.diffLineNumbers a:visited {
color: orange;
}
.diffContent,
.diffContentA,
.diffContentB,
.ediffContentA,
.ediffContentB {
padding-left: 4px;
text-align: left;
vertical-align:middle;
}
td.diffContentA,
a.diffFileA:link,
a.diffFileA:hover,
a.diffFileA:visited,
.ediffChangedA{
color:red;
background-color:#ffc;
}
td.diffContentB,
a.diffFileB:link,
a.diffFileB:hover,
a.diffFileB:visited,
.ediffChangedB {
color:green; background-color:#f0fff0
}
.ediffChangedA{ }
.ediffChangedB{ }
.ediffContentA {
background-color: #ffffed;
}
.ediffContentB {
background-color: #fafffa;
}
.diff tr.sourceLine,
.diff tr.lineHighlighted {
cursor:default;
}
.diff .lineHighlighted,
.diff .lineHighlighted .diffLineNumbersA,
.diff .lineHighlighted .diffLineNumbersB,
.diff .lineHighlighted .diffContentA,
.diff .lineHighlighted .diffContentB,
.diff .lineHighlighted .ediffContentA,
.diff .lineHighlighted .ediffContentB,
.diff .lineHighlighted .ediffChangedA,
.diff .lineHighlighted .ediffChangedB {
background-color:#FFE7C6;
}
.textDelMarker, .textAddMarker {
font-weight:bold;
}
td.diffLineNumbersA,
.textDelMarker {
color:red;
}
td.diffLineNumbersB,
.textAddMarker {
color:green;
}
#quickSearch {
color:#333;
font-size:x-small;
}
input.qsInput {
height:12px;
}
.help {
background:transparent url(images/icn_12_help.gif) no-repeat right;
padding-right:14px;
}
.adminHelp {
background:transparent url(images/icn_12_help.gif) no-repeat left;
padding-right:10px;
}
a.adminHelp:hover {
text-decoration:none;
}
a.navPrevious {
background:transparent url(images/icn_12_arrowleft.gif) no-repeat left;
padding-left:16px;
}
a.navNext {
background:transparent url(images/icn_12_arrowright.gif) no-repeat right;
padding-right:16px;
}
/* Browser Specific Styles */
/*
ua=safari
*/
.uaIndicator{ color:
pink
} /* grey is default */
table.diff td, .annPane{
font-size:0.95em;
}
.diffPaneChangset{ font-size:140% }
pre.csComment{ font-size:135%; }
.affectedFiles { border: 1px #cccccc dotted; background-color: #eeeeee; font-style: italic; }
</style>
</head>
<body>
<h1>osCommerce Online Merchant v2.2 RC2 Upgrade Notes</h1>
<p>The following upgrade guide is based on the osCommerce 2.2 Release Candidate 1 release. If you have not yet updated to this release please review its upgrade guide in the extras directory (<a href="extras/upgrade-22rc1.html">upgrade-22rc1.html</a>) before applying these changes.</p>
<p>The following changes should be performed in order to upgrade an existing osCommerce Online Merchant v2.2 RC1 store to v2.2 RC2.</p>
<p><small><i>Legend: [SQL] Database Changes; [A] Administration Tool; [C] Catalog</i></small></p>
<ul>
<li>[SQL] Database changes</li>
<li>[A] Allow Administration Tool elements to be dynamically controlled</li>
<li>[C] Update download delivery routine</li>
<li>[C] Remove redundant currencies</li>
<li>[C] Update the navigation history class</li>
<li>[C] Update the order totals class</li>
<li>[C] Checkout procedure update</li>
<li>[C] Update product notifications</li>
<li>[AC] Improve register_globals compatibility layer</li>
<li>[AC] Introduce public orders and downloads status flags</li>
<li>[C] Update the free shipping method title</li>
<li>[C] Update credit card error messages</li>
<li>[A] Update File Manager</li>
<li>[A] Update the table block class</li>
<li>[A] MySQL 5.0 Strict Mode compatibility updates</li>
<li>[A] Update http_build_query() compatibility function</li>
<li>[A] Update Newsletter Manager</li>
<li>[AC] Update database session storage handler</li>
<li>[A] Update administration of categories</li>
<li>[C] Update processing of Address Book entries</li>
<li>[A] Update administration of product attributes</li>
<li>[A] Protect includes directory from direct HTTP requests</li>
<li>[A] Display module version if available</li>
<li>[A] Update database backup and restoration</li>
<li>[C] Update new products module</li>
</ul>
<h3>[SQL] Database changes</h3>
<ul>
<li>Add indexes to increase performance</li>
<li>Add public and download status flag fields to the orders_status table</li>
<li>Increase payment_method field size on the orders table</li>
<li>Increase the last_page_url field size on the whos_online table</li>
</ul>
<table class="diff hardDiff unifiedDiff" cellspacing="0">
<tr>
<td class="lineContent diffContent">alter table banners add index idx_banners_group (banners_group);
alter table banners_history add index idx_banners_history_banners_id (banners_id);
alter table currencies add index idx_currencies_code (code);
alter table customers add index idx_customers_email_address (customers_email_address);
alter table customers_basket add index idx_customers_basket_customers_id (customers_id);
alter table customers_basket_attributes add index idx_customers_basket_att_customers_id (customers_id);
alter table orders add index idx_orders_customers_id (customers_id);
alter table orders_products add index idx_orders_products_orders_id (orders_id);
alter table orders_products add index idx_orders_products_products_id (products_id);
alter table orders_status_history add index idx_orders_status_history_orders_id (orders_id);
alter table orders_products_attributes add index idx_orders_products_att_orders_id (orders_id);
alter table orders_products_download add index idx_orders_products_download_orders_id (orders_id);
alter table products add index idx_products_model (products_model);
alter table products_attributes add index idx_products_attributes_products_id (products_id);
alter table reviews add index idx_reviews_products_id (products_id);
alter table reviews add index idx_reviews_customers_id (customers_id);
alter table specials add index idx_specials_products_id (products_id);
alter table zones add index idx_zones_to_geo_zones_country_id (zone_country_id);
alter table orders_status add public_flag int DEFAULT '1';
alter table orders_status add downloads_flag int DEFAULT '0';
alter table orders modify payment_method varchar(255) NOT NULL;
alter table whos_online modify last_page_url text NOT NULL;</td>
</tr>
</table>
<h3>[A] Allow Administration Tool elements to be dynamically controlled</h3>
<ul>
<li>Add toggleDivBlock() Javascript function to admin/includes/general.js to allow elements on the Administration Tool to be dynamically controlled.</li>
</ul>
<p class="affectedFiles"><b>Affected Files</b><br />
catalog/admin/includes/general.js</p>
<span class="affectedFiles">File: catalog/admin/includes/general.js (<a href="http://svn.oscommerce.com/fisheye/browse/osCommerce/oscommerce2/trunk/catalog/admin/includes/general.js?r1=1635&r2=1663">online</a>) (<a href="http://svn.oscommerce.com/fisheye/rdiff/osCommerce/oscommerce2/trunk/catalog/admin/includes/general.js?r1=1635&r2=1663">raw</a>)</span>
<table class="diff hardDiff unifiedDiff" cellspacing="0">
<tr>
<td class="diffLineNumbers">31</td><td class="diffLineNumbers">31</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent">function rowOutEffect(object) {</td>
</tr>
<tr>
<td class="diffLineNumbers">32</td><td class="diffLineNumbers">32</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent"> if (object.className == 'dataTableRowOver') object.className = 'dataTableRow';</td>
</tr>
<tr>
<td class="diffLineNumbers">33</td><td class="diffLineNumbers">33</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent">}</td>
</tr>
<tr>
<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">34</td><td class="diffMarkerColB"><span class="textAddMarker">+</span></td><td class="lineContent diffContentB"></td>
</tr>
<tr>
<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">35</td><td class="diffMarkerColB"><span class="textAddMarker">+</span></td><td class="lineContent diffContentB">function toggleDivBlock(id) {</td>
</tr>
<tr>
<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">36</td><td class="diffMarkerColB"><span class="textAddMarker">+</span></td><td class="lineContent diffContentB"> if (document.getElementById) {</td>
</tr>
<tr>
<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">37</td><td class="diffMarkerColB"><span class="textAddMarker">+</span></td><td class="lineContent diffContentB"> itm = document.getElementById(id);</td>
</tr>
<tr>
<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">38</td><td class="diffMarkerColB"><span class="textAddMarker">+</span></td><td class="lineContent diffContentB"> } else if (document.all){</td>
</tr>
<tr>
<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">39</td><td class="diffMarkerColB"><span class="textAddMarker">+</span></td><td class="lineContent diffContentB"> itm = document.all[id];</td>
</tr>
<tr>
<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">40</td><td class="diffMarkerColB"><span class="textAddMarker">+</span></td><td class="lineContent diffContentB"> } else if (document.layers){</td>
</tr>
<tr>
<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">41</td><td class="diffMarkerColB"><span class="textAddMarker">+</span></td><td class="lineContent diffContentB"> itm = document.layers[id];</td>
</tr>
<tr>
<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">42</td><td class="diffMarkerColB"><span class="textAddMarker">+</span></td><td class="lineContent diffContentB"> }</td>
</tr>
<tr>
<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">43</td><td class="diffMarkerColB"><span class="textAddMarker">+</span></td><td class="lineContent diffContentB"></td>
</tr>
<tr>
<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">44</td><td class="diffMarkerColB"><span class="textAddMarker">+</span></td><td class="lineContent diffContentB"> if (itm) {</td>
</tr>
<tr>
<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">45</td><td class="diffMarkerColB"><span class="textAddMarker">+</span></td><td class="lineContent diffContentB"> if (itm.style.display != "none") {</td>
</tr>
<tr>
<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">46</td><td class="diffMarkerColB"><span class="textAddMarker">+</span></td><td class="lineContent diffContentB"> itm.style.display = "none";</td>
</tr>
<tr>
<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">47</td><td class="diffMarkerColB"><span class="textAddMarker">+</span></td><td class="lineContent diffContentB"> } else {</td>
</tr>
<tr>
<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">48</td><td class="diffMarkerColB"><span class="textAddMarker">+</span></td><td class="lineContent diffContentB"> itm.style.display = "block";</td>
</tr>
<tr>
<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">49</td><td class="diffMarkerColB"><span class="textAddMarker">+</span></td><td class="lineContent diffContentB"> }</td>
</tr>
<tr>
<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">50</td><td class="diffMarkerColB"><span class="textAddMarker">+</span></td><td class="lineContent diffContentB"> }</td>
</tr>
<tr>
<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">51</td><td class="diffMarkerColB"><span class="textAddMarker">+</span></td><td class="lineContent diffContentB">}</td>
</tr>
</table>
<h3>[C] Update download delivery routine</h3>
<ul>
<li>Fix downloads when "Download by redirect" and "SEFU" are both enabled.</li>
<li>Fallback to readfile() download delivery mechanism if direct download files.</li>
</ul>
<p class="affectedFiles"><b>Affected Files</b><br />
catalog/download.php</p>
<span class="affectedFiles">File: catalog/download.php (<a href="http://svn.oscommerce.com/fisheye/browse/osCommerce/oscommerce2/trunk/catalog/download.php?r1=477&r2=1720">online</a>) (<a href="http://svn.oscommerce.com/fisheye/rdiff/osCommerce/oscommerce2/trunk/catalog/download.php?r1=477&r2=1720">raw</a>)</span>
<table class="diff hardDiff unifiedDiff" cellspacing="0">
<tr>
<td class="diffLineNumbers">90</td><td class="diffLineNumbers">90</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent"> umask(0000);</td>
</tr>
<tr>
<td class="diffLineNumbers">91</td><td class="diffLineNumbers">91</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent"> mkdir(DIR_FS_DOWNLOAD_PUBLIC . $tempdir, 0777);</td>
</tr>
<tr>
<td class="diffLineNumbers">92</td><td class="diffLineNumbers">92</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent"> symlink(DIR_FS_DOWNLOAD . $downloads['orders_products_filename'], DIR_FS_DOWNLOAD_PUBLIC . $tempdir . '/' . $downloads['orders_products_filename']);</td>
</tr>
<tr>
<td class="diffLineNumbersA">93</td><td class="diffLineNumbers"> </td><td class="diffMarkerColA"><span class="textDelMarker">-</span></td><td class="lineContent ediffContentA"> <span class="ediffChangedA">tep</span>_<span class="ediffChangedA">redirect</span>(DIR_<span class="ediffChangedA">WS</span>_DOWNLOAD_PUBLIC . $tempdir . '/' . $downloads['orders_products_filename'])<span class="ediffChangedA">;</span></td>
</tr>
<tr>
<td class="diffLineNumbersA">94</td><td class="diffLineNumbers"> </td><td class="diffMarkerColA"><span class="textDelMarker">-</span></td><td class="lineContent ediffContentA"> <span class="ediffChangedA">}</span> <span class="ediffChangedA">else</span> {</td>
</tr>
<tr>
<td class="diffLineNumbersA">95</td><td class="diffLineNumbers"> </td><td class="diffMarkerColA"><span class="textDelMarker">-</span></td><td class="lineContent ediffContentA"><span class="ediffChangedA">/</span><span class="ediffChangedA">/</span> <span class="ediffChangedA">This</span> <span class="ediffChangedA">will</span> <span class="ediffChangedA">work</span> <span class="ediffChangedA">on</span> <span class="ediffChangedA">all</span> <span class="ediffChangedA">systems</span><span class="ediffChangedA">,</span> <span class="ediffChangedA">but</span> <span class="ediffChangedA">will</span> <span class="ediffChangedA">need</span> <span class="ediffChangedA">considerable</span> <span class="ediffChangedA">resources</span></td>
</tr>
<tr>
<td class="diffLineNumbersA">96</td><td class="diffLineNumbers"> </td><td class="diffMarkerColA"><span class="textDelMarker">-</span></td><td class="lineContent ediffContentA"><span class="ediffChangedA">/</span><span class="ediffChangedA">/</span> <span class="ediffChangedA">We</span> <span class="ediffChangedA">could</span> <span class="ediffChangedA">also</span> <span class="ediffChangedA">loop</span> <span class="ediffChangedA">with</span> <span class="ediffChangedA">fread</span>(<span class="ediffChangedA">$</span><span class="ediffChangedA">fp</span><span class="ediffChangedA">,</span> <span class="ediffChangedA">4096</span><span class="ediffChangedA">)</span> <span class="ediffChangedA">to</span> <span class="ediffChangedA">save</span> <span class="ediffChangedA">memory</span></td>
</tr>
<tr>
<td class="diffLineNumbersA">97</td><td class="diffLineNumbers"> </td><td class="diffMarkerColA"><span class="textDelMarker">-</span></td><td class="lineContent ediffContentA"> <span class="ediffChangedA">readfile</span>(DIR_<span class="ediffChangedA">FS</span>_DOWNLOAD . $downloads['orders_products_filename']);</td>
</tr>
<tr>
<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">93</td><td class="diffMarkerColB"><span class="textAddMarker">+</span></td><td class="lineContent ediffContentB"> <span class="ediffChangedB">if</span> <span class="ediffChangedB">(</span><span class="ediffChangedB">file</span>_<span class="ediffChangedB">exists</span>(DIR_<span class="ediffChangedB">FS</span>_DOWNLOAD_PUBLIC . $tempdir . '/' . $downloads['orders_products_filename'])<span class="ediffChangedB">)</span> {</td>
</tr>
<tr>
<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">94</td><td class="diffMarkerColB"><span class="textAddMarker">+</span></td><td class="lineContent ediffContentB"> <span class="ediffChangedB">tep</span><span class="ediffChangedB">_</span><span class="ediffChangedB">redirect</span>(<span class="ediffChangedB">tep</span><span class="ediffChangedB">_</span><span class="ediffChangedB">href</span><span class="ediffChangedB">_</span><span class="ediffChangedB">link</span>(DIR_<span class="ediffChangedB">WS</span>_DOWNLOAD<span class="ediffChangedB">_</span><span class="ediffChangedB">PUBLIC</span> . $<span class="ediffChangedB">tempdir</span> <span class="ediffChangedB">.</span> <span class="ediffChangedB">'</span><span class="ediffChangedB">/</span><span class="ediffChangedB">'</span> <span class="ediffChangedB">.</span> <span class="ediffChangedB">$</span>downloads['orders_products_filename'])<span class="ediffChangedB">)</span>;</td>
</tr>
<tr>
<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">95</td><td class="diffMarkerColB"><span class="textAddMarker">+</span></td><td class="lineContent ediffContentB"> <span class="ediffChangedB">}</span></td>
</tr>
<tr>
<td class="diffLineNumbers">98</td><td class="diffLineNumbers">96</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent"> }</td>
</tr>
<tr>
<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">97</td><td class="diffMarkerColB"><span class="textAddMarker">+</span></td><td class="lineContent diffContentB"></td>
</tr>
<tr>
<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">98</td><td class="diffMarkerColB"><span class="textAddMarker">+</span></td><td class="lineContent diffContentB">// Fallback to readfile() delivery method. This will work on all systems, but will need considerable resources</td>
</tr>
<tr>
<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">99</td><td class="diffMarkerColB"><span class="textAddMarker">+</span></td><td class="lineContent diffContentB"> readfile(DIR_FS_DOWNLOAD . $downloads['orders_products_filename']);</td>
</tr>
<tr>
<td class="diffLineNumbers">99</td><td class="diffLineNumbers">100</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent">?></td>
</tr>
</table>
<h3>[C] Remove redundant currencies</h3>
<ul>
<li>Remove the secondary ex-euro currencies from display.</li>
</ul>
<p class="affectedFiles"><b>Affected Files</b><br />
catalog/includes/classes/currencies.php</p>
<span class="affectedFiles">File: catalog/includes/classes/currencies.php (<a href="http://svn.oscommerce.com/fisheye/browse/osCommerce/oscommerce2/trunk/catalog/includes/classes/currencies.php?r1=1592&r2=1803">online</a>) (<a href="http://svn.oscommerce.com/fisheye/rdiff/osCommerce/oscommerce2/trunk/catalog/includes/classes/currencies.php?r1=1592&r2=1803">raw</a>)</span>
<table class="diff hardDiff unifiedDiff" cellspacing="0">
<tr>
<td class="diffLineNumbers">40</td><td class="diffLineNumbers">40</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent"> if ($calculate_currency_value == true) {</td>
</tr>
<tr>
<td class="diffLineNumbers">41</td><td class="diffLineNumbers">41</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent"> $rate = (tep_not_null($currency_value)) ? $currency_value : $this->currencies[$currency_type]['value'];</td>
</tr>
<tr>
<td class="diffLineNumbers">42</td><td class="diffLineNumbers">42</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent"> $format_string = $this->currencies[$currency_type]['symbol_left'] . number_format(tep_round($number * $rate, $this->currencies[$currency_type]['decimal_places']), $this->currencies[$currency_type]['decimal_places'], $this->currencies[$currency_type]['decimal_point'], $this->currencies[$currency_type]['thousands_point']) . $this->currencies[$currency_type]['symbol_right'];</td>
</tr>
<tr>
<td class="diffLineNumbersA">43</td><td class="diffLineNumbers"> </td><td class="diffMarkerColA"><span class="textDelMarker">-</span></td><td class="lineContent diffContentA">// if the selected currency is in the european euro-conversion and the default currency is euro,</td>
</tr>
<tr>
<td class="diffLineNumbersA">44</td><td class="diffLineNumbers"> </td><td class="diffMarkerColA"><span class="textDelMarker">-</span></td><td class="lineContent diffContentA">// the currency will displayed in the national currency and euro currency</td>
</tr>
<tr>
<td class="diffLineNumbersA">45</td><td class="diffLineNumbers"> </td><td class="diffMarkerColA"><span class="textDelMarker">-</span></td><td class="lineContent diffContentA"> if ( (DEFAULT_CURRENCY == 'EUR') && ($currency_type == 'DEM' || $currency_type == 'BEF' || $currency_type == 'LUF' || $currency_type == 'ESP' || $currency_type == 'FRF' || $currency_type == 'IEP' || $currency_type == 'ITL' || $currency_type == 'NLG' || $currency_type == 'ATS' || $currency_type == 'PTE' || $currency_type == 'FIM' || $currency_type == 'GRD') ) {</td>
</tr>
<tr>
<td class="diffLineNumbersA">46</td><td class="diffLineNumbers"> </td><td class="diffMarkerColA"><span class="textDelMarker">-</span></td><td class="lineContent diffContentA"> $format_string .= ' <small>[' . $this->format($number, true, 'EUR') . ']</small>';</td>
</tr>
<tr>
<td class="diffLineNumbersA">47</td><td class="diffLineNumbers"> </td><td class="diffMarkerColA"><span class="textDelMarker">-</span></td><td class="lineContent diffContentA"> }</td>
</tr>
<tr>
<td class="diffLineNumbers">48</td><td class="diffLineNumbers">43</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent"> } else {</td>
</tr>
<tr>
<td class="diffLineNumbers">49</td><td class="diffLineNumbers">44</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent"> $format_string = $this->currencies[$currency_type]['symbol_left'] . number_format(tep_round($number, $this->currencies[$currency_type]['decimal_places']), $this->currencies[$currency_type]['decimal_places'], $this->currencies[$currency_type]['decimal_point'], $this->currencies[$currency_type]['thousands_point']) . $this->currencies[$currency_type]['symbol_right'];</td>
</tr>
<tr>
<td class="diffLineNumbers">50</td><td class="diffLineNumbers">45</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent"> }</td>
</tr>
</table>
<h3>[C] Update navigation history class</h3>
<ul>
<li>Make sure $parameters is an array in the navigation history class.</li>
</ul>
<p class="affectedFiles"><b>Affected Files</b><br />
catalog/includes/classes/navigation_history.php</p>
<span class="affectedFiles">File: catalog/includes/classes/navigation_history.php (<a href="http://svn.oscommerce.com/fisheye/browse/osCommerce/oscommerce2/trunk/catalog/includes/classes/navigation_history.php?r1=1619&r2=1696">online</a>) (<a href="http://svn.oscommerce.com/fisheye/rdiff/osCommerce/oscommerce2/trunk/catalog/includes/classes/navigation_history.php?r1=1619&r2=1696">raw</a>)</span>
<table class="diff hardDiff unifiedDiff" cellspacing="0">
<tr>
<td class="diffLineNumbers">127</td><td class="diffLineNumbers">127</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent"> function filter_parameters($parameters) {</td>
</tr>
<tr>
<td class="diffLineNumbers">128</td><td class="diffLineNumbers">128</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent"> $clean = array();</td>
</tr>
<tr>
<td class="diffLineNumbers">129</td><td class="diffLineNumbers">129</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent"></td>
</tr>
<tr>
<td class="diffLineNumbersA">130</td><td class="diffLineNumbers"> </td><td class="diffMarkerColA"><span class="textDelMarker">-</span></td><td class="lineContent ediffContentA"> reset($parameters);</td>
</tr>
<tr>
<td class="diffLineNumbersA">131</td><td class="diffLineNumbers"> </td><td class="diffMarkerColA"><span class="textDelMarker">-</span></td><td class="lineContent ediffContentA"> while (list($key, $value) = each($parameters)) {</td>
</tr>
<tr>
<td class="diffLineNumbersA">132</td><td class="diffLineNumbers"> </td><td class="diffMarkerColA"><span class="textDelMarker">-</span></td><td class="lineContent ediffContentA"> if (strpos($key, '_nh-dns') < 1) {</td>
</tr>
<tr>
<td class="diffLineNumbersA">133</td><td class="diffLineNumbers"> </td><td class="diffMarkerColA"><span class="textDelMarker">-</span></td><td class="lineContent ediffContentA"> $clean[$key] = $value;</td>
</tr>
<tr>
<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">130</td><td class="diffMarkerColB"><span class="textAddMarker">+</span></td><td class="lineContent ediffContentB"> <span class="ediffChangedB">if</span> <span class="ediffChangedB">(</span><span class="ediffChangedB">is</span><span class="ediffChangedB">_</span><span class="ediffChangedB">array</span><span class="ediffChangedB">(</span><span class="ediffChangedB">$</span><span class="ediffChangedB">parameters</span><span class="ediffChangedB">)</span><span class="ediffChangedB">)</span> <span class="ediffChangedB">{</span></td>
</tr>
<tr>
<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">131</td><td class="diffMarkerColB"><span class="textAddMarker">+</span></td><td class="lineContent ediffContentB"> reset($parameters);</td>
</tr>
<tr>
<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">132</td><td class="diffMarkerColB"><span class="textAddMarker">+</span></td><td class="lineContent ediffContentB"> while (list($key, $value) = each($parameters)) {</td>
</tr>
<tr>
<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">133</td><td class="diffMarkerColB"><span class="textAddMarker">+</span></td><td class="lineContent ediffContentB"> if (strpos($key, '_nh-dns') < 1) {</td>
</tr>
<tr>
<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">134</td><td class="diffMarkerColB"><span class="textAddMarker">+</span></td><td class="lineContent ediffContentB"> $clean[$key] = $value;</td>
</tr>
<tr>
<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">135</td><td class="diffMarkerColB"><span class="textAddMarker">+</span></td><td class="lineContent ediffContentB"> <span class="ediffChangedB">}</span></td>
</tr>
<tr>
<td class="diffLineNumbers">134</td><td class="diffLineNumbers">136</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent"> }</td>
</tr>
<tr>
<td class="diffLineNumbers">135</td><td class="diffLineNumbers">137</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent"> }</td>
</tr>
<tr>
<td class="diffLineNumbers">136</td><td class="diffLineNumbers">138</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent"></td>
</tr>
</table>
<h3>[C] Update order totals class</h3>
<ul>
<li>Calling $order_total_modules->process() multiple times would duplicate the output data due to the modules already being instantiated.</li>
</ul>
<p class="affectedFiles"><b>Affected Files</b><br />
catalog/includes/classes/order_total.php</p>
<span class="affectedFiles">File: catalog/includes/classes/order_total.php (<a href="http://svn.oscommerce.com/fisheye/browse/osCommerce/oscommerce2/trunk/catalog/includes/classes/order_total.php?r1=477&r2=1698">online</a>) (<a href="http://svn.oscommerce.com/fisheye/rdiff/osCommerce/oscommerce2/trunk/catalog/includes/classes/order_total.php?r1=477&r2=1698">raw</a>)</span>
<table class="diff hardDiff unifiedDiff" cellspacing="0">
<tr>
<td class="diffLineNumbers">38</td><td class="diffLineNumbers">38</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent"> while (list(, $value) = each($this->modules)) {</td>
</tr>
<tr>
<td class="diffLineNumbers">39</td><td class="diffLineNumbers">39</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent"> $class = substr($value, 0, strrpos($value, '.'));</td>
</tr>
<tr>
<td class="diffLineNumbers">40</td><td class="diffLineNumbers">40</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent"> if ($GLOBALS[$class]->enabled) {</td>
</tr>
<tr>
<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">41</td><td class="diffMarkerColB"><span class="textAddMarker">+</span></td><td class="lineContent diffContentB"> $GLOBALS[$class]->output = array();</td>
</tr>
<tr>
<td class="diffLineNumbers">41</td><td class="diffLineNumbers">42</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent"> $GLOBALS[$class]->process();</td>
</tr>
<tr>
<td class="diffLineNumbers">42</td><td class="diffLineNumbers">43</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent"></td>
</tr>
<tr>
<td class="diffLineNumbers">43</td><td class="diffLineNumbers">44</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent"> for ($i=0, $n=sizeof($GLOBALS[$class]->output); $i<$n; $i++) {</td>
</tr>
</table>
<h3>Checkout procedure update</h3>
<ul>
<li>Introduce the ability to show additional checkout buttons on the shopping cart page for certain payment methods (e.g., PayPal Express Checkout).</li>
<li>Introduce the ability to define foreign shipping and billing addresses during the checkout procedure (e.g., the shipping address provided by PayPal Express Checkout).</li>
<li>Move the logic of storing the credit card number in the database from the order class to the payment module level.</li>
<li>Add extra checks to the checkout process file.</li>
<li>Don't query for a shipping address if the order only contains virtual products.</li>
<li>Update the shipping address when a mixed (virtual+physical) order is being made.</li>
</ul>
<p class="affectedFiles"><b>Affected Files</b><br />
catalog/checkout_payment.php<br />
catalog/checkout_process.php<br />
catalog/checkout_shipping.php<br />
catalog/shopping_cart.php<br />
catalog/includes/header.php<br />
catalog/includes/classes/order.php<br />
catalog/includes/classes/payment.php<br />
catalog/includes/functions/general.php<br />
catalog/includes/modules/payment/cc.php<br />
catalog/includes/languages/english/shopping_cart.php<br />
catalog/includes/languages/espanol/shopping_cart.php<br />
catalog/includes/languages/german/shopping_cart.php</p>
<span class="affectedFiles">File: catalog/checkout_payment.php (<a href="http://svn.oscommerce.com/fisheye/browse/osCommerce/oscommerce2/trunk/catalog/checkout_payment.php?r1=1601&r2=1699">online</a>) (<a href="http://svn.oscommerce.com/fisheye/rdiff/osCommerce/oscommerce2/trunk/catalog/checkout_payment.php?r1=1601&r2=1699">raw</a>)</span>
<table class="diff hardDiff unifiedDiff" cellspacing="0">
<tr>
<td class="diffLineNumbers">52</td><td class="diffLineNumbers">52</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent"> $billto = $customer_default_address_id;</td>
</tr>
<tr>
<td class="diffLineNumbers">53</td><td class="diffLineNumbers">53</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent"> } else {</td>
</tr>
<tr>
<td class="diffLineNumbers">54</td><td class="diffLineNumbers">54</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent">// verify the selected billing address</td>
</tr>
<tr>
<td class="diffLineNumbersA">55</td><td class="diffLineNumbers"> </td><td class="diffMarkerColA"><span class="textDelMarker">-</span></td><td class="lineContent ediffContentA"> $check_address_query = tep_db_query("select count(*) as total from " . TABLE_ADDRESS_BOOK . " where customers_id = '" . (int)$customer_id . "' and address_book_id = '" . (int)$billto . "'");</td>
</tr>
<tr>
<td class="diffLineNumbersA">56</td><td class="diffLineNumbers"> </td><td class="diffMarkerColA"><span class="textDelMarker">-</span></td><td class="lineContent ediffContentA"> $check_address = tep_db_fetch_array($check_address_query);</td>
</tr>
<tr>
<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">55</td><td class="diffMarkerColB"><span class="textAddMarker">+</span></td><td class="lineContent ediffContentB"> <span class="ediffChangedB">if</span> <span class="ediffChangedB">(</span> <span class="ediffChangedB">(</span><span class="ediffChangedB">is</span><span class="ediffChangedB">_</span><span class="ediffChangedB">array</span><span class="ediffChangedB">(</span>$<span class="ediffChangedB">billto</span><span class="ediffChangedB">)</span> <span class="ediffChangedB">&</span><span class="ediffChangedB">&</span> <span class="ediffChangedB">empty</span><span class="ediffChangedB">(</span><span class="ediffChangedB">$</span><span class="ediffChangedB">billto</span><span class="ediffChangedB">)</span><span class="ediffChangedB">)</span> <span class="ediffChangedB">|</span><span class="ediffChangedB">|</span> <span class="ediffChangedB">is</span><span class="ediffChangedB">_</span><span class="ediffChangedB">numeric</span><span class="ediffChangedB">(</span><span class="ediffChangedB">$</span><span class="ediffChangedB">billto</span><span class="ediffChangedB">)</span> <span class="ediffChangedB">)</span> <span class="ediffChangedB">{</span></td>
</tr>
<tr>
<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">56</td><td class="diffMarkerColB"><span class="textAddMarker">+</span></td><td class="lineContent ediffContentB"> <span class="ediffChangedB">$</span>check_address_query = tep_db_query("select count(*) as total from " . TABLE_ADDRESS_BOOK . " where customers_id = '" . (int)$customer_id . "' and address_book_id = '" . (int)$billto . "'");</td>
</tr>
<tr>
<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">57</td><td class="diffMarkerColB"><span class="textAddMarker">+</span></td><td class="lineContent ediffContentB"> $check_address = tep_db_fetch_array($check_address_query);</td>
</tr>
<tr>
<td class="diffLineNumbers">57</td><td class="diffLineNumbers">58</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent"></td>
</tr>
<tr>
<td class="diffLineNumbersA">58</td><td class="diffLineNumbers"> </td><td class="diffMarkerColA"><span class="textDelMarker">-</span></td><td class="lineContent ediffContentA"> if ($check_address['total'] != '1') {</td>
</tr>
<tr>
<td class="diffLineNumbersA">59</td><td class="diffLineNumbers"> </td><td class="diffMarkerColA"><span class="textDelMarker">-</span></td><td class="lineContent ediffContentA"> $billto = $customer_default_address_id;</td>
</tr>
<tr>
<td class="diffLineNumbersA">60</td><td class="diffLineNumbers"> </td><td class="diffMarkerColA"><span class="textDelMarker">-</span></td><td class="lineContent ediffContentA"> if (tep_session_is_registered('payment')) tep_session_unregister('payment');</td>
</tr>
<tr>
<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">59</td><td class="diffMarkerColB"><span class="textAddMarker">+</span></td><td class="lineContent ediffContentB"> if ($check_address['total'] != '1') {</td>
</tr>
<tr>
<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">60</td><td class="diffMarkerColB"><span class="textAddMarker">+</span></td><td class="lineContent ediffContentB"> $billto = $customer_default_address_id;</td>
</tr>
<tr>
<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">61</td><td class="diffMarkerColB"><span class="textAddMarker">+</span></td><td class="lineContent ediffContentB"> if (tep_session_is_registered('payment')) tep_session_unregister('payment');</td>
</tr>
<tr>
<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">62</td><td class="diffMarkerColB"><span class="textAddMarker">+</span></td><td class="lineContent ediffContentB"> <span class="ediffChangedB">}</span></td>
</tr>
<tr>
<td class="diffLineNumbers">61</td><td class="diffLineNumbers">63</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent"> }</td>
</tr>
<tr>
<td class="diffLineNumbers">62</td><td class="diffLineNumbers">64</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent"> }</td>
</tr>
<tr>
<td class="diffLineNumbers">63</td><td class="diffLineNumbers">65</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent"></td>
</tr>
</table>
<br />
<span class="affectedFiles">File: catalog/checkout_process.php (<a href="http://svn.oscommerce.com/fisheye/browse/osCommerce/oscommerce2/trunk/catalog/checkout_process.php?r1=1621&r2=1750">online</a>) (<a href="http://svn.oscommerce.com/fisheye/rdiff/osCommerce/oscommerce2/trunk/catalog/checkout_process.php?r1=1621&r2=1750">raw</a>)</span>
<table class="diff hardDiff unifiedDiff" cellspacing="0">
<tr>
<td class="diffLineNumbers">17</td><td class="diffLineNumbers">17</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent"> $navigation->set_snapshot(array('mode' => 'SSL', 'page' => FILENAME_CHECKOUT_PAYMENT));</td>
</tr>
<tr>
<td class="diffLineNumbers">18</td><td class="diffLineNumbers">18</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent"> tep_redirect(tep_href_link(FILENAME_LOGIN, '', 'SSL'));</td>
</tr>
<tr>
<td class="diffLineNumbers">19</td><td class="diffLineNumbers">19</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent"> }</td>
</tr>
<tr>
<td class="diffLineNumbersA">20</td><td class="diffLineNumbers"> </td><td class="diffMarkerColA"><span class="textDelMarker">-</span></td><td class="lineContent ediffContentA"> </td>
</tr>
<tr>
<td class="diffLineNumbersA">21</td><td class="diffLineNumbers"> </td><td class="diffMarkerColA"><span class="textDelMarker">-</span></td><td class="lineContent ediffContentA"> if (<span class="ediffChangedA">!</span><span class="ediffChangedA">tep</span>_<span class="ediffChangedA">session</span><span class="ediffChangedA">_</span><span class="ediffChangedA">is</span><span class="ediffChangedA">_</span><span class="ediffChangedA">registered</span>(<span class="ediffChangedA">'</span><span class="ediffChangedA">sendto</span><span class="ediffChangedA">'</span>)) {</td>
</tr>
<tr>
<td class="diffLineNumbersA">22</td><td class="diffLineNumbers"> </td><td class="diffMarkerColA"><span class="textDelMarker">-</span></td><td class="lineContent ediffContentA"> tep_redirect(tep_href_link(FILENAME_<span class="ediffChangedA">CHECKOUT</span>_<span class="ediffChangedA">PAYMENT</span><span class="ediffChangedA">,</span> <span class="ediffChangedA">'</span><span class="ediffChangedA">'</span><span class="ediffChangedA">,</span> <span class="ediffChangedA">'</span><span class="ediffChangedA">SSL</span><span class="ediffChangedA">'</span>));</td>
</tr>
<tr>
<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">20</td><td class="diffMarkerColB"><span class="textAddMarker">+</span></td><td class="lineContent ediffContentB"></td>
</tr>
<tr>
<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">21</td><td class="diffMarkerColB"><span class="textAddMarker">+</span></td><td class="lineContent ediffContentB"><span class="ediffChangedB">/</span><span class="ediffChangedB">/</span> if <span class="ediffChangedB">there</span> <span class="ediffChangedB">is</span> <span class="ediffChangedB">nothing</span> <span class="ediffChangedB">in</span> <span class="ediffChangedB">the</span> <span class="ediffChangedB">customers</span> <span class="ediffChangedB">cart</span><span class="ediffChangedB">,</span> <span class="ediffChangedB">redirect</span> <span class="ediffChangedB">them</span> <span class="ediffChangedB">to</span> <span class="ediffChangedB">the</span> <span class="ediffChangedB">shopping</span> <span class="ediffChangedB">cart</span> <span class="ediffChangedB">page</span></td>
</tr>
<tr>
<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">22</td><td class="diffMarkerColB"><span class="textAddMarker">+</span></td><td class="lineContent ediffContentB"> <span class="ediffChangedB">if</span> (<span class="ediffChangedB">$</span><span class="ediffChangedB">cart</span><span class="ediffChangedB">-</span><span class="ediffChangedB">></span><span class="ediffChangedB">count</span>_<span class="ediffChangedB">contents</span>() <span class="ediffChangedB"><</span> <span class="ediffChangedB">1</span>) {</td>
</tr>
<tr>
<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">23</td><td class="diffMarkerColB"><span class="textAddMarker">+</span></td><td class="lineContent ediffContentB"> tep_redirect(tep_href_link(FILENAME_<span class="ediffChangedB">SHOPPING</span>_<span class="ediffChangedB">CART</span>));</td>
</tr>
<tr>
<td class="diffLineNumbers">23</td><td class="diffLineNumbers">24</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent"> }</td>
</tr>
<tr>
<td class="diffLineNumbers">24</td><td class="diffLineNumbers">25</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent"></td>
</tr>
<tr>
<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">26</td><td class="diffMarkerColB"><span class="textAddMarker">+</span></td><td class="lineContent diffContentB">// if no shipping method has been selected, redirect the customer to the shipping method selection page</td>
</tr>
<tr>
<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">27</td><td class="diffMarkerColB"><span class="textAddMarker">+</span></td><td class="lineContent diffContentB"> if (!tep_session_is_registered('shipping') || !tep_session_is_registered('sendto')) {</td>
</tr>
<tr>
<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">28</td><td class="diffMarkerColB"><span class="textAddMarker">+</span></td><td class="lineContent diffContentB"> tep_redirect(tep_href_link(FILENAME_CHECKOUT_SHIPPING, '', 'SSL'));</td>
</tr>
<tr>
<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">29</td><td class="diffMarkerColB"><span class="textAddMarker">+</span></td><td class="lineContent diffContentB"> }</td>
</tr>
<tr>
<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">30</td><td class="diffMarkerColB"><span class="textAddMarker">+</span></td><td class="lineContent diffContentB"></td>
</tr>
<tr>
<td class="diffLineNumbers">25</td><td class="diffLineNumbers">31</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent"> if ( (tep_not_null(MODULE_PAYMENT_INSTALLED)) && (!tep_session_is_registered('payment')) ) {</td>
</tr>
<tr>
<td class="diffLineNumbers">26</td><td class="diffLineNumbers">32</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent"> tep_redirect(tep_href_link(FILENAME_CHECKOUT_PAYMENT, '', 'SSL'));</td>
</tr>
<tr>
<td class="diffLineNumbers">27</td><td class="diffLineNumbers">33</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent"> }</td>
</tr>
<tr class="diffSkipped">
<td class="diffLineNumbers"> </td>
<td class="diffLineNumbers"> </td>
<td class="diffMarkerCol"><pre class="diffPre">…</pre></td>
<td class="diffContent"><pre class="diffPre">…</pre></td>
</tr>
<tr>
<td class="diffLineNumbers">46</td><td class="diffLineNumbers">52</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent"> require(DIR_WS_CLASSES . 'order.php');</td>
</tr>
<tr>
<td class="diffLineNumbers">47</td><td class="diffLineNumbers">53</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent"> $order = new order;</td>
</tr>
<tr>
<td class="diffLineNumbers">48</td><td class="diffLineNumbers">54</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent"></td>
</tr>
<tr>