2. Araxis Merge File Comparison Report

Produced by Araxis Merge on Tue Jul 6 14:19:51 2010 UTC. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a reasonably standards compliant browser such as the latest version of Firefox or Internet Explorer. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

2.1 Files compared

# Location File Last Modified
1 C:\Users\greenbarn2010\Documents\websites\ccp8\dev\8.0.0\beta-1\saved\khxc\skins\ClickCartPro print.php Fri Aug 22 10:46:03 2008 UTC
2 C:\Users\greenbarn2010\Documents\websites\ccp8\dev\XCS001\prof-changed\xcs\skins\ClickCartPro print.php Wed Jun 16 09:55:56 2010 UTC

2.2 Comparison summary

Description Between
Files 1 and 2
Text Blocks Lines
Unchanged 2 122
Changed 1 3
Inserted 0 0
Removed 0 0

2.3 Comparison options

Whitespace Differences in whitespace are significant
Character case Differences in character case are significant
Line endings Differences in line endings (CR and LF characters) are ignored
CR/LF characters Not shown in the comparison detail

2.4 Active regular expressions

Expression Description
^[ \t]*$ Blank lines

2.5 Comparison detail

1        <?php  /* PHP FU NCTION */   1        <?php  /* PHP FU NCTION */
2               /* REQUIR ED: Skin s tartup */   2               /* REQUIR ED: Skin s tartup */
3                $skinfunc  =& $this-> include_ skinfu nc ( ' KHXC_S kin F unc
' ) ;
  3               
include_ o nc ' s kin f unc .php '
;
        4               $skinfunc  = $this-> include_sk infunc('KH XC_SkinFun c');
4               extract($ skinfunc-> startup()) ; ?>   5               extract($ skinfunc-> startup()) ; ?>
5     6  
6   <!DOCTYPE  html PUBLI C "-//W3C/ /DTD XHTML  1.0 Stric t//EN" "ht tp://www.w 3.org/TR/x html1/DTD/ xhtml1-str ict.dtd">   7   <!DOCTYPE  html PUBLI C "-//W3C/ /DTD XHTML  1.0 Stric t//EN" "ht tp://www.w 3.org/TR/x html1/DTD/ xhtml1-str ict.dtd">
7     8  
8   <html xmln s="http:// www.w3.org /1999/xhtm l">   9   <html xmln s="http:// www.w3.org /1999/xhtm l">
9     10  
10   <head>   11   <head>
11     12  
12   <meta http -equiv="co ntent-type " content= "text/html ; charset= ISO-8859-1 " />   13   <meta http -equiv="co ntent-type " content= "text/html ; charset= ISO-8859-1 " />
13     14  
14   <meta name ="keywords " content= "<?php pri nt $metake ywords; ?> " />   15   <meta name ="keywords " content= "<?php pri nt $metake ywords; ?> " />
15     16  
16   <meta name ="descript ion" conte nt="<?php  print $met adesc; ?>"  />   17   <meta name ="descript ion" conte nt="<?php  print $met adesc; ?>"  />
17     18  
18   <meta name ="robots"  content="i ndex,follo w" />   19   <meta name ="robots"  content="i ndex,follo w" />
19     20  
20   <base href ="<?php pr int $disp_ baseurl; ? >" />   21   <base href ="<?php pr int $disp_ baseurl; ? >" />
21     22  
22        <?php  /* PHP FU NCTION */   23        <?php  /* PHP FU NCTION */
23               /* REQUIR ED: Prints  lightbox  code */   24               /* REQUIR ED: Prints  lightbox  code */
24               $skinfunc ->lightbox (); ?>   25               $skinfunc ->lightbox (); ?>
25     26  
26   <link rel= "styleshee t" type="t ext/css" m edia="all"  href="ski ns/ClickCa rtPro/css/ all.css" / >   27   <link rel= "styleshee t" type="t ext/css" m edia="all"  href="ski ns/ClickCa rtPro/css/ all.css" / >
27     28  
28   <script ty pe="text/j avascript"  src="skin s/ClickCar tPro/scrip ts/scripts .js"></scr ipt>   29   <script ty pe="text/j avascript"  src="skin s/ClickCar tPro/scrip ts/scripts .js"></scr ipt>
29     30  
30   <title><?p hp print $ metatitle;  ?></title >   31   <title><?p hp print $ metatitle;  ?></title >
31     32  
32   </head>   33   </head>
33     34  
34        <?php  /* PHP FU NCTION */   35        <?php  /* PHP FU NCTION */
35               /* REQUIR ED: Prints  the body  tag */   36               /* REQUIR ED: Prints  the body  tag */
36               $skinfunc ->bodytag( ); ?>   37               $skinfunc ->bodytag( ); ?>
37     38  
38   <div id="s kin_wrappe r">   39   <div id="s kin_wrappe r">
39     40  
40   <div id="k hxc_printa ble">   41   <div id="k hxc_printa ble">
41     42  
42   <div id="s kin_conten t">   43   <div id="s kin_conten t">
43     44  
44        <?php  /* PHP FU NCTION */   45        <?php  /* PHP FU NCTION */
45               /* REQUIR ED: Print  the conten t for the  page.  Do  not   */   46               /* REQUIR ED: Print  the conten t for the  page.  Do  not   */
46               /* remove  this func tion call.   Doing so  will resu lt in */   47               /* remove  this func tion call.   Doing so  will resu lt in */
47               /* blank  pages bein g generate d. */   48               /* blank  pages bein g generate d. */
48               $skinfunc ->content( ); ?>   49               $skinfunc ->content( ); ?>
49     50  
50   </div>   51   </div>
51     52  
52   </div>   53   </div>
53     54  
54        <?php  /* PHP FU NCTION */   55        <?php  /* PHP FU NCTION */
55               /* REQUIR ED: Run th e debug an d closure  function.  */   56               /* REQUIR ED: Run th e debug an d closure  function.  */
56               $skinfunc ->debug();  ?>   57               $skinfunc ->debug();  ?>
57     58  
58   </div>   59   </div>
59     60  
60   </body>   61   </body>
61     62  
62   </html>   63   </html>