FishEye: diff osCommerce/oscommerce2/trunk/upgrade.html

1

<html>

2

<head>

3

-

4

-

<title>osCommerce Online Merchant v2.2 RC1 Upgrade Notes</title>

3

+

<title>osCommerce Online Merchant v2.2 RC2 Upgrade Notes</title>

5

4

<style>

6

-

/* Default heading font (outside of tables) */

7

-

body { font-family: sans-serif; font-size: 11pt; }

5

+

/* HTML tag styles */

6

+

body{ font-family:Verdana,Arial,sans-serif; line-height:1.166; margin:0px; padding:10px; background-color:#fafafa; font-size: 13px; }

7

+

a:link, a:visited, a:hover { text-decoration:none; }

8

+

a:link, a:hover { color: #036; }

9

+

a:visited { color:#158; }

10

+

a:hover { text-decoration: underline; }

11

+

/**** Global Box Colours & Icons ****/

12

+

/* INTERNAL BORDER COLOUR */

13

+

.genericPane .dirPane .welcomePane, #fileTable, .ftFileRow td, .ftFileRowDeleted td, .history,

14

+

.searchItemDirectory, .searchItemRevision, .searchItemFile, .searchTabResults td, .changesetList

15

+

{ border-top:1px #ccc solid }

16

+

.searchTabResults tr.startOfGroup td { border-top:2px #777 solid }

17

+

/* ITEM TYPE ICONS */

18

+

.searchItemDirectory{ background: url(images/directoryIcon.gif) top left no-repeat }

19

+

.searchItemRevision{ background: url(images/revisionIcon.gif) top left no-repeat }

20

+

.searchItemRevision, .history{ background: url(images/revisionIcon.gif) top left no-repeat }

21

+

.changesetDetail, .changesetList{ background: url(images/changesetIcon.gif) top left no-repeat }

22

+

/* FILE TYPE ICONS */

23

+

.searchItemFile, .ftIconCol{ background: url(images/fileIconGeneric.gif) top left no-repeat }

24

+

.ftFileRowDeleted td.ftIconCol{ background:#f0f0f0 url(images/fileIconDeleted.gif) top left no-repeat }

25

+

/* SUBDIRECTORY TREE ICONS */

26

+

.folder{ padding-left:20px; /* background:url(images/folderIcon.gif) top left no-repeat; */}

27

+

/* SUBDIRECTORY TREE filename styles */

28

+

.folderPlain{}

29

+

.folderEmpty{ color: #777; }

30

+

.folderHidden{ font-style: italic; }

31

+

.folderHiddenEmpty{ font-style: italic; color: #777 }

32

+

/* Basic Box Styles */

33

+

.box{ padding: 0px; margin: 0 0 7px 0; background-color:#fff; }

34

+

.box h3

35

+

{ color:#0a0a0a; font-size:.7em; font-family:Tahoma, Arial, Helvetica, sans-serif; border-width:0 0 1px 0;

36

+

background-color: #f9f9ff; padding:2px 0 2px 10px; margin:0px; }

37

+

.boxMessage

38

+

{ background:#fff; font-size:.75em; font-style:italic; color:#000000; margin:0px; padding:5px 5px 5px 30px; }

39

+

.boxBody{ font-size:0.75em; padding: 0 15px 0 15px;}

40

+

.boxIcon{ float:right;font-weight:normal;font-size:0.9em; margin:0; padding:0; }

41

+

.boxIcon img{ border-width:0px; margin-right:5px; }

42

+

.boxIconText{ vertical-align:top; margin-right:5px; }

43

+

/* Pane with Centred Text */

44

+

.centrePane{ text-align:center; font-size:0.75em;padding:10px; }

45

+

.centrePane p{ margin:0; }

46

+

/* tour */

47

+

#tourTop{background:url(tour/t_top.gif) top left no-repeat; padding-top:10px;}

48

+

#tourRight{ background:url(tour/t_right.gif) top right no-repeat; padding-right:21px; }

49

+

#tourBody{ background:url(tour/t_body.gif) top left repeat; padding:0px 10px; }

50

+

#tourCorner{ background:url(tour/t_corner.gif) top right no-repeat; padding-right:21px; }

51

+

#tourBottom{ background:url(tour/t_bottom.gif) top left no-repeat;padding-top:23px }

52

+

.tourTitle{ font-size:0.7em; position:absolute; left:15px; top:12px; font-weight:bold;}

53

+

.tourControls{ font-size:0.7em; position:absolute; right:18px; top:12px; font-weight:bold;}

54

+

.tourDescription{ font-size:0.8em; padding:20px 15px 0px 15px; }

55

+

.tourDescription p{ margin:0; padding-bottom:3px;}

56

+

.tourDescription a{ font-weight:bold;}

57

+

.tourDescription code{ font-size:120%; }

58

+

table.tourEg td { font-size:0.8em; }

59

+

table.tourEg { margin-left: 2px; border:1px solid #999;}

60

+

.bubbleLeft, .bubbleRight, .bubbleBelow, .bubbleAbove, .bubbleBelowRight { z-index:99; position:absolute; }

61

+

.bubbleBelow { margin: 20px 5px 0 15px; width:436px; background:url(tour/uparrow.gif) no-repeat top left; padding-top:37px; }

62

+

.bubbleBelowRight { margin-top:16px; width:436px; right:16px; background:url(tour/uparrowRight.gif) no-repeat top left; padding-top:37px; }

63

+

.bubbleBelow .bubbleText, .bubbleBelowRight .bubbleText { background:url(tour/upbottom.gif) bottom left no-repeat; padding:0px 25px 30px 25px; }

64

+

.bubbleAbove { margin-top: -70px; margin-left:15px; width:436px; background:url(tour/downarrow.gif) no-repeat bottom left; padding-bottom:37px; }

65

+

.bubbleAbove .bubbleText { background:url(tour/belowtop.gif) top left no-repeat; padding:15px 7px 0px 19px; }

66

+

.bubbleRight { left: 310px; margin-top:10px; width:292px; background:url(tour/leftarrow.gif) no-repeat top right; padding-top:19px; }

67

+

.bubbleLeft { left:30px; margin-top:10px; width:292px; background:url(tour/rightarrow.gif) no-repeat top right; padding-top:19px }

68

+

.bubbleLeft .bubbleText, .bubbleRight .bubbleText { background:url(tour/rightbottom.gif) bottom right no-repeat; padding:0px 25px 30px 25px; }

69

+

.bubbleText { font-family: Tahoma, Helvetica, sans-serif; font-size:11px; color:#000; font-weight:bold; text-align:center; }

70

+

/* file history styles */

71

+

.history{ display:block; color:#000000; font-size:.75em; padding:5px 5px 5px 30px; }

72

+

.history pre{ font-size:1em; margin:3px 0 3px 0; }

73

+

.history p{ margin:0; }

74

+

/* changeset styles */

75

+

.changesetDetail, .changesetList { display:block; color:#000000; font-size:.7em; }

76

+

.changesetDetail{ margin-top:10px; padding:5px 5px 10px 35px; }

77

+

.changesetDetail ul{ padding:0;margin:0; }

78

+

.changesetList{ padding:5px 5px 5px 30px; }

79

+

.changesetDetail pre, .changesetList pre{ font-size:105% }

80

+

.changesetList pre{ margin:3px 0 3px 0; }

81

+

.changesetDetail p{ margin:3px 0 3px 0; }

82

+

.changesetList p{ margin:0; }

83

+

.csId, .csAuthor{ font-weight:bold; }

84

+

.csAge{ display:inline; }

85

+

.csComment

86

+

{ padding:3px; margin-top:2px; font-size:1.08em; font-family:Monaco, "Lucida Console", "Courier New", Courier, monospace;

87

+

display:block; background-color:#fcfefe; }

88

+

.changesetDetail .csComment {

89

+

margin-top:8px;

90

+

}

91

+

li.csFilename{ list-style-type:none; padding-top:4px; white-space:nowrap; }

92

+

.changesetDetail li.csFilename { margin-top: 0px; }

93

+

.diffPaneChangset{ margin:10px; }

94

+

.controls{ padding-top:10px; }

95

+

.controls a, .controls a:link, .controls a:hover, .controls a:visited{ color:green; cursor:pointer; }

96

+

.csMore{ font-style:italic; }

97

+

/* linehistory style */

98

+

.linehistory{padding:5px 3px 5px 3px; font-size:small; text-align:center;}

99

+

.linehistory img{ width:300px; border:0;}

100

+

/* file table styles */

101

+

#fileTable{ border-width:0; width:100%;}

102

+

#ftTitle{ font-size:.7em; font-weight:bold;}

103

+

#ftTitle td{ padding:4px 0 4px 0; }

104

+

.ftIconCol{width:35px;vertical-align:top;}

105

+

.ftIconCol img{ margin:2px 0 0 6px; }

106

+

.ftFileRow td, .ftFileRowDeleted td{ font-size:.7em; border-width:1px 0 0 0; padding: 4px 0 0 0;}

107

+

.ftFileRowDeleted, .ftFileRowDeletedComment{ background-color:#f0f0f0 }

108

+

.ftFileName{ font-weight:bold; }

109

+

.ftRev{}

110

+

.ftAuthor{}

111

+

.ftComment{ font-size:.65em; padding:0 0 4px 0; }

112

+

/* form styles */

113

+

.formPane{ padding:5px; margin:0; white-space:nowrap; }

114

+

.formPane table{ font-size:0.7em; }

115

+

.formPane input, .formPane select, .formPane td{ font-size:100%; vertical-align:middle }

116

+

.formPane form{ margin:0; padding:0; }

117

+

.formPane td{ padding-left:10px; white-space:nowrap; vertical-align:middle; }

118

+

/* Admin Stuff #TODO: Fix this shite!! */

119

+

.label, .verb, .errorLabel { font-weight:bold; text-align:right; }

120

+

.checkboxLabel {font-size:140%;}

121

+

.verbDisabled {color:#a0a0a0; }

122

+

.errorLabel, .errorMessage, .checkboxErrorLabel { color:#cc3300; }

123

+

.statusMessage { color:#22aa00;}

124

+

.verb a:link, .verb a:hover, .verb a:visited { text-decoration:underline }

125

+

.adminTable { margin:5px; border:1px solid #ddd }

126

+

.adminTable th { background-color:#eee; }

127

+

.adminTable td, .adminTable th { padding:3px 6px; white-space:normal; }

128

+

.confirm

129

+

{ font-size:.7em; background:#ffffe1 url(images/infoIcon.gif) top left no-repeat; border:#ddd 1px solid;

130

+

text-align:center; line-height:2em; padding: 10px; margin: 6px }

131

+

.formPane h4 { font-size:0.8em; margin:10px 0 5px 5px; }

132

+

.description { font-style:italic }

133

+

.adminSubHeading { text-decoration:underline;font-weight:bold; }

134

+

/* search styles */

135

+

.searchCriteria{ padding:5px; }

136

+

.searchCriteria .formPane td { vertical-align:top; padding:5px 0 5px 0; }

137

+

.searchResults{ padding:0 0 5px 0; }

138

+

.searchItemDirectory, .searchItemRevision, .searchItemFile

139

+

{ display:block; font-size:.7em; padding:5px 5px 5px 30px; }

140

+

.searchItemDirectory pre, .searchItemRevision pre, .searchItemFile pre

141

+

{ font-size:100%; margin:3px 0 3px 0; }

142

+

.searchItemDirectory p, .searchItemRevision p, .searchItemFile p{ margin:0; }

143

+

.searchResultsSubItem { font-size:100%;margin-top:3px; padding-left:20px; }

144

+

.searchResultsSubItem pre{ font-size:100%; margin:0 0 3px 0; }

145

+

table.searchTabResults {font-size:.7em; margin:0; padding:0; }

146

+

.searchTabResults th, .searchTabResults td {text-align: left; margin:0; padding-right: 3px; vertical-align: top}

147

+

.searchTabResults td.numberTabCell {text-align: right;}

148

+

.pagination { font-size:.68em; padding:5px 10px 5px 10px; text-align:right; margin:0 }

149

+

/* quicksearch results */

150

+

.qsResult{ display:block; font-size:.7em; padding:0px 5px 0px 15px; margin:0; }

151

+

.qsSummary{ float:right; text-transform:none; font-weight:normal; padding-right:3px; }

152

+

.qsResult h4{ font-size:100%; margin:10px 0 0 0; }

153

+

.qsResult dt{ margin-top:5px; }

154

+

.qsResult dd{ padding-left:0; margin-left:15px; }

155

+

.qsResult p{ padding-left:15px; margin: 3px 0 0 0;}

156

+

.qsKeyword, .qsNumber{ font-weight:bold; }

157

+

.qsFileDir{ display:block; margin-top:3px; }

158

+

.qsFiles{ padding-left:15px; display:block; }

159

+

/* subdir tree styles */

160

+

.toolBar

161

+

{ text-align:right; font-size:0.65em; padding:0px 3px 0 3px; font-family:Tahoma, Arial, Helvetica, sans-serif;

162

+

/*border-bottom:1px solid #ccc;*/ }

163

+

.toolBarHidden, .toolBarEmpty, .toolBarSort

164

+

{ float:right; padding:2px 3px 2px 3px; background-color:#eee; border:1px solid #ccc; margin-top:4px }

165

+

.warningToolBar{ font-size:100%; padding:2px 3px; margin-top:4px; }

166

+

.prop .dirPane {padding-left:10px}

167

+

.dirPane{ padding:10px 10px 10px 0px; font-size:0.7em; font-family:Tahoma, Arial, Helvetica, sans-serif; }

168

+

.dirPane a:link, .dirPane a:hover, .dirPane a:visited{ color:#000; }

169

+

.dirPane ul, .dirPane ul ul{ margin:0; padding:0; }

170

+

.dirPane ul li, .dirPane ul ul li{ margin:0; padding:0; list-style-type:none; list-style-position:inside; }

171

+

.dirPane ul li{ margin-top:4px; }

172

+

.dirPane ul ul li{ margin-top:4px; margin-left:17px; }

173

+

/* subdir tree styles */

174

+

.helpPane{ padding:0px 10px 10px 10px;font-size:0.7em; font-family:Verdana, Arial, Helvetica, sans-serif;width:190px; }

175

+

.helpPane ul{ margin:0;padding:0; }

176

+

.helpPane ul li{ margin-top:5px; list-style-type:none;font-weight:bold; }

177

+

.helpPane ul ul li{ margin-left:10px; list-style-position:inside; list-style-type:square; font-weight:normal; }

178

+

.helpPaneContents{ color:#111; padding:10px 10px 10px 15px; font-size:0.75em; }

179

+

.helpPaneContents h4{ color:#222; margin:0; }

180

+

.helpPaneContents p{ margin:0 0 7px 0; }

181

+

code { font-size:120% }

182

+

.helpPaneContents dt{ font-size:.95em; margin-left:10px; font-weight:bold; font-style:italic; color:#444 }

183

+

.helpPaneContents dd{ margin:4px 0 7px 20px; }

8

184

9

-

td { vertical-align: top; padding-left: 4px; padding-right: 4px; }

185

+

/* Diff Sytles */

186

+

.diffPane{ padding: 10px 20px; }

187

+

.diff{ font-size:100%; white-space:nowrap; margin:0; padding:0; border:1px solid #ccc; }

188

+

.diffFile, .diffFileA, .diffFileB, .diffCS{ font-size:.9em; text-align:right; font-weight:bold; }

189

+

.diffCS{ font-weight:normal }

190

+

.diffWarning td.diffContent, .diffSkipped td.diffContent{ vertical-align:middle; padding:0 5px 0 5px; font-size:.9em; }

191

+

.diffWarning td.diffContent{ background:#ffffe1; }

192

+

.diffSkipped td.diffContent{ background:#fafafa; color:#444; }

193

+

.diffSection{ }

194

+

.diffPre { font-size:100%; margin:0; padding:0; }

195

+

.diffNav{ vertical-align:top; white-space:nowrap; }

196

+

/* Note A=Deleted B=Added */

197

+

.diffLineNumbers, .diffLineNumbersA, .diffLineNumbersB{ text-align:right; vertical-align:top; }

198

+

.diffMarkerCol, .diffMarkerColA, .diffMarkerColB, .diffWarning td.diffMarkerCol, .diffSkipped td.diffMarkerCol

199

+

{ padding-right:5px; text-align:center; vertical-align:middle; }

200

+

.diffMarkerCol{ border-right:1px solid #ccc }

201

+

.diffMarkerColA{ border-right:1px solid red; }

202

+

.diffMarkerColB{ border-right:1px solid green; }

203

+

.diffWarning td.diffMarkerCol{ border-right:1px solid yellow; }

204

+

.diffSkipped td.diffMarkerCol{ border-right:1px solid orange; }

205

+

.diffSkipped td.diffLineNumbers{ font-size:.9em; font-style:italic; }

206

+

.diffSkipped td.diffLineNumbers a:link, .diffSkipped td.diffLineNumbers a:visited{ color:orange; }

207

+

.diffContent, .diffContentA, .diffContentB, .ediffContentA, .ediffContentB{ padding-left:4px; text-align:left; vertical-align:top; }

208

+

/*

209

+

.diffContentA, .ediffContentA{ border-top:1px solid yellow; }

210

+

.diffContentB, .ediffContentB{ border-bottom:1px solid #dcfadc; }

211

+

*/

212

+

.diffLineNumbersA, .diffContentA, a.diffFileA:link, a.diffFileA:hover, a.diffFileA:visited, .ediffChangedA

213

+

{ color:red; background-color:#ffc; }

214

+

.diffLineNumbersB, .diffContentB, a.diffFileB:link, a.diffFileB:hover, a.diffFileB:visited, .ediffChangedB

215

+

{ color:green; background-color:#f0fff0 }

216

+

.ediffChangedA{ }

217

+

.ediffChangedB{ }

218

+

.ediffContentA{ background-color:#ffffed; }

219

+

.ediffContentB{ background-color:#fafffa; }

220

+

/* annotation styles */

221

+

.annPaneLegend{ font-size:.7em; padding:9px 5px 9px 9px; }

222

+

.annLegend{ font-size:0.9em; padding:0px; margin:8px 0 0 0; }

223

+

.annLegend td{ border:1px solid #ccc; padding:2px; margin-right:2px; text-align:center; }

224

+

.annPane{ font-size:.75em; padding:5px 10px 5px 10px; }

225

+

.annPane table{ font-size:100%; white-space:nowrap; margin:0; padding:0; border:1px solid #ccc; }

226

+

.annPane td{ text-align:right; vertical-align:top; padding:0 3px 0 5px; }

227

+

.annPane pre {margin: 0px; padding-bottom: 0px;}

228

+

.annPane span.annLine {font-family: monospace;}

229

+

td.annWarning, span.annWarning {text-align:left; font-size:.75em; border-right:1px solid yellow; background:#ffffe1; }

230

+

/**** changelog styles ****/

231

+

.chJoggerPane{ padding:5px 0 5px 1px; }

232

+

.chJogger{ font-size:.65em; padding:0; margin:0; white-space:nowrap }

233

+

.chJogger td{ text-align:center; vertical-align:top; padding:0; margin:0;}

234

+

td.chJoggerFrom{ text-align:left; padding-left:1px; }

235

+

td.chJoggerTo{ text-align:right; }

236

+

/* calendar */

237

+

.calPane{ text-align:center; padding:0 10px 5px 10px; margin:0; white-space:nowrap; }

238

+

.calPane a:link, .calPane a:hover, .calPane a:visited{ color:#000; text-decoration:none; }

239

+

.calPane a:hover{ text-decoration:underline; }

240

+

.calPane table{ font-size:.7em; margin:5px auto 0 auto;}

241

+

.calPane input, .calPane select, .calPane td{ font-size:100%; vertical-align:middle; white-space:nowrap; }

242

+

.calPane td{ font-size:100%; text-align:center}

243

+

.calDays{ }

244

+

.calDays td, .calMonths td{ border:1px solid #eee; }

245

+

.caldays td{ width:14%; background-color:#fbfff9; }

246

+

.calDays td.calDayCell{ border-bottom:1px solid #999; background-color:#fff; }

247

+

.calMonths td{ width:14%; background-color:#fbfff9; }

248

+

.calPane form{ margin:0; padding:0; }

249

+

.changelogMatching{ }

250

+

.caldays td.changelogShowing{ background-color:#ccffaa; color: #000 }

251

+

.caldays td.changelogShowing:hover{ background-color:#66FF00; }

252

+

.changelogMatchingCount{ font-size:.72em ; vertical-align:super }

10

253

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; }

254

+

/* "commandline" output */

255

+

.cmdlineHelpPane { margin:15px auto 0 auto; }

256

+

.cmdlineHelpPane { padding: 0 0px 0 15px;}

257

+

.cmdlineHelpPane a:link, .cmdlineHelpPane a:hover, .cmdlineHelpPane a:visited { text-decoration:underline }

13

258

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; }

259

+

.prefsTable {border: 1px solid #ccc; border-collapse:collapse;}

260

+

.prefsHeaderRow {padding: 3px 5px; background:#eee; font-weight:bold; border-top: 1px solid #ccc; border-bottom: 1px solid #ccc;}

21

261

22

-

td.LineNum { text-align: right; }

23

-

td.LineRange { font-family: sans-serif; }

24

-

td.SubLineRange { font-family: sans-serif; border-bottom: none; }

262

+

.loading {font-family: Tahoma, Helvetica, Arial, sans-serif; font-size:0.9em; color:#666}

25

263

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; }

264

+

/* new diff styling */

265

+

/*

266

+

* Source Styles

267

+

*/

268

+

table.diff {

269

+

font-size:100%;

270

+

}

271

+

.diff td {

272

+

font-family:monospace;

273

+

font-size:small;

274

+

}

275

+

.unifiedDiff td.lineContent {

276

+

width:99%;

277

+

}

278

+

.sidebysideDiff td.lineContent {

279

+

width:49%;

280

+

}

281

+

.hardDiff td.lineContent {

282

+

white-space:pre;

283

+

}

284

+

.softDiff td.lineContent {

285

+

white-space:normal;

286

+

vertical-align:top;

287

+

}

288

+

.diff .commentForm {

289

+

/*border:1px solid orange;*/

290

+

background-color:#FFE7C6;

291

+

margin:0;

292

+

padding:5px 10px;

293

+

}

294

+

.diff td.lineNumber,

295

+

.diff td.diffLineNumbers {

296

+

text-align:right;

297

+

padding-right:9px;

298

+

padding-left:5px;

299

+

color:#999;

300

+

}

301

+

.diffNav{

302

+

vertical-align:top;

303

+

white-space:nowrap;

304

+

}

30

305

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; }

306

+

/* Note A=Deleted B=Added */

307

+

.diffLineNumbers,

308

+

.diffLineNumbersA,

309

+

.diffLineNumbersB {

310

+

text-align:right;

311

+

vertical-align:middle;

312

+

padding-right:9px;

313

+

}

39

314

40

-

.ttSigDiff { color: #FF0000; }

41

-

.ttInsigDiff { color: #0000FF; }

42

-

.ttAdded { color: #FF0000; }

43

-

.ttDeleted { text-decoration: line-through; }

315

+

.diffMarkerCol,

316

+

.diffMarkerColA,

317

+

.diffMarkerColB,

318

+

.diffWarning td.diffMarkerCol,

319

+

.diffSkipped td.diffMarkerCol {

320

+

padding-right: 5px;

321

+

text-align: center;

322

+

vertical-align: middle;

323

+

}

44

324

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; }

325

+

.diffMarkerCol {

326

+

border-right: 1px solid #ccc

327

+

}

328

+

.diffMarkerColA {

329

+

border-right: 1px solid red;

330

+

}

331

+

.diffMarkerColB {

332

+

border-right: 1px solid green;

333

+

}

334

+

.diffWarning td.diffMarkerCol {

335

+

border-right: 1px solid yellow;

336

+

}

337

+

.diffSkipped td.diffMarkerCol {

338

+

border-right: 1px solid orange;

339

+

}

340

+

.diffSkipped td.diffLineNumbers {

341

+

font-style: italic;

342

+

}

343

+

.diffSkipped td.diffLineNumbers a:link,

344

+

.diffSkipped td.diffLineNumbers a:visited {

345

+

color: orange;

346

+

}

347

+

.diffContent,

348

+

.diffContentA,

349

+

.diffContentB,

350

+

.ediffContentA,

351

+

.ediffContentB {

352

+

padding-left: 4px;

353

+

text-align: left;

354

+

vertical-align:middle;

355

+

}

47

356

48

-

table.dc tr.secBegin td { border-bottom: 1px solid Silver; }

49

-

table.dc tr.secMiddle td { border-bottom: 1px solid Silver; }

357

+

td.diffContentA,

358

+

a.diffFileA:link,

359

+

a.diffFileA:hover,

360

+

a.diffFileA:visited,

361

+

.ediffChangedA{

362

+

color:red;

363

+

background-color:#ffc;

364

+

}

365

+

td.diffContentB,

366

+

a.diffFileB:link,

367

+

a.diffFileB:hover,

368

+

a.diffFileB:visited,

369

+

.ediffChangedB {

370

+

color:green; background-color:#f0fff0

371

+

}

372

+

.ediffChangedA{ }

50

373

51

-

.ttNewer { color: #FF0000; }

52

-

.ttOlder { color: #808080; }

53

-

.ttOrphan { color: #0000FF; }

54

-

.ttGhosted { color: #008080; }

374

+

.ediffChangedB{ }

55

375

376

+

.ediffContentA {

377

+

background-color: #ffffed;

378

+

}

379

+

380

+

.ediffContentB {

381

+

background-color: #fafffa;

382

+

}

383

+

384

+

.diff tr.sourceLine,

385

+

.diff tr.lineHighlighted {

386

+

cursor:default;

387

+

}

388

+

389

+

.diff .lineHighlighted,

390

+

.diff .lineHighlighted .diffLineNumbersA,

391

+

.diff .lineHighlighted .diffLineNumbersB,

392

+

.diff .lineHighlighted .diffContentA,

393

+

.diff .lineHighlighted .diffContentB,

394

+

.diff .lineHighlighted .ediffContentA,

395

+

.diff .lineHighlighted .ediffContentB,

396

+

.diff .lineHighlighted .ediffChangedA,

397

+

.diff .lineHighlighted .ediffChangedB {

398

+

background-color:#FFE7C6;

399

+

}

400

+

.textDelMarker, .textAddMarker {

401

+

font-weight:bold;

402

+

}

403

+

td.diffLineNumbersA,

404

+

.textDelMarker {

405

+

color:red;

406

+

}

407

+

td.diffLineNumbersB,

408

+

.textAddMarker {

409

+

color:green;

410

+

}

411

+

#quickSearch {

412

+

color:#333;

413

+

font-size:x-small;

414

+

}

415

+

input.qsInput {

416

+

height:12px;

417

+

}

418

+

419

+

.help {

420

+

background:transparent url(images/icn_12_help.gif) no-repeat right;

421

+

padding-right:14px;

422

+

}

423

+

.adminHelp {

424

+

background:transparent url(images/icn_12_help.gif) no-repeat left;

425

+

padding-right:10px;

426

+

}

427

+

a.adminHelp:hover {

428

+

text-decoration:none;

429

+

}

430

+

a.navPrevious {

431

+

background:transparent url(images/icn_12_arrowleft.gif) no-repeat left;

432

+

padding-left:16px;

433

+

}

434

+

a.navNext {

435

+

background:transparent url(images/icn_12_arrowright.gif) no-repeat right;

436

+

padding-right:16px;

437

+

}

438

+

439

+

440

+

/* Browser Specific Styles */

441

+

442

+

443

+

444

+

/*

445

+

ua=safari

446

+

447

+

448

+

449

+

450

+

*/

451

+

.uaIndicator{ color:

452

+

453

+

454

+

455

+

456

+

pink

457

+

} /* grey is default */

458

+

table.diff td, .annPane{

459

+

460

+

461

+

font-size:0.95em;

462

+

}

463

+

464

+

465

+

466

+

.diffPaneChangset{ font-size:140% }

467

+

pre.csComment{ font-size:135%; }

468

+

56

469

.affectedFiles { border: 1px #cccccc dotted; background-color: #eeeeee; font-style: italic; }

57

-

.sqlBox { border: 1px #84F0B5 solid; background-color: #EAF5DE; }

58

470

</style>

59

471

</head>

60

472

<body>

61

473

62

-

<h1>osCommerce Online Merchant v2.2 RC1 Upgrade Notes</h1>

474

+

<h1>osCommerce Online Merchant v2.2 RC2 Upgrade Notes</h1>

63

475

64

-

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="extras/update-20060817.txt">update-20060817.txt</a>) before applying these changes.

476

+

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.

65

477

66

-

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.

478

+

The following changes should be performed in order to upgrade an existing osCommerce Online Merchant v2.2 RC1 store to v2.2 RC2.

67

479

480

+

Legend: [SQL] Database Changes; [A] Administration Tool; [C] Catalog

481

+

68

482

<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>

483

+

<li>[SQL] Database changes</li>

484

+

<li>[A] Allow Administration Tool elements to be dynamically controlled</li>

485

+

<li>[C] Update download delivery routine</li>

486

+

<li>[C] Remove redundant currencies</li>

487

+

<li>[C] Update the navigation history class</li>

488

+

<li>[C] Update the order totals class</li>

489

+

<li>[C] Checkout procedure update</li>

490

+

<li>[C] Update product notifications</li>

491

+

<li>[AC] Improve register_globals compatibility layer</li>

492

+

<li>[AC] Introduce public orders and downloads status flags</li>

493

+

<li>[C] Update the free shipping method title</li>

494

+

<li>[C] Update credit card error messages</li>

495

+

<li>[A] Update File Manager</li>

496

+

<li>[A] Update the table block class</li>

497

+

<li>[A] MySQL 5.0 Strict Mode compatibility updates</li>

498

+

<li>[A] Update http_build_query() compatibility function</li>

499

+

<li>[A] Update Newsletter Manager</li>

500

+

<li>[AC] Update database session storage handler</li>

501

+

<li>[A] Update administration of categories</li>

502

+

<li>[C] Update processing of Address Book entries</li>

503

+

<li>[A] Update administration of product attributes</li>

504

+

<li>[A] Protect includes directory from direct HTTP requests</li>

505

+

<li>[A] Display module version if available</li>

506

+

<li>[A] Update database backup and restoration</li>

507

+

<li>[C] Update new products module</li>

508

+

</ul>

97

509

98

-

<h3>[BUGFIX] Caching of the Manufacturers Box</h3>

510

+

<h3>[SQL] Database changes</h3>

99

511

100

-

Fix a spelling mistake preventing the manufacturers box being cached.

512

+

<ul>

513

+

<li>Add indexes to increase performance</li>

514

+

<li>Add public and download status flag fields to the orders_status table</li>

515

+

<li>Increase payment_method field size on the orders table</li>

516

+

<li>Increase the last_page_url field size on the whos_online table</li>

517

+

</ul>

101

518

102

-

Affected Files

103

-

catalog/includes/functions/cache.php

519

+

520

+

<tr>

521

+

<td class="lineContent diffContent">alter table banners add index idx_banners_group (banners_group);

522

+

alter table banners_history add index idx_banners_history_banners_id (banners_id);

523

+

alter table currencies add index idx_currencies_code (code);

524

+

alter table customers add index idx_customers_email_address (customers_email_address);

525

+

alter table customers_basket add index idx_customers_basket_customers_id (customers_id);

526

+

alter table customers_basket_attributes add index idx_customers_basket_att_customers_id (customers_id);

527

+

alter table orders add index idx_orders_customers_id (customers_id);

528

+

alter table orders_products add index idx_orders_products_orders_id (orders_id);

529

+

alter table orders_products add index idx_orders_products_products_id (products_id);

530

+

alter table orders_status_history add index idx_orders_status_history_orders_id (orders_id);

531

+

alter table orders_products_attributes add index idx_orders_products_att_orders_id (orders_id);

532

+

alter table orders_products_download add index idx_orders_products_download_orders_id (orders_id);

533

+

alter table products add index idx_products_model (products_model);

534

+

alter table products_attributes add index idx_products_attributes_products_id (products_id);

535

+

alter table reviews add index idx_reviews_products_id (products_id);

536

+

alter table reviews add index idx_reviews_customers_id (customers_id);

537

+

alter table specials add index idx_specials_products_id (products_id);

538

+

alter table zones add index idx_zones_to_geo_zones_country_id (zone_country_id);

104

539

105

-

File: catalog/includes/functions/cache.php

540

+

alter table orders_status add public_flag int DEFAULT '1';

541

+

alter table orders_status add downloads_flag int DEFAULT '0';

106

542

107

-

108

-

109

-

110

-

<td class="Normal">  function tep_cache_manufacturers_box($auto_expire = false, $refresh = false) {</td>

111

-

112

-

113

-

<td class="Normal">  function tep_cache_manufacturers_box($auto_expire = false, $refresh = false) {</td>

114

-

</tr>

115

-

116

-

117

-

<td class="Normal">    global $HTTP_GET_VARS, $language;</td>

118

-

119

-

120

-

<td class="Normal">    global $HTTP_GET_VARS, $language;</td>

121

-

</tr>

122

-

123

-

124

-

125

-

126

-

127

-

128

-

</tr>

129

-

130

-

131

-

<td class="Normal">    $cache_output = '';</td>

132

-

133

-

134

-

<td class="Normal">    $cache_output = '';</td>

135

-

</tr>

136

-

137

-

138

-

139

-

140

-

141

-

142

-

</tr>

143

-

144

-

145

-

<td class="Normal">    $manufacturers_id = '';</td>

146

-

147

-

148

-

<td class="Normal">    $manufacturers_id = '';</td>

149

-

</tr>

150

-

151

-

152

-

<td class="HasMismatch">    if (isset($HTTP_GET_VARS['manufactuers_id']) && is_numeric($HTTP_GET_VARS['manufacturers_id'])) {</td>

153

-

154

-

155

-

<td class="HasMismatch">    if (isset($HTTP_GET_VARS['manufacturers_id']) && is_numeric($HTTP_GET_VARS['manufacturers_id'])) {</td>

156

-

</tr>

157

-

158

-

159

-

<td class="Normal">      $manufacturers_id = $HTTP_GET_VARS['manufacturers_id'];</td>

160

-

161

-

162

-

<td class="Normal">      $manufacturers_id = $HTTP_GET_VARS['manufacturers_id'];</td>

163

-

</tr>

164

-

165

-

166

-

167

-

168

-

169

-

170

-

</tr>

171

-

172

-

173

-

174

-

175

-

176

-

177

-

</tr>

178

-

179

-

180

-

<td class="Normal">    if (($refresh == true) || !read_cache($cache_output, 'manufacturers_box-' . $language . '.cache' . $manufacturers_id, $auto_expire)) {</td>

181

-

182

-

183

-

<td class="Normal">    if (($refresh == true) || !read_cache($cache_output, 'manufacturers_box-' . $language . '.cache' . $manufacturers_id, $auto_expire)) {</td>

184

-

</tr>

185

-

186

-

187

-

<td class="Normal">      ob_start();</td>

188

-

189

-

190

-

<td class="Normal">      ob_start();</td>

191

-

</tr>

192

-

193

-

194

-

<td class="Normal">      include(DIR_WS_BOXES . 'manufacturers.php');</td>

195

-

196

-

197

-

<td class="Normal">      include(DIR_WS_BOXES . 'manufacturers.php');</td>

198

-

</tr>

543

+

alter table orders modify payment_method varchar(255) NOT NULL;

544

+

545

+

alter table whos_online modify last_page_url text NOT NULL;</td>

546

+

</tr>

199

547

</table>

200

548

201

-

<h3>[IMPROVEMENT] Database Backup</h3>

549

+

<h3>[A] Allow Administration Tool elements to be dynamically controlled</h3>

202

550

203

-

Don't store the session and whos online database tables in the database backups.

551

+

<ul>

552

+

<li>Add toggleDivBlock() Javascript function to admin/includes/general.js to allow elements on the Administration Tool to be dynamically controlled.</li>

553

+

</ul>

204

554

205

555

Affected Files

206

-

catalog/admin/backup.php

556

+

catalog/admin/includes/general.js

207

557

208

-

File: catalog/admin/backup.php

558

+

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>)

209

559

210

-

211

-

212

-

213

-

<td class="Normal">          $keys_query = tep_db_query("show keys from " . $table);</td>

214

-

215

-

216

-

<td class="Normal">          $keys_query = tep_db_query("show keys from " . $table);</td>

217

-

</tr>

218

-

219

-

220

-

<td class="Normal">          while ($keys = tep_db_fetch_array($keys_query)) {</td>

221

-

222

-

223

-

<td class="Normal">          while ($keys = tep_db_fetch_array($keys_query)) {</td>

224

-

</tr>

225

-

226

-

227

-

<td class="Normal">            $kname = $keys['Key_name'];</td>

228

-

229

-

230

-

<td class="Normal">            $kname = $keys['Key_name'];</td>

231

-

</tr>

232

-

233

-

234

-

235

-

236

-

237

-

238

-

</tr>

239

-

240

-

241

-

<td class="Normal">            if (!isset($index[$kname])) {</td>

242

-

243

-

244

-

<td class="Normal">            if (!isset($index[$kname])) {</td>

245

-

</tr>

246

-

247

-

248

-

<td class="Normal">              $index[$kname] = array('unique' => !$keys['Non_unique'],</td>

249

-

250

-

251

-

<td class="Normal">              $index[$kname] = array('unique' => !$keys['Non_unique'],</td>

252

-

</tr>

253

-

254

-

255

-

256

-

257

-

258

-

<td class="HasOrphan">                                     'fulltext' => ($keys['Index_type'] == 'FULLTEXT' ? '1' : '0'),</td>

259

-

</tr>

260

-

261

-

262

-

<td class="Normal">                                     'columns' => array());</td>

263

-

264

-

265

-

<td class="Normal">                                     'columns' => array());</td>

266

-

</tr>

267

-

268

-

269

-

270

-

271

-

272

-

273

-

</tr>

274

-

275

-

276

-

277

-

278

-

279

-

280

-

</tr>

281

-

282

-

283

-

<td class="Normal">            $index[$kname]['columns'][] = $keys['Column_name'];</td>

284

-

285

-

286

-

<td class="Normal">            $index[$kname]['columns'][] = $keys['Column_name'];</td>

287

-

</tr>

288

-

289

-

290

-

291

-

292

-

293

-

294

-

</tr>

295

-

296

-

297

-

298

-

299

-

300

-

301

-

</tr>

302

-

303

-

304

-

305

-

<td class="Normal">            $schema .= ',' . "\n";</td>

306

-

307

-

308

-

<td class="Normal">            $schema .= ',' . "\n";</td>

309

-

</tr>

310

-

311

-

312

-

313

-

314

-

315

-

316

-

</tr>

317

-

318

-

319

-

<td class="Normal">            $columns = implode($info['columns'], ', ');</td>

320

-

321

-

322

-

<td class="Normal">            $columns = implode($info['columns'], ', ');</td>

323

-

</tr>

324

-

325

-

326

-

327

-

328

-

329

-

330

-

</tr>

331

-

332

-

333

-

<td class="Normal">            if ($kname == 'PRIMARY') {</td>

334

-

335

-

336

-

<td class="Normal">            if ($kname == 'PRIMARY') {</td>

337

-

</tr>

338

-

339

-

340

-

<td class="Normal">              $schema .= '  PRIMARY KEY (' . $columns . ')';</td>

341

-

342

-

343

-

<td class="Normal">              $schema .= '  PRIMARY KEY (' . $columns . ')';</td>

344

-

</tr>

345

-

346

-

347

-

348

-

349

-

350

-

<td class="HasOrphan">            } elseif ( $info['fulltext'] == '1' ) {</td>

351

-

</tr>

352

-

353

-

354

-

355

-

356

-

357

-

<td class="HasOrphan">              $schema .= '  FULLTEXT ' . $kname . ' (' . $columns . ')';</td>

358

-

</tr>

359

-

360

-

361

-

<td class="Normal">            } elseif ($info['unique']) {</td>

362

-

363

-

364

-

<td class="Normal">            } elseif ($info['unique']) {</td>

365

-

</tr>

366

-

367

-

368

-

<td class="Normal">              $schema .= '  UNIQUE ' . $kname . ' (' . $columns . ')';</td>

369

-

370

-

371

-

<td class="Normal">              $schema .= '  UNIQUE ' . $kname . ' (' . $columns . ')';</td>

372

-

</tr>

373

-

374

-

375

-

376

-

377

-

378

-

379

-

</tr>

380

-

381

-

382

-

<td class="Normal">              $schema .= '  KEY ' . $kname . ' (' . $columns . ')';</td>

383

-

384

-

385

-

<td class="Normal">              $schema .= '  KEY ' . $kname . ' (' . $columns . ')';</td>

386

-

</tr>

387

-

388

-

389

-

390

-

391

-

392

-

393

-

</tr>

394

-

395

-

396

-

397

-

398

-

399

-

400

-

</tr>

401

-

402

-

403

-

404

-

405

-

406

-

407

-

</tr>

408

-

409

-

410

-

<td class="Normal">          $schema .= "\n" . ');' . "\n\n";</td>

411

-

412

-

413

-

<td class="Normal">          $schema .= "\n" . ');' . "\n\n";</td>

414

-

</tr>

415

-

416

-

417

-

<td class="Normal">          fputs($fp, $schema);</td>

418

-

419

-

420

-

<td class="Normal">          fputs($fp, $schema);</td>

421

-

</tr>

422

-

423

-

424

-

425

-

426

-

427

-

428

-

</tr>

429

-

430

-

431

-

432

-

433

-

434

-

435

-

</tr>

436

-

437

-

438

-

439

-

440

-

441

-

<td class="HasOrphan">          if ( ($table != TABLE_SESSIONS ) && ($table != TABLE_WHOS_ONLINE) ) {</td>

442

-

</tr>

443

-

444

-

445

-

<td class="HasMismatch">          $rows_query = tep_db_query("select " . implode(',', $table_list) . " from " . $table);</td>

446

-

447

-

448

-

<td class="HasMismatch">            $rows_query = tep_db_query("select " . implode(',', $table_list) . " from " . $table);</td>

449

-

</tr>

450

-

451

-

452

-

<td class="HasMismatch">          while ($rows = tep_db_fetch_array($rows_query)) {</td>

453

-

454

-

455

-

<td class="HasMismatch">            while ($rows = tep_db_fetch_array($rows_query)) {</td>

456

-

</tr>

457

-

458

-

459

-

<td class="HasMismatch">            $schema = 'insert into ' . $table . ' (' . implode(', ', $table_list) . ') values (';</td>

460

-

461

-

462

-

<td class="HasMismatch">              $schema = 'insert into ' . $table . ' (' . implode(', ', $table_list) . ') values (';</td>

463

-

</tr>

464

-

465

-

466

-

467

-

468

-

469

-

470

-

</tr>

471

-

472

-

473

-

<td class="HasMismatch">            reset($table_list);</td>

474

-

475

-

476

-

<td class="HasMismatch">              reset($table_list);</td>

477

-

</tr>

478

-

479

-

480

-

<td class="HasMismatch">            while (list(,$i) = each($table_list)) {</td>

481

-

482

-

483

-

<td class="HasMismatch">              while (list(,$i) = each($table_list)) {</td>

484

-

</tr>

485

-

486

-

487

-

<td class="HasMismatch">              if (!isset($rows[$i])) {</td>

488

-

489

-

490

-

<td class="HasMismatch">                if (!isset($rows[$i])) {</td>

491

-

</tr>

492

-

493

-

494

-

<td class="HasMismatch">                $schema .= 'NULL, ';</td>

495

-

496

-

497

-

<td class="HasMismatch">                  $schema .= 'NULL, ';</td>

498

-

</tr>

499

-

500

-

501

-

<td class="HasMismatch">              } elseif (tep_not_null($rows[$i])) {</td>

502

-

503

-

504

-

<td class="HasMismatch">                } elseif (tep_not_null($rows[$i])) {</td>

505

-

</tr>

506

-

507

-

508

-

<td class="HasMismatch">                $row = addslashes($rows[$i]);</td>

509

-

510

-

511

-

<td class="HasMismatch">                  $row = addslashes($rows[$i]);</td>

512

-

</tr>

513

-

514

-

515

-

<td class="HasMismatch">                $row = ereg_replace("\n#", "\n".'\#', $row);</td>

516

-

517

-

518

-

<td class="HasMismatch">                  $row = ereg_replace("\n#", "\n".'\#', $row);</td>

519

-

</tr>

520

-

521

-

522

-

523

-

524

-

525

-

526

-

</tr>

527

-

528

-

529

-

<td class="HasMismatch">                $schema .= '\'' . $row . '\', ';</td>

530

-

531

-

532

-

<td class="HasMismatch">                  $schema .= '\'' . $row . '\', ';</td>

533

-

</tr>

534

-

535

-

536

-

537

-

538

-

539

-

540

-

</tr>

541

-

542

-

543

-

<td class="HasMismatch">                $schema .= '\'\', ';</td>

544

-

545

-

546

-

<td class="HasMismatch">                  $schema .= '\'\', ';</td>

547

-

</tr>

548

-

549

-

550

-

551

-

552

-

553

-

554

-

</tr>

555

-

556

-

557

-

558

-

559

-

560

-

561

-

</tr>

562

-

563

-

564

-

565

-

566

-

567

-

568

-

</tr>

569

-

570

-

571

-

572

-

573

-

574

-

<td class="HasOrphan">              $schema = ereg_replace(', $', '', $schema) . ');' . "\n";</td>

575

-

</tr>

576

-

577

-

578

-

579

-

580

-

581

-

<td class="HasOrphan">              fputs($fp, $schema);</td>

582

-

</tr>

583

-

584

-

585

-

586

-

587

-

588

-

589

-

</tr>

590

-

591

-

592

-

593

-

594

-

595

-

596

-

</tr>

597

-

598

-

599

-

<td class="HasOrphan">            $schema = ereg_replace(', $', '', $schema) . ');' . "\n";</td>

600

-

601

-

602

-

603

-

</tr>

604

-

605

-

606

-

<td class="HasOrphan">            fputs($fp, $schema);</td>

607

-

608

-

609

-

610

-

</tr>

611

-

612

-

613

-

614

-

615

-

616

-

617

-

</tr>

618

-

619

-

620

-

621

-

622

-

623

-

624

-

</tr>

625

-

626

-

627

-

628

-

629

-

630

-

631

-

</tr>

632

-

633

-

634

-

635

-

636

-

637

-

638

-

</tr>

639

-

640

-

641

-

<td class="Normal">        fclose($fp);</td>

642

-

643

-

644

-

<td class="Normal">        fclose($fp);</td>

645

-

</tr>

646

-

647

-

648

-

649

-

650

-

651

-

652

-

</tr>

653

-

654

-

655

-

<td class="Normal">        if (isset($HTTP_POST_VARS['download']) && ($HTTP_POST_VARS['download'] == 'yes')) {</td>

656

-

657

-

658

-

<td class="Normal">        if (isset($HTTP_POST_VARS['download']) && ($HTTP_POST_VARS['download'] == 'yes')) {</td>

659

-

</tr>

660

-

661

-

662

-

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

-

665

-

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

-

669

-

670

-

671

-

672

-

673

-

674

-

</tr>

675

-

676

-

677

-

<td class="Normal">          for ($i=0, $n=sizeof($sql_array); $i<$n; $i++) {</td>

678

-

679

-

680

-

<td class="Normal">          for ($i=0, $n=sizeof($sql_array); $i<$n; $i++) {</td>

681

-

</tr>

682

-

683

-

684

-

<td class="Normal">            tep_db_query($sql_array[$i]);</td>

685

-

686

-

687

-

<td class="Normal">            tep_db_query($sql_array[$i]);</td>

688

-

</tr>

689

-

690

-

691

-

692

-

693

-

694

-

695

-

</tr>

696

-

697

-

698

-

699

-

700

-

701

-

702

-

</tr>

703

-

704

-

705

-

706

-

707

-

708

-

<td class="HasOrphan">          tep_session_close();</td>

709

-

</tr>

710

-

711

-

712

-

713

-

714

-

715

-

716

-

</tr>

717

-

718

-

719

-

720

-

721

-

722

-

<td class="HasOrphan">          tep_db_query("delete from " . TABLE_WHOS_ONLINE);</td>

723

-

</tr>

724

-

725

-

726

-

727

-

728

-

729

-

<td class="HasOrphan">          tep_db_query("delete from " . TABLE_SESSIONS);</td>

730

-

</tr>

731

-

732

-

733

-

734

-

735

-

736

-

737

-

</tr>

738

-

739

-

740

-

<td class="Normal">          tep_db_query("delete from " . TABLE_CONFIGURATION . " where configuration_key = 'DB_LAST_RESTORE'");</td>

741

-

742

-

743

-

<td class="Normal">          tep_db_query("delete from " . TABLE_CONFIGURATION . " where configuration_key = 'DB_LAST_RESTORE'");</td>

744

-

</tr>

745

-

746

-

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

-

749

-

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

-

753

-

754

-

755

-

756

-

757

-

758

-

</tr>

759

-

760

-

761

-

<td class="Normal">          if (isset($remove_raw) && ($remove_raw == true)) {</td>

762

-

763

-

764

-

<td class="Normal">          if (isset($remove_raw) && ($remove_raw == true)) {</td>

765

-

</tr>

766

-

767

-

768

-

<td class="Normal">            unlink($restore_from);</td>

769

-

770

-

771

-

<td class="Normal">            unlink($restore_from);</td>

772

-

</tr>

773

-

774

-

775

-

776

-

777

-

778

-

779

-

</tr>

560

+

561

+

<tr>

562

+

<td class="diffLineNumbers">31</td><td class="diffLineNumbers">31</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent">function rowOutEffect(object) {</td>

563

+

</tr>

564

+

<tr>

565

+

<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>

566

+

</tr>

567

+

<tr>

568

+

569

+

</tr>

570

+

<tr>

571

+

572

+

</tr>

573

+

<tr>

574

+

<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">35</td><td class="diffMarkerColB">+</td><td class="lineContent diffContentB">function toggleDivBlock(id) {</td>

575

+

</tr>

576

+

<tr>

577

+

<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">36</td><td class="diffMarkerColB">+</td><td class="lineContent diffContentB">  if (document.getElementById) {</td>

578

+

</tr>

579

+

<tr>

580

+

<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">37</td><td class="diffMarkerColB">+</td><td class="lineContent diffContentB">    itm = document.getElementById(id);</td>

581

+

</tr>

582

+

<tr>

583

+

<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">38</td><td class="diffMarkerColB">+</td><td class="lineContent diffContentB">  } else if (document.all){</td>

584

+

</tr>

585

+

<tr>

586

+

<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">39</td><td class="diffMarkerColB">+</td><td class="lineContent diffContentB">    itm = document.all[id];</td>

587

+

</tr>

588

+

<tr>

589

+

<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">40</td><td class="diffMarkerColB">+</td><td class="lineContent diffContentB">  } else if (document.layers){</td>

590

+

</tr>

591

+

<tr>

592

+

<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">41</td><td class="diffMarkerColB">+</td><td class="lineContent diffContentB">    itm = document.layers[id];</td>

593

+

</tr>

594

+

<tr>

595

+

596

+

</tr>

597

+

<tr>

598

+

599

+

</tr>

600

+

<tr>

601

+

602

+

</tr>

603

+

<tr>

604

+

<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">45</td><td class="diffMarkerColB">+</td><td class="lineContent diffContentB">    if (itm.style.display != "none") {</td>

605

+

</tr>

606

+

<tr>

607

+

<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">46</td><td class="diffMarkerColB">+</td><td class="lineContent diffContentB">      itm.style.display = "none";</td>

608

+

</tr>

609

+

<tr>

610

+

611

+

</tr>

612

+

<tr>

613

+

<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">48</td><td class="diffMarkerColB">+</td><td class="lineContent diffContentB">      itm.style.display = "block";</td>

614

+

</tr>

615

+

<tr>

616

+

617

+

</tr>

618

+

<tr>

619

+

620

+

</tr>

621

+

<tr>

622

+

623

+

</tr>

780

624

</table>

781

625

782

-

<h3>[IMPROVEMENT] Input Fields on Checkout Confirmation Page</h3>

626

+

<h3>[C] Update download delivery routine</h3>

783

627

784

-

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.

628

+

<ul>

629

+

<li>Fix downloads when "Download by redirect" and "SEFU" are both enabled.</li>

630

+

<li>Fallback to readfile() download delivery mechanism if direct download files.</li>

631

+

</ul>

785

632

786

633

Affected Files

787

-

catalog/checkout_confirmation.php

634

+

catalog/download.php

788

635

789

-

File: catalog/checkout_confirmation.php

636

+

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>)

790

637

791

-

792

-

793

-

794

-

795

-

796

-

797

-

798

-

</tr>

799

-

800

-

801

-

802

-

803

-

804

-

805

-

</tr>

806

-

807

-

808

-

809

-

810

-

811

-

812

-

</tr>

813

-

814

-

815

-

816

-

817

-

818

-

819

-

</tr>

820

-

821

-

822

-

823

-

824

-

825

-

826

-

</tr>

827

-

828

-

829

-

830

-

831

-

832

-

833

-

</tr>

834

-

835

-

836

-

837

-

838

-

839

-

840

-

</tr>

841

-

842

-

843

-

844

-

845

-

846

-

847

-

</tr>

848

-

849

-

850

-

851

-

852

-

853

-

<td class="HasOrphan">  if (isset($$payment->form_action_url)) {</td>

854

-

</tr>

855

-

856

-

857

-

858

-

859

-

860

-

<td class="HasOrphan">    $form_action_url = $$payment->form_action_url;</td>

861

-

</tr>

862

-

863

-

864

-

865

-

866

-

867

-

868

-

</tr>

869

-

870

-

871

-

872

-

873

-

874

-

<td class="HasOrphan">    $form_action_url = tep_href_link(FILENAME_CHECKOUT_PROCESS, '', 'SSL');</td>

875

-

</tr>

876

-

877

-

878

-

879

-

880

-

881

-

882

-

</tr>

883

-

884

-

885

-

886

-

887

-

888

-

889

-

</tr>

890

-

891

-

892

-

893

-

894

-

895

-

<td class="HasOrphan">  echo tep_draw_form('checkout_confirmation', $form_action_url, 'post');</td>

896

-

</tr>

897

-

898

-

899

-

900

-

901

-

902

-

903

-

</tr>

904

-

905

-

906

-

907

-

908

-

909

-

910

-

</tr>

911

-

912

-

913

-

914

-

915

-

916

-

917

-

</tr>

918

-

919

-

920

-

921

-

922

-

923

-

924

-

</tr>

925

-

926

-

927

-

928

-

929

-

930

-

931

-

</tr>

932

-

933

-

934

-

935

-

936

-

937

-

938

-

</tr>

939

-

940

-

941

-

942

-

943

-

944

-

945

-

</tr>

946

-

947

-

948

-

949

-

950

-

951

-

952

-

</tr>

953

-

954

-

955

-

956

-

957

-

958

-

959

-

960

-

</tr>

961

-

962

-

963

-

964

-

965

-

966

-

967

-

</tr>

968

-

969

-

970

-

971

-

972

-

973

-

974

-

</tr>

975

-

976

-

977

-

978

-

979

-

980

-

981

-

</tr>

982

-

983

-

984

-

985

-

986

-

987

-

988

-

</tr>

989

-

990

-

991

-

992

-

993

-

994

-

995

-

</tr>

996

-

997

-

998

-

<td class="HasOrphan">  if (isset($$payment->form_action_url)) {</td>

999

-

1000

-

1001

-

1002

-

</tr>

1003

-

1004

-

1005

-

<td class="HasOrphan">    $form_action_url = $$payment->form_action_url;</td>

1006

-

1007

-

1008

-

1009

-

</tr>

1010

-

1011

-

1012

-

1013

-

1014

-

1015

-

1016

-

</tr>

1017

-

1018

-

1019

-

<td class="HasOrphan">    $form_action_url = tep_href_link(FILENAME_CHECKOUT_PROCESS, '', 'SSL');</td>

1020

-

1021

-

1022

-

1023

-

</tr>

1024

-

1025

-

1026

-

1027

-

1028

-

1029

-

1030

-

</tr>

1031

-

1032

-

1033

-

1034

-

1035

-

1036

-

1037

-

</tr>

1038

-

1039

-

1040

-

<td class="HasOrphan">  echo tep_draw_form('checkout_confirmation', $form_action_url, 'post');</td>

1041

-

1042

-

1043

-

1044

-

</tr>

1045

-

1046

-

1047

-

1048

-

1049

-

1050

-

1051

-

</tr>

1052

-

1053

-

1054

-

<td class="Normal">  if (is_array($payment_modules->modules)) {</td>

1055

-

1056

-

1057

-

<td class="Normal">  if (is_array($payment_modules->modules)) {</td>

1058

-

</tr>

1059

-

1060

-

1061

-

<td class="Normal">    echo $payment_modules->process_button();</td>

1062

-

1063

-

1064

-

<td class="Normal">    echo $payment_modules->process_button();</td>

1065

-

</tr>

1066

-

1067

-

1068

-

1069

-

1070

-

1071

-

1072

-

</tr>

1073

-

1074

-

1075

-

1076

-

1077

-

1078

-

1079

-

</tr>

1080

-

1081

-

1082

-

<td class="HasMismatch">  echo tep_image_submit('button_confirm_order.gif', IMAGE_BUTTON_CONFIRM_ORDER) . '</form>' . "\n";</td>

1083

-

1084

-

1085

-

<td class="HasMismatch">  echo tep_image_submit('button_confirm_order.gif', IMAGE_BUTTON_CONFIRM_ORDER) . "\n";</td>

1086

-

</tr>

1087

-

1088

-

1089

-

1090

-

1091

-

1092

-

1093

-

</tr>

1094

-

1095

-

1096

-

1097

-

1098

-

1099

-

1100

-

</tr>

1101

-

1102

-

1103

-

1104

-

1105

-

1106

-

1107

-

</tr>

1108

-

1109

-

1110

-

1111

-

1112

-

1113

-

1114

-

</tr>

1115

-

1116

-

1117

-

1118

-

1119

-

1120

-

1121

-

</tr>

1122

-

1123

-

1124

-

1125

-

1126

-

1127

-

1128

-

</tr>

1129

-

1130

-

1131

-

1132

-

<td class="Normal">            <td align="center" width="25%" class="checkoutBarFrom"><?php echo '<a href="' . tep_href_link(FILENAME_CHECKOUT_PAYMENT, '', 'SSL') . '" class="checkoutBarFrom">' . CHECKOUT_BAR_PAYMENT . '</a>'; ?></td></td>

1133

-

1134

-

1135

-

<td class="Normal">            <td align="center" width="25%" class="checkoutBarFrom"><?php echo '<a href="' . tep_href_link(FILENAME_CHECKOUT_PAYMENT, '', 'SSL') . '" class="checkoutBarFrom">' . CHECKOUT_BAR_PAYMENT . '</a>'; ?></td></td>

1136

-

</tr>

1137

-

1138

-

1139

-

1140

-

1141

-

1142

-

1143

-

</tr>

1144

-

1145

-

1146

-

1147

-

1148

-

1149

-

1150

-

</tr>

1151

-

1152

-

1153

-

1154

-

1155

-

1156

-

1157

-

</tr>

1158

-

1159

-

1160

-

1161

-

1162

-

1163

-

1164

-

</tr>

1165

-

1166

-

1167

-

1168

-

1169

-

1170

-

1171

-

</tr>

1172

-

1173

-

1174

-

1175

-

1176

-

1177

-

1178

-

</tr>

1179

-

1180

-

1181

-

1182

-

1183

-

1184

-

1185

-

</tr>

1186

-

1187

-

1188

-

<td class="Normal">    <td width="<?php echo BOX_WIDTH; ?>" valign="top"><table border="0" width="<?php echo BOX_WIDTH; ?>" cellspacing="0" cellpadding="2"></td>

1189

-

1190

-

1191

-

<td class="Normal">    <td width="<?php echo BOX_WIDTH; ?>" valign="top"><table border="0" width="<?php echo BOX_WIDTH; ?>" cellspacing="0" cellpadding="2"></td>

1192

-

</tr>

1193

-

1194

-

1195

-

1196

-

1197

-

1198

-

1199

-

</tr>

1200

-

1201

-

1202

-

1203

-

1204

-

1205

-

1206

-

</tr>

1207

-

1208

-

1209

-

1210

-

1211

-

1212

-

1213

-

</tr>

1214

-

1215

-

1216

-

1217

-

1218

-

1219

-

1220

-

</tr>

638

+

639

+

<tr>

640

+

<td class="diffLineNumbers">90</td><td class="diffLineNumbers">90</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent">    umask(0000);</td>

641

+

</tr>

642

+

<tr>

643

+

<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>

644

+

</tr>

645

+

<tr>

646

+

<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>

647

+

</tr>

648

+

<tr>

649

+

<td class="diffLineNumbersA">93</td><td class="diffLineNumbers"> </td><td class="diffMarkerColA">-</td><td class="lineContent ediffContentA">    tep_redirect(DIR_WS_DOWNLOAD_PUBLIC . $tempdir . '/' . $downloads['orders_products_filename']);</td>

650

+

</tr>

651

+

<tr>

652

+

653

+

</tr>

654

+

<tr>

655

+

<td class="diffLineNumbersA">95</td><td class="diffLineNumbers"> </td><td class="diffMarkerColA">-</td><td class="lineContent ediffContentA">// This will work on all systems, but will need considerable resources</td>

656

+

</tr>

657

+

<tr>

658

+

<td class="diffLineNumbersA">96</td><td class="diffLineNumbers"> </td><td class="diffMarkerColA">-</td><td class="lineContent ediffContentA">// We could also loop with fread($fp, 4096) to save memory</td>

659

+

</tr>

660

+

<tr>

661

+

<td class="diffLineNumbersA">97</td><td class="diffLineNumbers"> </td><td class="diffMarkerColA">-</td><td class="lineContent ediffContentA">    readfile(DIR_FS_DOWNLOAD . $downloads['orders_products_filename']);</td>

662

+

</tr>

663

+

<tr>

664

+

<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">93</td><td class="diffMarkerColB">+</td><td class="lineContent ediffContentB">    if (file_exists(DIR_FS_DOWNLOAD_PUBLIC . $tempdir . '/' . $downloads['orders_products_filename'])) {</td>

665

+

</tr>

666

+

<tr>

667

+

<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">94</td><td class="diffMarkerColB">+</td><td class="lineContent ediffContentB">      tep_redirect(tep_href_link(DIR_WS_DOWNLOAD_PUBLIC . $tempdir . '/' . $downloads['orders_products_filename']));</td>

668

+

</tr>

669

+

<tr>

670

+

671

+

</tr>

672

+

<tr>

673

+

674

+

</tr>

675

+

<tr>

676

+

677

+

</tr>

678

+

<tr>

679

+

<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">98</td><td class="diffMarkerColB">+</td><td class="lineContent diffContentB">// Fallback to readfile() delivery method. This will work on all systems, but will need considerable resources</td>

680

+

</tr>

681

+

<tr>

682

+

<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">99</td><td class="diffMarkerColB">+</td><td class="lineContent diffContentB">  readfile(DIR_FS_DOWNLOAD . $downloads['orders_products_filename']);</td>

683

+

</tr>

684

+

<tr>

685

+

686

+

</tr>

1221

687

</table>

1222

688

1223

-

<h3>[IMPROVEMENT] register_globals Compatibility for PHP 4.3+ Servers</h3>

689

+

<h3>[C] Remove redundant currencies</h3>

1224

690

1225

-

Add a register_globals compatibility layer for PHP 4.3+ servers.

691

+

<ul>

692

+

<li>Remove the secondary ex-euro currencies from display.</li>

693

+

</ul>

1226

694

1227

695

Affected Files

1228

-

catalog/includes/application_top.php

1229

-

catalog/includes/functions/compatibility.php

1230

-

catalog/includes/functions/sessions.php

1231

-

catalog/includes/functions/html_output.php

1232

-

catalog/includes/classes/order.php

1233

-

catalog/includes/modules/address_book_details.php

1234

-

catalog/checkout_payment.php

1235

-

catalog/admin/includes/application_top.php

1236

-

catalog/admin/includes/functions/compatibility.php

1237

-

catalog/admin/includes/functions/sessions.php

1238

-

catalog/admin/includes/functions/html_output.php

1239

-

catalog/admin/includes/classes/upload.php

1240

-

catalog/admin/file_manager.php

696

+

catalog/includes/classes/currencies.php

1241

697

1242

-

File: catalog/includes/application_top.php

698

+

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>)

1243

699

1244

-

1245

-

1246

-

1247

-

<td class="Normal">// start the timer for the page parse time log</td>

1248

-

1249

-

1250

-

<td class="Normal">// start the timer for the page parse time log</td>

1251

-

</tr>

1252

-

1253

-

1254

-

<td class="Normal">  define('PAGE_PARSE_START_TIME', microtime());</td>

1255

-

1256

-

1257

-

<td class="Normal">  define('PAGE_PARSE_START_TIME', microtime());</td>

1258

-

</tr>

1259

-

1260

-

1261

-

1262

-

1263

-

1264

-

1265

-

</tr>

1266

-

1267

-

1268

-

<td class="Normal">// set the level of error reporting</td>

1269

-

1270

-

1271

-

<td class="Normal">// set the level of error reporting</td>

1272

-

</tr>

1273

-

1274

-

1275

-

<td class="Normal">  error_reporting(E_ALL & ~E_NOTICE);</td>

1276

-

1277

-

1278

-

<td class="Normal">  error_reporting(E_ALL & ~E_NOTICE);</td>

1279

-

</tr>

1280

-

1281

-

1282

-

1283

-

1284

-

1285

-

1286

-

</tr>

1287

-

1288

-

1289

-

<td class="HasMismatch">// check if register_globals is enabled.</td>

1290

-

1291

-

1292

-

<td class="HasMismatch">// check support for register_globals</td>

1293

-

</tr>

1294

-

1295

-

1296

-

<td class="HasMismatch">// since this is a temporary measure this message is hardcoded. The requirement will be removed before 2.2 is finalized.</td>

1297

-

1298

-

1299

-

<td class="HasMismatch">  if (function_exists('ini_get') && (ini_get('register_globals') == false) && (PHP_VERSION < 4.3) ) {</td>

1300

-

</tr>

1301

-

1302

-

1303

-

<td class="HasMismatch">  if (function_exists('ini_get')) {</td>

1304

-

1305

-

1306

-

<td class="HasMismatch">    exit('Server Requirement Error: register_globals is disabled in your PHP configuration. This can be enabled in your php.ini configuration file or in the .htaccess file in your catalog directory. Please use PHP 4.3+ if register_globals cannot be enabled on the server.');</td>

1307

-

</tr>

1308

-

1309

-

1310

-

<td class="HasOrphan">    ini_get('register_globals') or exit('Server Requirement Error: register_globals is disabled in your PHP configuration. This can be enabled in your php.ini configuration file or in the .htaccess file in your catalog directory.');</td>

1311

-

1312

-

1313

-

1314

-

</tr>

1315

-

1316

-

1317

-

1318

-

1319

-

1320

-

1321

-

</tr>

1322

-

1323

-

1324

-

1325

-

1326

-

1327

-

1328

-

</tr>

1329

-

1330

-

1331

-

<td class="Normal">// Set the local configuration parameters - mainly for developers</td>

1332

-

1333

-

1334

-

<td class="Normal">// Set the local configuration parameters - mainly for developers</td>

1335

-

</tr>

1336

-

1337

-

1338

-

<td class="Normal">  if (file_exists('includes/local/configure.php')) include('includes/local/configure.php');</td>

1339

-

1340

-

1341

-

<td class="Normal">  if (file_exists('includes/local/configure.php')) include('includes/local/configure.php');</td>

1342

-

</tr>

1343

-

1344

-

1345

-

1346

-

1347

-

1348

-

1349

-

</tr>

1350

-

1351

-

1352

-

<td class="Normal">// include server parameters</td>

1353

-

1354

-

1355

-

<td class="Normal">// include server parameters</td>

1356

-

</tr>

1357

-

1358

-

1359

-

1360

-

<td class="Normal">      header('Location: install/index.php');</td>

1361

-

1362

-

1363

-

<td class="Normal">      header('Location: install/index.php');</td>

1364

-

</tr>

1365

-

1366

-

1367

-

1368

-

1369

-

1370

-

1371

-

</tr>

1372

-

1373

-

1374

-

1375

-

1376

-

1377

-

1378

-

</tr>

1379

-

1380

-

1381

-

1382

-

1383

-

1384

-

1385

-

</tr>

1386

-

1387

-

1388

-

<td class="Normal">// define the project version</td>

1389

-

1390

-

1391

-

<td class="Normal">// define the project version</td>

1392

-

</tr>

1393

-

1394

-

1395

-

<td class="Normal">  define('PROJECT_VERSION', 'osCommerce 2.2-MS2');</td>

1396

-

1397

-

1398

-

<td class="Normal">  define('PROJECT_VERSION', 'osCommerce 2.2-MS2');</td>

1399

-

</tr>

1400

-

1401

-

1402

-

1403

-

1404

-

1405

-

1406

-

</tr>

1407

-

1408

-

1409

-

1410

-

1411

-

1412

-

<td class="HasOrphan">// some code to solve compatibility issues</td>

1413

-

</tr>

1414

-

1415

-

1416

-

1417

-

1418

-

1419

-

<td class="HasOrphan">  require(DIR_WS_FUNCTIONS . 'compatibility.php');</td>

1420

-

</tr>

1421

-

1422

-

1423

-

1424

-

1425

-

1426

-

1427

-

</tr>

1428

-

1429

-

1430

-

<td class="Normal">// set the type of request (secure or not)</td>

1431

-

1432

-

1433

-

<td class="Normal">// set the type of request (secure or not)</td>

1434

-

</tr>

1435

-

1436

-

1437

-

<td class="Normal">  $request_type = (getenv('HTTPS') == 'on') ? 'SSL' : 'NONSSL';</td>

1438

-

1439

-

1440

-

<td class="Normal">  $request_type = (getenv('HTTPS') == 'on') ? 'SSL' : 'NONSSL';</td>

1441

-

</tr>

1442

-

1443

-

1444

-

1445

-

1446

-

1447

-

1448

-

</tr>

1449

-

1450

-

1451

-

<td class="Normal">// set php_self in the local scope</td>

1452

-

1453

-

1454

-

<td class="Normal">// set php_self in the local scope</td>

1455

-

</tr>

1456

-

1457

-

1458

-

<td class="Normal">  if (!isset($PHP_SELF)) $PHP_SELF = $HTTP_SERVER_VARS['PHP_SELF'];</td>

1459

-

1460

-

1461

-

<td class="Normal">  if (!isset($PHP_SELF)) $PHP_SELF = $HTTP_SERVER_VARS['PHP_SELF'];</td>

1462

-

</tr>

1463

-

1464

-

1465

-

1466

-

<td class="Normal">// include shopping cart class</td>

1467

-

1468

-

1469

-

<td class="Normal">// include shopping cart class</td>

1470

-

</tr>

1471

-

1472

-

1473

-

<td class="Normal">  require(DIR_WS_CLASSES . 'shopping_cart.php');</td>

1474

-

1475

-

1476

-

<td class="Normal">  require(DIR_WS_CLASSES . 'shopping_cart.php');</td>

1477

-

</tr>

1478

-

1479

-

1480

-

1481

-

1482

-

1483

-

1484

-

</tr>

1485

-

1486

-

1487

-

<td class="Normal">// include navigation history class</td>

1488

-

1489

-

1490

-

<td class="Normal">// include navigation history class</td>

1491

-

</tr>

1492

-

1493

-

1494

-

<td class="Normal">  require(DIR_WS_CLASSES . 'navigation_history.php');</td>

1495

-

1496

-

1497

-

<td class="Normal">  require(DIR_WS_CLASSES . 'navigation_history.php');</td>

1498

-

</tr>

1499

-

1500

-

1501

-

1502

-

1503

-

1504

-

1505

-

</tr>

1506

-

1507

-

1508

-

<td class="HasOrphan">// some code to solve compatibility issues</td>

1509

-

1510

-

1511

-

1512

-

</tr>

1513

-

1514

-

1515

-

<td class="HasOrphan">  require(DIR_WS_FUNCTIONS . 'compatibility.php');</td>

1516

-

1517

-

1518

-

1519

-

</tr>

1520

-

1521

-

1522

-

1523

-

1524

-

1525

-

1526

-

</tr>

1527

-

1528

-

1529

-

<td class="Normal">// check if sessions are supported, otherwise use the php3 compatible session class</td>

1530

-

1531

-

1532

-

<td class="Normal">// check if sessions are supported, otherwise use the php3 compatible session class</td>

1533

-

</tr>

1534

-

1535

-

1536

-

<td class="Normal">  if (!function_exists('session_start')) {</td>

1537

-

1538

-

1539

-

<td class="Normal">  if (!function_exists('session_start')) {</td>

1540

-

</tr>

1541

-

1542

-

1543

-

<td class="Normal">    define('PHP_SESSION_NAME', 'osCsid');</td>

1544

-

1545

-

1546

-

<td class="Normal">    define('PHP_SESSION_NAME', 'osCsid');</td>

1547

-

</tr>

1548

-

1549

-

1550

-

<td class="Normal">    define('PHP_SESSION_PATH', $cookie_path);</td>

1551

-

1552

-

1553

-

<td class="Normal">    define('PHP_SESSION_PATH', $cookie_path);</td>

1554

-

</tr>

1555

-

1556

-

1557

-

<td class="Normal">    define('PHP_SESSION_DOMAIN', $cookie_domain);</td>

1558

-

1559

-

1560

-

<td class="Normal">    define('PHP_SESSION_DOMAIN', $cookie_domain);</td>

1561

-

</tr>

1562

-

1563

-

1564

-

<td class="Normal">    define('PHP_SESSION_SAVE_PATH', SESSION_WRITE_DIRECTORY);</td>

1565

-

1566

-

1567

-

<td class="Normal">    define('PHP_SESSION_SAVE_PATH', SESSION_WRITE_DIRECTORY);</td>

1568

-

</tr>

1569

-

1570

-

1571

-

1572

-

<td class="Normal">      tep_session_start();</td>

1573

-

1574

-

1575

-

<td class="Normal">      tep_session_start();</td>

1576

-

</tr>

1577

-

1578

-

1579

-

<td class="Normal">      $session_started = true;</td>

1580

-

1581

-

1582

-

<td class="Normal">      $session_started = true;</td>

1583

-

</tr>

1584

-

1585

-

1586

-

1587

-

1588

-

1589

-

1590

-

</tr>

1591

-

1592

-

1593

-

1594

-

1595

-

1596

-

1597

-

</tr>

1598

-

1599

-

1600

-

<td class="Normal">    tep_session_start();</td>

1601

-

1602

-

1603

-

<td class="Normal">    tep_session_start();</td>

1604

-

</tr>

1605

-

1606

-

1607

-

<td class="Normal">    $session_started = true;</td>

1608

-

1609

-

1610

-

<td class="Normal">    $session_started = true;</td>

1611

-

</tr>

1612

-

1613

-

1614

-

1615

-

1616

-

1617

-

1618

-

</tr>

1619

-

1620

-

1621

-

1622

-

1623

-

1624

-

1625

-

</tr>

1626

-

1627

-

1628

-

1629

-

1630

-

1631

-

<td class="HasOrphan">  if ( ($session_started == true) && (PHP_VERSION >= 4.3) && function_exists('ini_get') && (ini_get('register_globals') == false) ) {</td>

1632

-

</tr>

1633

-

1634

-

1635

-

1636

-

1637

-

1638

-

<td class="HasOrphan">    extract($_SESSION, EXTR_OVERWRITE+EXTR_REFS);</td>

1639

-

</tr>

1640

-

1641

-

1642

-

1643

-

1644

-

1645

-

1646

-

</tr>

1647

-

1648

-

1649

-

1650

-

1651

-

1652

-

1653

-

</tr>

1654

-

1655

-

1656

-

<td class="Normal">// set SID once, even if empty</td>

1657

-

1658

-

1659

-

<td class="Normal">// set SID once, even if empty</td>

1660

-

</tr>

1661

-

1662

-

1663

-

<td class="Normal">  $SID = (defined('SID') ? SID : '');</td>

1664

-

1665

-

1666

-

<td class="Normal">  $SID = (defined('SID') ? SID : '');</td>

1667

-

</tr>

1668

-

1669

-

1670

-

1671

-

1672

-

1673

-

1674

-

</tr>

1675

-

1676

-

1677

-

<td class="Normal">// verify the ssl_session_id if the feature is enabled</td>

1678

-

1679

-

1680

-

<td class="Normal">// verify the ssl_session_id if the feature is enabled</td>

1681

-

</tr>

700

+

701

+

<tr>

702

+

<td class="diffLineNumbers">40</td><td class="diffLineNumbers">40</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent">      if ($calculate_currency_value == true) {</td>

703

+

</tr>

704

+

<tr>

705

+

<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>

706

+

</tr>

707

+

<tr>

708

+

<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>

709

+

</tr>

710

+

<tr>

711

+

<td class="diffLineNumbersA">43</td><td class="diffLineNumbers"> </td><td class="diffMarkerColA">-</td><td class="lineContent diffContentA">// if the selected currency is in the european euro-conversion and the default currency is euro,</td>

712

+

</tr>

713

+

<tr>

714

+

<td class="diffLineNumbersA">44</td><td class="diffLineNumbers"> </td><td class="diffMarkerColA">-</td><td class="lineContent diffContentA">// the currency will displayed in the national currency and euro currency</td>

715

+

</tr>

716

+

<tr>

717

+

<td class="diffLineNumbersA">45</td><td class="diffLineNumbers"> </td><td class="diffMarkerColA">-</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>

718

+

</tr>

719

+

<tr>

720

+

<td class="diffLineNumbersA">46</td><td class="diffLineNumbers"> </td><td class="diffMarkerColA">-</td><td class="lineContent diffContentA">          $format_string .= ' [' . $this->format($number, true, 'EUR') . ']';</td>

721

+

</tr>

722

+

<tr>

723

+

724

+

</tr>

725

+

<tr>

726

+

727

+

</tr>

728

+

<tr>

729

+

<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>

730

+

</tr>

731

+

<tr>

732

+

733

+

</tr>

1682

734

</table>

1683

735

1684

-

736

+

<h3>[C] Update navigation history class</h3>

1685

737

1686

-

File: catalog/includes/functions/compatibility.php

738

+

<ul>

739

+

<li>Make sure $parameters is an array in the navigation history class.</li>

740

+

</ul>

1687

741

1688

-

1689

-

1690

-

1691

-

1692

-

1693

-

1694

-

1695

-

</tr>

1696

-

1697

-

1698

-

<td class="Normal">  $Id: compatibility.php,v 1.19 2003/04/09 16:12:54 project3000 Exp $</td>

1699

-

1700

-

1701

-

<td class="Normal">  $Id: compatibility.php,v 1.19 2003/04/09 16:12:54 project3000 Exp $</td>

1702

-

</tr>

1703

-

1704

-

1705

-

1706

-

1707

-

1708

-

1709

-

</tr>

1710

-

1711

-

1712

-

<td class="Normal">  osCommerce, Open Source E-Commerce Solutions</td>

1713

-

1714

-

1715

-

<td class="Normal">  osCommerce, Open Source E-Commerce Solutions</td>

1716

-

</tr>

1717

-

1718

-

1719

-

<td class="Normal">  http://www.oscommerce.com</td>

1720

-

1721

-

1722

-

<td class="Normal">  http://www.oscommerce.com</td>

1723

-

</tr>

1724

-

1725

-

1726

-

1727

-

1728

-

1729

-

1730

-

</tr>

1731

-

1732

-

1733

-

1734

-

1735

-

1736

-

1737

-

</tr>

1738

-

1739

-

1740

-

1741

-

1742

-

1743

-

1744

-

</tr>

1745

-

1746

-

1747

-

<td class="Normal">  Released under the GNU General Public License</td>

1748

-

1749

-

1750

-

<td class="Normal">  Released under the GNU General Public License</td>

1751

-

</tr>

1752

-

1753

-

1754

-

1755

-

1756

-

1757

-

1758

-

</tr>

1759

-

1760

-

1761

-

<td class="HasOrphan">  Modified by Marco Canini, <m.canini@libero.it></td>

1762

-

1763

-

1764

-

1765

-

</tr>

1766

-

1767

-

1768

-

<td class="HasOrphan">  - Fixed a bug with arrays in $HTTP_xxx_VARS</td>

1769

-

1770

-

1771

-

1772

-

</tr>

1773

-

1774

-

1775

-

1776

-

1777

-

1778

-

1779

-

</tr>

1780

-

1781

-

1782

-

1783

-

1784

-

1785

-

1786

-

</tr>

1787

-

1788

-

1789

-

1790

-

1791

-

1792

-

1793

-

</tr>

1794

-

1795

-

1796

-

<td class="Normal">// Recursively handle magic_quotes_gpc turned off.</td>

1797

-

1798

-

1799

-

<td class="Normal">// Recursively handle magic_quotes_gpc turned off.</td>

1800

-

</tr>

1801

-

1802

-

1803

-

<td class="Normal">// This is due to the possibility of have an array in</td>

1804

-

1805

-

1806

-

<td class="Normal">// This is due to the possibility of have an array in</td>

1807

-

</tr>

1808

-

1809

-

1810

-

1811

-

1812

-

1813

-

1814

-

</tr>

1815

-

1816

-

1817

-

1818

-

1819

-

1820

-

1821

-

1822

-

</tr>

1823

-

1824

-

1825

-

<td class="Normal">        $ar[$key] = addslashes($value);</td>

1826

-

1827

-

1828

-

<td class="Normal">        $ar[$key] = addslashes($value);</td>

1829

-

</tr>

1830

-

1831

-

1832

-

1833

-

1834

-

1835

-

1836

-

</tr>

1837

-

1838

-

1839

-

1840

-

1841

-

1842

-

1843

-

</tr>

1844

-

1845

-

1846

-

1847

-

1848

-

1849

-

1850

-

</tr>

1851

-

1852

-

1853

-

1854

-

1855

-

1856

-

1857

-

</tr>

1858

-

1859

-

1860

-

<td class="HasMismatch">// $HTTP_xxx_VARS are always set on php4</td>

1861

-

1862

-

1863

-

<td class="HasMismatch">  if (PHP_VERSION >= 4.1) {</td>

1864

-

</tr>

1865

-

1866

-

1867

-

1868

-

1869

-

1870

-

1871

-

</tr>

1872

-

1873

-

1874

-

1875

-

1876

-

1877

-

1878

-

</tr>

1879

-

1880

-

1881

-

1882

-

1883

-

1884

-

<td class="HasOrphan">    $HTTP_COOKIE_VARS =& $_COOKIE;</td>

1885

-

</tr>

1886

-

1887

-

1888

-

1889

-

1890

-

1891

-

<td class="HasOrphan">    $HTTP_SESSION_VARS =& $_SESSION;</td>

1892

-

</tr>

1893

-

1894

-

1895

-

1896

-

1897

-

1898

-

<td class="HasOrphan">    $HTTP_POST_FILES =& $_FILES;</td>

1899

-

</tr>

1900

-

1901

-

1902

-

1903

-

1904

-

1905

-

<td class="HasOrphan">    $HTTP_SERVER_VARS =& $_SERVER;</td>

1906

-

</tr>

1907

-

1908

-

1909

-

1910

-

1911

-

1912

-

1913

-

</tr>

1914

-

1915

-

1916

-

<td class="HasMismatch">  if (!is_array($HTTP_GET_VARS)) $HTTP_GET_VARS = array();</td>

1917

-

1918

-

1919

-

<td class="HasMismatch">    if (!is_array($HTTP_GET_VARS)) $HTTP_GET_VARS = array();</td>

1920

-

</tr>

1921

-

1922

-

1923

-

<td class="HasMismatch">  if (!is_array($HTTP_POST_VARS)) $HTTP_POST_VARS = array();</td>

1924

-

1925

-

1926

-

<td class="HasMismatch">    if (!is_array($HTTP_POST_VARS)) $HTTP_POST_VARS = array();</td>

1927

-

</tr>

1928

-

1929

-

1930

-

<td class="HasMismatch">  if (!is_array($HTTP_COOKIE_VARS)) $HTTP_COOKIE_VARS = array();</td>

1931

-

1932

-

1933

-

<td class="HasMismatch">    if (!is_array($HTTP_COOKIE_VARS)) $HTTP_COOKIE_VARS = array();</td>

1934

-

</tr>

1935

-

1936

-

1937

-

1938

-

1939

-

1940

-

1941

-

</tr>

1942

-

1943

-

1944

-

1945

-

1946

-

1947

-

1948

-

</tr>

1949

-

1950

-

1951

-

<td class="Normal">// handle magic_quotes_gpc turned off.</td>

1952

-

1953

-

1954

-

<td class="Normal">// handle magic_quotes_gpc turned off.</td>

1955

-

</tr>

1956

-

1957

-

1958

-

<td class="Normal">  if (!get_magic_quotes_gpc()) {</td>

1959

-

1960

-

1961

-

<td class="Normal">  if (!get_magic_quotes_gpc()) {</td>

1962

-

</tr>

1963

-

1964

-

1965

-

<td class="Normal">    do_magic_quotes_gpc($HTTP_GET_VARS);</td>

1966

-

1967

-

1968

-

<td class="Normal">    do_magic_quotes_gpc($HTTP_GET_VARS);</td>

1969

-

</tr>

1970

-

1971

-

1972

-

<td class="Normal">    do_magic_quotes_gpc($HTTP_POST_VARS);</td>

1973

-

1974

-

1975

-

<td class="Normal">    do_magic_quotes_gpc($HTTP_POST_VARS);</td>

1976

-

</tr>

1977

-

1978

-

1979

-

<td class="Normal">    do_magic_quotes_gpc($HTTP_COOKIE_VARS);</td>

1980

-

1981

-

1982

-

<td class="Normal">    do_magic_quotes_gpc($HTTP_COOKIE_VARS);</td>

1983

-

</tr>

1984

-

</table>

742

+

Affected Files

743

+

catalog/includes/classes/navigation_history.php

1985

744

1986

-

745

+

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>)

1987

746

1988

-

File: catalog/includes/functions/sessions.php

1989

-

1990

-

1991

-

1992

-

1993

-

1994

-

1995

-

1996

-

1997

-

</tr>

1998

-

1999

-

2000

-

2001

-

2002

-

2003

-

2004

-

</tr>

2005

-

2006

-

2007

-

<td class="Normal">  function tep_session_register($variable) {</td>

2008

-

2009

-

2010

-

<td class="Normal">  function tep_session_register($variable) {</td>

2011

-

</tr>

2012

-

2013

-

2014

-

<td class="Normal">    global $session_started;</td>

2015

-

2016

-

2017

-

<td class="Normal">    global $session_started;</td>

2018

-

</tr>

2019

-

2020

-

2021

-

2022

-

2023

-

2024

-

2025

-

</tr>

2026

-

2027

-

2028

-

<td class="Normal">    if ($session_started == true) {</td>

2029

-

2030

-

2031

-

<td class="Normal">    if ($session_started == true) {</td>

2032

-

</tr>

2033

-

2034

-

2035

-

2036

-

2037

-

2038

-

<td class="HasOrphan">      if (PHP_VERSION < 4.3) {</td>

2039

-

</tr>

2040

-

2041

-

2042

-

<td class="HasMismatch">      return session_register($variable);</td>

2043

-

2044

-

2045

-

<td class="HasMismatch">        return session_register($variable);</td>

2046

-

</tr>

2047

-

2048

-

2049

-

2050

-

2051

-

2052

-

2053

-

</tr>

2054

-

2055

-

2056

-

2057

-

2058

-

2059

-

<td class="HasOrphan">        $_SESSION[$variable] = (isset($GLOBALS[$variable])) ? $GLOBALS[$variable] : null;</td>

2060

-

</tr>

2061

-

2062

-

2063

-

2064

-

2065

-

2066

-

2067

-

</tr>

2068

-

2069

-

2070

FishEye

Mode

Context

Other Diffs

Ignore

Diff