|
@@ 351-353 (lines=3) @@
|
| 348 |
|
('new mode'===substr($item,0,8)) || ('deleted file'===substr($item,0,12)) || |
| 349 |
|
('index' === substr($item, 0, 5))) { |
| 350 |
|
$output['info'] .= "<pre>".$item."</pre>"; |
| 351 |
|
} elseif ('Binary files'===substr($item,0,12)) { |
| 352 |
|
$output['contents'][] = array('lineNumOld'=> "-", 'lineNumNew'=> "-", 'lineCode' => "<pre class='chunk'>".$item."</pre>",); |
| 353 |
|
} elseif ('@@' === substr($item, 0, 2)) { |
| 354 |
|
preg_match('/@@ -([0-9]+)/', $item, $matches); |
| 355 |
|
$lineNumOld = $matches[1] - 1; |
| 356 |
|
$lineNumNew = $matches[1] - 1; |
|
@@ 362-364 (lines=3) @@
|
| 359 |
|
$output['info'] .= "<pre class='old'>".$item."</pre>"; |
| 360 |
|
} elseif ('+++' === substr($item, 0, 3)) { |
| 361 |
|
$output['info'] .= "<pre class='new'>".$item."</pre>"; |
| 362 |
|
} elseif ('\ ' === substr($item, 0, 2)) { |
| 363 |
|
$output['contents'][] = array('lineNumOld'=> "-", 'lineNumNew'=> "-", 'lineCode'=> "<pre>".htmlspecialchars($item)."</pre>",); |
| 364 |
|
} elseif ('-' === substr($item, 0, 1)) { |
| 365 |
|
$lineNumOld++; |
| 366 |
|
$output['contents'][] = array('lineNumOld'=> $lineNumOld, 'lineNumNew'=> "-", 'lineCode'=> "<pre class='old'>".htmlspecialchars($item)."</pre>",); |
| 367 |
|
} elseif ('+' === substr($item, 0, 1)) { |
|
@@ 367-370 (lines=4) @@
|
| 364 |
|
} elseif ('-' === substr($item, 0, 1)) { |
| 365 |
|
$lineNumOld++; |
| 366 |
|
$output['contents'][] = array('lineNumOld'=> $lineNumOld, 'lineNumNew'=> "-", 'lineCode'=> "<pre class='old'>".htmlspecialchars($item)."</pre>",); |
| 367 |
|
} elseif ('+' === substr($item, 0, 1)) { |
| 368 |
|
$lineNumNew++; |
| 369 |
|
$output['contents'][] = array('lineNumOld'=> "-", 'lineNumNew'=> $lineNumNew, 'lineCode'=> "<pre class='new'>".htmlspecialchars($item)."</pre>",); |
| 370 |
|
} else { |
| 371 |
|
$lineNumNew++; |
| 372 |
|
$lineNumOld++; |
| 373 |
|
$output['contents'][] = array('lineNumOld'=> $lineNumOld, 'lineNumNew'=> $lineNumNew, 'lineCode'=> "<pre>".htmlspecialchars($item)."</pre>",); |