preference['fromAjax'] = false; // see doluwiki\Ajax::callMediadiff() $this->preference['showIntro'] = false; $this->preference['difftype'] = 'both'; // media diff view type: both, opacity or portions parent::__construct($id); } /** @inheritdoc */ protected function setChangeLog() { $this->changelog = new MediaChangeLog($this->id); } /** @inheritdoc */ protected function preProcess() { parent::preProcess(); if (!isset($this->oldRev, $this->newRev)) { // no revision was given, compare previous to current $changelog =& $this->changelog; $this->oldRev = $changelog->getRevisions(0, 1)[0]; $this->newRev = $changelog->currentRevision(); } } /** * Shows difference between two revisions of media * * @author Kate Arzamastseva */ public function show() { global $conf; $changelog =& $this->changelog; $ns = getNS($this->id); $auth = auth_quickaclcheck("$ns:*"); if ($auth < AUTH_READ || !$this->id || !$conf['mediarevisions']) return ''; // determine left and right revision if (!isset($this->oldRev, $this->newRev)) $this->preProcess(); // use timestamp and '' properly as $rev for the current file if ($changelog->isCurrentRevision($this->newRev)) { [$oldRev, $newRev] = [$this->oldRev, '']; } else { [$oldRev, $newRev] = [$this->oldRev, $this->newRev]; } $oldRevMeta = new JpegMeta(mediaFN($this->id, $oldRev)); $newRevMeta = new JpegMeta(mediaFN($this->id, $newRev)); $is_img = preg_match('/\.(jpe?g|gif|png)$/', $this->id); if ($is_img) { // get image width and height for the mediamanager preview panel $oldRevSize = media_image_preview_size($this->id, $oldRev, $oldRevMeta); $newRevSize = media_image_preview_size($this->id, $newRev, $newRevMeta); // re-check image, ensure minimum image width for showImageDiff() $is_img = ($oldRevSize && $newRevSize && ($oldRevSize[0] >= 30 || $newRevSize[0] >= 30)); } // determine requested diff view type if (!$is_img) { $this->preference['difftype'] = 'both'; } // display intro if ($this->preference['showIntro']) echo p_locale_xhtml('diff'); // print form to choose diff view type if ($is_img && !$this->preference['fromAjax']) { $this->showDiffViewSelector(); echo '
'; } switch ($this->preference['difftype']) { case 'opacity': case 'portions': $this->showImageDiff($oldRev, $newRev, $oldRevSize, $newRevSize); break; case 'both': default: $this->showFileDiff($oldRev, $newRev, $oldRevMeta, $newRevMeta, $auth); break; } if ($is_img && !$this->preference['fromAjax']) { echo '
'; } } /** * Print form to choose diff view type * the dropdown is to be added through JavaScript, see lib/scripts/media.js */ protected function showDiffViewSelector() { echo '
'; $form = new Form([ 'id' => 'mediamanager__form_diffview', 'action' => media_managerURL([], '&'), 'method' => 'get', 'class' => 'diffView', ]); $form->addTagOpen('div')->addClass('no'); $form->setHiddenField('sectok', null); $form->setHiddenField('mediado', 'diff'); $form->setHiddenField('rev2[0]', $this->oldRev); $form->setHiddenField('rev2[1]', $this->newRev); $form->addTagClose('div'); echo $form->toHTML(); echo '
'; // .diffoptions } /** * Prints two images side by side * and slider * * @author Kate Arzamastseva * * @param string|int $oldRev revision timestamp, or empty string * @param string|int $newRev revision timestamp, or empty string * @param array $oldRevSize array with width and height * @param array $newRevSize array with width and height * @param string $type diff view type: opacity or portions */ protected function showImageDiff($oldRev, $newRev, $oldRevSize, $newRevSize, $type = null) { if (!isset($type)) { $type = $this->preference['difftype']; } // adjust image width, right side (newer) has priority if ($oldRevSize != $newRevSize) { if ($newRevSize[0] > $oldRevSize[0]) { $oldRevSize = $newRevSize; } } $oldRevSrc = ml($this->id, ['rev' => $oldRev, 'h' => $oldRevSize[1], 'w' => $oldRevSize[0]]); $newRevSrc = ml($this->id, ['rev' => $newRev, 'h' => $oldRevSize[1], 'w' => $oldRevSize[0]]); // slider echo '
'; // two images in divs echo '
'; echo '
'; echo ''; echo '
'; echo '
'; echo ''; echo '
'; echo '
'; } /** * Shows difference between two revisions of media file * * @author Kate Arzamastseva * * @param string|int $oldRev revision timestamp, or empty string * @param string|int $newRev revision timestamp, or empty string * @param JpegMeta $oldRevMeta * @param JpegMeta $newRevMeta * @param int $auth permission level */ protected function showFileDiff($oldRev, $newRev, $oldRevMeta, $newRevMeta, $auth) { global $lang; // revison info of older file (left side) $oldRevInfo = $this->getExtendedRevisionInfo($oldRev); // revison info of newer file (right side) $newRevInfo = $this->getExtendedRevisionInfo($newRev); // display diff view table echo '
'; echo ''; echo ''; echo ''; echo ''; echo ''; echo ''; echo ''; echo ''; echo ''; echo ''; echo ''; echo ''; echo ''; $l_tags = media_file_tags($oldRevMeta); $r_tags = media_file_tags($newRevMeta); // FIXME r_tags-only stuff foreach ($l_tags as $key => $l_tag) { if ($l_tag['value'] != $r_tags[$key]['value']) { $r_tags[$key]['highlighted'] = true; $l_tags[$key]['highlighted'] = true; } elseif (!$l_tag['value'] || !$r_tags[$key]['value']) { unset($r_tags[$key]); unset($l_tags[$key]); } } echo ''; foreach (array($l_tags, $r_tags) as $tags) { echo ''; } echo ''; echo '
'. $this->revisionTitle($oldRevInfo) .''. $this->revisionTitle($newRevInfo) .'
'; media_preview($this->id, $auth, $oldRev, $oldRevMeta); // $auth not used in media_preview()? echo ''; media_preview($this->id, $auth, $newRev, $newRevMeta); echo '
'; media_preview_buttons($this->id, $auth, $oldRev); // $auth used in media_preview_buttons() echo ''; media_preview_buttons($this->id, $auth, $newRev); echo '
'; echo '
'; foreach ($tags as $tag) { $value = cleanText($tag['value']); if (!$value) $value = '-'; echo '
'.$lang[$tag['tag'][1]].'
'; echo '
'; if ($tag['highlighted']) echo ''; if ($tag['tag'][2] == 'date') { echo dformat($value); } else { echo hsc($value); } if ($tag['highlighted']) echo ''; echo '
'; } echo '
'; echo '
'; echo '
'; } /** * Revision Title for MediaDiff table headline * * @param array $info Revision info structure of a media file * @return string */ protected function revisionTitle(array $info) { global $lang, $INFO; if (isset($info['date'])) { $rev = $info['date']; $title = '' . dformat($rev).''; } else { $rev = false; $title = '—'; } if (isset($info['current']) || ($rev && $rev == $INFO['currentrev'])) { $title .= ' ('.$lang['current'].')'; } // append separator $title .= ($this->preference['difftype'] === 'inline') ? ' ' : '
'; // supplement if (isset($info['date'])) { $objRevInfo = (new MediaRevisions($this->id))->getObjRevInfo($info); $title .= $objRevInfo->editSummary().' '.$objRevInfo->editor(); } return $title; } }