1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
|
<?php
namespace dokuwiki\Ui;
use dokuwiki\ChangeLog\PageChangeLog;
use dokuwiki\ChangeLog\RevisionInfo;
use dokuwiki\Form\Form;
use InlineDiffFormatter;
use TableDiffFormatter;
/**
* DokuWiki PageDiff Interface
*
* @author Andreas Gohr <andi@splitbrain.org>
* @author Satoshi Sahara <sahara.satoshi@gmail.com>
* @package dokuwiki\Ui
*/
class PageDiff extends Diff
{
/* @var PageChangeLog */
protected $changelog;
/* @var RevisionInfo older revision */
protected $RevInfo1;
/* @var RevisionInfo newer revision */
protected $RevInfo2;
/* @var string */
protected $text;
/**
* PageDiff Ui constructor
*
* @param string $id page id
*/
public function __construct($id = null)
{
global $INFO;
if (!isset($id)) $id = $INFO['id'];
// init preference
$this->preference['showIntro'] = true;
$this->preference['difftype'] = 'sidebyside'; // diff view type: inline or sidebyside
parent::__construct($id);
}
/** @inheritdoc */
protected function setChangeLog()
{
$this->changelog = new PageChangeLog($this->id);
}
/**
* Set text to be compared with most current version
* when it has been externally edited
* exclusively use of the compare($old, $new) method
*
* @param string $text
* @return $this
*/
public function compareWith($text = null)
{
if (isset($text)) {
$this->text = $text;
$changelog =& $this->changelog;
// revision info object of older file (left side)
$info = $changelog->getCurrentRevisionInfo();
$this->RevInfo1 = new RevisionInfo($info);
$this->RevInfo1->append([
'current' => true,
'text' => rawWiki($this->id),
]);
// revision info object of newer file (right side)
$this->RevInfo2 = new RevisionInfo();
$this->RevInfo2->append([
'date' => false,
//'ip' => '127.0.0.1',
//'type' => DOKU_CHANGE_TYPE_CREATE,
'id' => $this->id,
//'user' => '',
//'sum' => '',
'extra' => 'compareWith',
//'sizechange' => strlen($this->text) - io_getSizeFile(wikiFN($this->id)),
'current' => false,
'text' => cleanText($this->text),
]);
}
return $this;
}
/**
* Handle requested revision(s) and diff view preferences
*
* @return void
*/
protected function handle()
{
global $INPUT;
// retrieve requested rev or rev2
if (!isset($this->RevInfo1, $this->RevInfo2)) {
parent::handle();
}
// requested diff view type
$mode = '';
if ($INPUT->has('difftype')) {
$mode = $INPUT->str('difftype');
} else {
// read preference from DokuWiki cookie. PageDiff only
$mode = get_doku_pref('difftype', null);
}
if (in_array($mode, ['inline', 'sidebyside'])) {
$this->preference['difftype'] = $mode;
}
if (!$INPUT->has('rev') && !$INPUT->has('rev2')) {
global $INFO, $REV;
if ($this->id == $INFO['id']) {
$REV = $this->rev1; // store revision back in $REV
}
}
}
/**
* Prepare revision info of comparison pair
*/
protected function preProcess()
{
global $lang;
$changelog =& $this->changelog;
// create revision info object for older and newer sides
// RevInfo1 : older, left side
// RevInfo2 : newer, right side
$changelogRev1 = $changelog->getRevisionInfo($this->rev1);
$changelogRev2 = $changelog->getRevisionInfo($this->rev2);
$this->RevInfo1 = new RevisionInfo($changelogRev1);
$this->RevInfo2 = new RevisionInfo($changelogRev2);
foreach ([$this->RevInfo1, $this->RevInfo2] as $RevInfo) {
$isCurrent = $changelog->isCurrentRevision($RevInfo->val('date'));
$RevInfo->isCurrent($isCurrent);
if ($RevInfo->val('type') == DOKU_CHANGE_TYPE_DELETE || empty($RevInfo->val('type'))) {
$text = '';
} else {
$rev = $isCurrent ? '' : $RevInfo->val('date');
$text = rawWiki($this->id, $rev);
}
$RevInfo->append(['text' => $text]);
}
// msg could displayed only when wrong url typed in browser address bar
if ($this->rev2 === false) {
msg(sprintf(
$lang['page_nonexist_rev'],
$this->id,
wl($this->id, ['do' => 'edit']),
$this->id
), -1);
} elseif (!$this->rev1 || $this->rev1 == $this->rev2) {
msg('no way to compare when less than two revisions', -1);
}
}
/**
* Show diff
* between current page version and provided $text
* or between the revisions provided via GET or POST
*
* @return void
* @author Andreas Gohr <andi@splitbrain.org>
*
*/
public function show()
{
global $lang;
if (!isset($this->RevInfo1, $this->RevInfo2)) {
// retrieve form parameters: rev, rev2, difftype
$this->handle();
// prepare revision info of comparison pair, except PageConfrict or PageDraft
$this->preProcess();
}
// revision title
$rev1Title = trim($this->RevInfo1->showRevisionTitle() . ' ' . $this->RevInfo1->showCurrentIndicator());
$rev1Summary = ($this->RevInfo1->val('date'))
? $this->RevInfo1->showEditSummary() . ' ' . $this->RevInfo1->showEditor()
: '';
if ($this->RevInfo2->val('extra') == 'compareWith') {
$rev2Title = $lang['yours'];
$rev2Summary = '';
} else {
$rev2Title = trim($this->RevInfo2->showRevisionTitle() . ' ' . $this->RevInfo2->showCurrentIndicator());
$rev2Summary = ($this->RevInfo2->val('date'))
? $this->RevInfo2->showEditSummary() . ' ' . $this->RevInfo2->showEditor()
: '';
}
// create difference engine object
$Difference = new \Diff(
explode("\n", $this->RevInfo1->val('text')),
explode("\n", $this->RevInfo2->val('text'))
);
// build paired navigation
[$rev1Navi, $rev2Navi] = $this->buildRevisionsNavigation();
// display intro
if ($this->preference['showIntro']) echo p_locale_xhtml('diff');
// print form to choose diff view type, and exact url reference to the view
$this->showDiffViewSelector();
// assign minor edit checker to the variable
$classEditType = static fn($changeType) => ($changeType === DOKU_CHANGE_TYPE_MINOR_EDIT)
? ' class="minor"'
: '';
// display diff view table
echo '<div class="table">';
echo '<table class="diff diff_' . hsc($this->preference['difftype']) . '">';
//navigation and header
switch ($this->preference['difftype']) {
case 'inline':
$title1 = $rev1Title . ($rev1Summary ? '<br />' . $rev1Summary : '');
$title2 = $rev2Title . ($rev2Summary ? '<br />' . $rev2Summary : '');
// no navigation for PageConflict or PageDraft
if ($this->RevInfo2->val('extra') !== 'compareWith') {
echo '<tr>'
. '<td class="diff-lineheader">-</td>'
. '<td class="diffnav">' . $rev1Navi . '</td>'
. '</tr>';
echo '<tr>'
. '<th class="diff-lineheader">-</th>'
. '<th' . $classEditType($this->RevInfo1->val('type')) . '>' . $title1 . '</th>'
. '</tr>';
}
echo '<tr>'
. '<td class="diff-lineheader">+</td>'
. '<td class="diffnav">' . $rev2Navi . '</td>'
. '</tr>';
echo '<tr>'
. '<th class="diff-lineheader">+</th>'
. '<th' . $classEditType($this->RevInfo2->val('type')) . '>' . $title2 . '</th>'
. '</tr>';
// create formatter object
$DiffFormatter = new InlineDiffFormatter();
break;
case 'sidebyside':
default:
$title1 = $rev1Title . ($rev1Summary ? ' ' . $rev1Summary : '');
$title2 = $rev2Title . ($rev2Summary ? ' ' . $rev2Summary : '');
// no navigation for PageConflict or PageDraft
if ($this->RevInfo2->val('extra') !== 'compareWith') {
echo '<tr>'
. '<td colspan="2" class="diffnav">' . $rev1Navi . '</td>'
. '<td colspan="2" class="diffnav">' . $rev2Navi . '</td>'
. '</tr>';
}
echo '<tr>'
. '<th colspan="2"' . $classEditType($this->RevInfo1->val('type')) . '>' . $title1 . '</th>'
. '<th colspan="2"' . $classEditType($this->RevInfo2->val('type')) . '>' . $title2 . '</th>'
. '</tr>';
// create formatter object
$DiffFormatter = new TableDiffFormatter();
break;
}
// output formatted difference
echo $this->insertSoftbreaks($DiffFormatter->format($Difference));
echo '</table>';
echo '</div>';
}
/**
* Print form to choose diff view type, and exact url reference to the view
*/
protected function showDiffViewSelector()
{
global $lang;
// no revisions selector for PageConflict or PageDraft
if ($this->RevInfo2->val('extra') == 'compareWith') return;
// use timestamp for current revision, date may be false when revisions < 2
[$rev1, $rev2] = [(int)$this->RevInfo1->val('date'), (int)$this->RevInfo2->val('date')];
echo '<div class="diffoptions group">';
// create the form to select difftype
$form = new Form(['action' => wl()]);
$form->setHiddenField('id', $this->id);
$form->setHiddenField('rev2[0]', $rev1);
$form->setHiddenField('rev2[1]', $rev2);
$form->setHiddenField('do', 'diff');
$options = ['sidebyside' => $lang['diff_side'], 'inline' => $lang['diff_inline']];
$input = $form->addDropdown('difftype', $options, $lang['diff_type'])
->val($this->preference['difftype'])
->addClass('quickselect');
$input->useInput(false); // inhibit prefillInput() during toHTML() process
$form->addButton('do[diff]', 'Go')->attr('type', 'submit');
echo $form->toHTML();
// show exact url reference to the view when it is meaningful
echo '<p>';
if ($rev1 && $rev2) {
// link to exactly this view FS#2835
$viewUrl = $this->diffViewlink('difflink', $rev1, $rev2);
}
echo $viewUrl ?? '<br />';
echo '</p>';
echo '</div>';
}
/**
* Create html for revision navigation
*
* The navigation consists of older and newer revisions selectors, each
* state mutually depends on the selected revision of opposite side.
*
* @return string[] html of navigation for both older and newer sides
*/
protected function buildRevisionsNavigation()
{
$changelog =& $this->changelog;
if ($this->RevInfo2->val('extra') == 'compareWith') {
// no revisions selector for PageConflict or PageDraft
return ['', ''];
}
// use timestamp for current revision, date may be false when revisions < 2
[$rev1, $rev2] = [(int)$this->RevInfo1->val('date'), (int)$this->RevInfo2->val('date')];
// retrieve revisions used in dropdown selectors, even when rev1 or rev2 is false
[$revs1, $revs2] = $changelog->getRevisionsAround(
($rev1 ?: $changelog->currentRevision()),
($rev2 ?: $changelog->currentRevision())
);
// build options for dropdown selector
$rev1Options = $this->buildRevisionOptions('older', $revs1);
$rev2Options = $this->buildRevisionOptions('newer', $revs2);
// determine previous/next revisions (older/left side)
$rev1Prev = false;
$rev1Next = false;
if (($index = array_search($rev1, $revs1)) !== false) {
$rev1Prev = ($index + 1 < count($revs1)) ? $revs1[$index + 1] : false;
$rev1Next = ($index > 0) ? $revs1[$index - 1] : false;
}
// determine previous/next revisions (newer/right side)
$rev2Prev = false;
$rev2Next = false;
if (($index = array_search($rev2, $revs2)) !== false) {
$rev2Prev = ($index + 1 < count($revs2)) ? $revs2[$index + 1] : false;
$rev2Next = ($index > 0) ? $revs2[$index - 1] : false;
}
/*
* navigation UI for older revisions / Left side:
*/
$rev1Navi = '';
// move backward both side: ◀◀
if ($rev1Prev && $rev2Prev) {
$rev1Navi .= $this->diffViewlink('diffbothprevrev', $rev1Prev, $rev2Prev);
}
// move backward left side: ◀
if ($rev1Prev) {
$rev1Navi .= $this->diffViewlink('diffprevrev', $rev1Prev, $rev2);
}
// dropdown
$rev1Navi .= $this->buildDropdownSelector('older', $rev1Options);
// move forward left side: ▶
if ($rev1Next && ($rev1Next < $rev2)) {
$rev1Navi .= $this->diffViewlink('diffnextrev', $rev1Next, $rev2);
}
/*
* navigation UI for newer revisions / Right side:
*/
$rev2Navi = '';
// move backward right side: ◀
if ($rev2Prev && ($rev1 < $rev2Prev)) {
$rev2Navi .= $this->diffViewlink('diffprevrev', $rev1, $rev2Prev);
}
// dropdown
$rev2Navi .= $this->buildDropdownSelector('newer', $rev2Options);
// move forward right side: ▶
if ($rev2Next) {
if ($changelog->isCurrentRevision($rev2Next)) {
$rev2Navi .= $this->diffViewlink('difflastrev', $rev1, $rev2Next);
} else {
$rev2Navi .= $this->diffViewlink('diffnextrev', $rev1, $rev2Next);
}
}
// move forward both side: ▶▶
if ($rev1Next && $rev2Next) {
$rev2Navi .= $this->diffViewlink('diffbothnextrev', $rev1Next, $rev2Next);
}
return [$rev1Navi, $rev2Navi];
}
/**
* prepare options for dropdwon selector
*
* @params string $side "older" or "newer"
* @params array $revs list of revsion
* @return array
*/
protected function buildRevisionOptions($side, $revs)
{
// use timestamp for current revision, date may be false when revisions < 2
[$rev1, $rev2] = [(int)$this->RevInfo1->val('date'), (int)$this->RevInfo2->val('date')];
$changelog =& $this->changelog;
$options = [];
foreach ($revs as $rev) {
$info = $changelog->getRevisionInfo($rev);
// revision info may have timestamp key when external edits occurred
$info['timestamp'] ??= true;
$date = dformat($info['date']);
if ($info['timestamp'] === false) {
// externally deleted or older file restored
$date = preg_replace('/[0-9a-zA-Z]/', '_', $date);
}
$options[$rev] = [
'label' => implode(' ', [
$date,
editorinfo($info['user'], true),
$info['sum'],
]),
'attrs' => ['title' => $rev]
];
if (
($side == 'older' && ($rev2 && $rev >= $rev2))
|| ($side == 'newer' && ($rev <= $rev1))
) {
$options[$rev]['attrs']['disabled'] = 'disabled';
}
}
return $options;
}
/**
* build Dropdown form for revisions navigation
*
* @params string $side "older" or "newer"
* @params array $options dropdown options
* @return string
*/
protected function buildDropdownSelector($side, $options)
{
// use timestamp for current revision, date may be false when revisions < 2
[$rev1, $rev2] = [(int)$this->RevInfo1->val('date'), (int)$this->RevInfo2->val('date')];
$form = new Form(['action' => wl($this->id)]);
$form->setHiddenField('id', $this->id);
$form->setHiddenField('do', 'diff');
$form->setHiddenField('difftype', $this->preference['difftype']);
if ($side == 'older') {
// left side
$form->setHiddenField('rev2[1]', $rev2);
$input = $form->addDropdown('rev2[0]', $options)
->val($rev1)->addClass('quickselect');
$input->useInput(false);
} elseif ($side == 'newer') {
// right side
$form->setHiddenField('rev2[0]', $rev1);
$input = $form->addDropdown('rev2[1]', $options)
->val($rev2)->addClass('quickselect');
$input->useInput(false);
}
$form->addButton('do[diff]', 'Go')->attr('type', 'submit');
return $form->toHTML();
}
/**
* Create html link to a diff view defined by two revisions
*
* @param string $linktype
* @param int $rev1 older revision
* @param int $rev2 newer revision or null for diff with current revision
* @return string html of link to a diff view
*/
protected function diffViewlink($linktype, $rev1, $rev2 = null)
{
global $lang;
if ($rev1 === false) return '';
if ($rev2 === null) {
$urlparam = [
'do' => 'diff',
'rev' => $rev1,
'difftype' => $this->preference['difftype']
];
} else {
$urlparam = [
'do' => 'diff',
'rev2[0]' => $rev1,
'rev2[1]' => $rev2,
'difftype' => $this->preference['difftype']
];
}
$attr = [
'class' => $linktype,
'href' => wl($this->id, $urlparam, true, '&'),
'title' => $lang[$linktype]
];
return '<a ' . buildAttributes($attr) . '><span>' . $lang[$linktype] . '</span></a>';
}
/**
* Insert soft breaks in diff html
*
* @param string $diffhtml
* @return string
*/
public function insertSoftbreaks($diffhtml)
{
// search the diff html string for both:
// - html tags, so these can be ignored
// - long strings of characters without breaking characters
return preg_replace_callback('/<[^>]*>|[^<> ]{12,}/', function ($match) {
// if match is an html tag, return it intact
if ($match[0][0] == '<') return $match[0];
// its a long string without a breaking character,
// make certain characters into breaking characters by inserting a
// word break opportunity (<wbr> tag) in front of them.
$regex = <<< REGEX
(?(?= # start a conditional expression with a positive look ahead ...
&\#?\\w{1,6};) # ... for html entities - we don't want to split them (ok to catch some invalid combinations)
&\#?\\w{1,6}; # yes pattern - a quicker match for the html entity, since we know we have one
|
[?/,&\#;:] # no pattern - any other group of 'special' characters to insert a breaking character after
)+ # end conditional expression
REGEX;
return preg_replace('<' . $regex . '>xu', '\0<wbr>', $match[0]);
}, $diffhtml);
}
}
|