manuelcillero/suitedesk
manuelcillero/suitedesk
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

New module 'Diff'

Browse source
This commit is contained in:
Manuel Cillero 2017-07-26 14:06:16 +02:00
parent 6f9ecbd39d
commit 99c4640f36
11 changed files with 2989 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1329
sites/all/modules/diff/DiffEngine.php Normal file
View file

File diff suppressed because it is too large Load diff

274
sites/all/modules/diff/LICENSE.txt Normal file
View file

@ -0,0 +1,274 @@
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc. 675 Mass Ave,
Cambridge, MA 02139, USA. Everyone is permitted to copy and distribute
verbatim copies of this license document, but changing it is not allowed.
Preamble
The licenses for most software are designed to take away your freedom to
share and change it. By contrast, the GNU General Public License is
intended to guarantee your freedom to share and change free software--to
make sure the software is free for all its users. This General Public License
applies to most of the Free Software Foundation's software and to any other
program whose authors commit to using it. (Some other Free Software
Foundation software is covered by the GNU Library General Public License
instead.) You can apply it to your programs, too.
When we speak of free software, we are referring to freedom, not price. Our
General Public Licenses are designed to make sure that you have the
freedom to distribute copies of free software (and charge for this service if
you wish), that you receive source code or can get it if you want it, that you
can change the software or use pieces of it in new free programs; and that
you know you can do these things.
To protect your rights, we need to make restrictions that forbid anyone to
deny you these rights or to ask you to surrender the rights. These restrictions
translate to certain responsibilities for you if you distribute copies of the
software, or if you modify it.
For example, if you distribute copies of such a program, whether gratis or for
a fee, you must give the recipients all the rights that you have. You must make
sure that they, too, receive or can get the source code. And you must show
them these terms so they know their rights.
We protect your rights with two steps: (1) copyright the software, and (2)
offer you this license which gives you legal permission to copy, distribute
and/or modify the software.
Also, for each author's protection and ours, we want to make certain that
everyone understands that there is no warranty for this free software. If the
software is modified by someone else and passed on, we want its recipients
to know that what they have is not the original, so that any problems
introduced by others will not reflect on the original authors' reputations.
Finally, any free program is threatened constantly by software patents. We
wish to avoid the danger that redistributors of a free program will individually
obtain patent licenses, in effect making the program proprietary. To prevent
this, we have made it clear that any patent must be licensed for everyone's
free use or not licensed at all.
The precise terms and conditions for copying, distribution and modification
follow.
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND
MODIFICATION
0. This License applies to any program or other work which contains a notice
placed by the copyright holder saying it may be distributed under the terms
of this General Public License. The "Program", below, refers to any such
program or work, and a "work based on the Program" means either the
Program or any derivative work under copyright law: that is to say, a work
containing the Program or a portion of it, either verbatim or with
modifications and/or translated into another language. (Hereinafter, translation
is included without limitation in the term "modification".) Each licensee is
addressed as "you".
Activities other than copying, distribution and modification are not covered
by this License; they are outside its scope. The act of running the Program is
not restricted, and the output from the Program is covered only if its contents
constitute a work based on the Program (independent of having been made
by running the Program). Whether that is true depends on what the Program
does.
1. You may copy and distribute verbatim copies of the Program's source
code as you receive it, in any medium, provided that you conspicuously and
appropriately publish on each copy an appropriate copyright notice and
disclaimer of warranty; keep intact all the notices that refer to this License
and to the absence of any warranty; and give any other recipients of the
Program a copy of this License along with the Program.
You may charge a fee for the physical act of transferring a copy, and you
may at your option offer warranty protection in exchange for a fee.
2. You may modify your copy or copies of the Program or any portion of it,
thus forming a work based on the Program, and copy and distribute such
modifications or work under the terms of Section 1 above, provided that you
also meet all of these conditions:
a) You must cause the modified files to carry prominent notices stating that
you changed the files and the date of any change.
b) You must cause any work that you distribute or publish, that in whole or in
part contains or is derived from the Program or any part thereof, to be
licensed as a whole at no charge to all third parties under the terms of this
License.
c) If the modified program normally reads commands interactively when run,
you must cause it, when started running for such interactive use in the most
ordinary way, to print or display an announcement including an appropriate
copyright notice and a notice that there is no warranty (or else, saying that
you provide a warranty) and that users may redistribute the program under
these conditions, and telling the user how to view a copy of this License.
(Exception: if the Program itself is interactive but does not normally print such
an announcement, your work based on the Program is not required to print
an announcement.)
These requirements apply to the modified work as a whole. If identifiable
sections of that work are not derived from the Program, and can be
reasonably considered independent and separate works in themselves, then
this License, and its terms, do not apply to those sections when you distribute
them as separate works. But when you distribute the same sections as part
of a whole which is a work based on the Program, the distribution of the
whole must be on the terms of this License, whose permissions for other
licensees extend to the entire whole, and thus to each and every part
regardless of who wrote it.
Thus, it is not the intent of this section to claim rights or contest your rights to
work written entirely by you; rather, the intent is to exercise the right to
control the distribution of derivative or collective works based on the
Program.
In addition, mere aggregation of another work not based on the Program
with the Program (or with a work based on the Program) on a volume of a
storage or distribution medium does not bring the other work under the scope
of this License.
3. You may copy and distribute the Program (or a work based on it, under
Section 2) in object code or executable form under the terms of Sections 1
and 2 above provided that you also do one of the following:
a) Accompany it with the complete corresponding machine-readable source
code, which must be distributed under the terms of Sections 1 and 2 above
on a medium customarily used for software interchange; or,
b) Accompany it with a written offer, valid for at least three years, to give
any third party, for a charge no more than your cost of physically performing
source distribution, a complete machine-readable copy of the corresponding
source code, to be distributed under the terms of Sections 1 and 2 above on
a medium customarily used for software interchange; or,
c) Accompany it with the information you received as to the offer to distribute
corresponding source code. (This alternative is allowed only for
noncommercial distribution and only if you received the program in object
code or executable form with such an offer, in accord with Subsection b
above.)
The source code for a work means the preferred form of the work for
making modifications to it. For an executable work, complete source code
means all the source code for all modules it contains, plus any associated
interface definition files, plus the scripts used to control compilation and
installation of the executable. However, as a special exception, the source
code distributed need not include anything that is normally distributed (in
either source or binary form) with the major components (compiler, kernel,
and so on) of the operating system on which the executable runs, unless that
component itself accompanies the executable.
If distribution of executable or object code is made by offering access to
copy from a designated place, then offering equivalent access to copy the
source code from the same place counts as distribution of the source code,
even though third parties are not compelled to copy the source along with the
object code.
4. You may not copy, modify, sublicense, or distribute the Program except as
expressly provided under this License. Any attempt otherwise to copy,
modify, sublicense or distribute the Program is void, and will automatically
terminate your rights under this License. However, parties who have received
copies, or rights, from you under this License will not have their licenses
terminated so long as such parties remain in full compliance.
5. You are not required to accept this License, since you have not signed it.
However, nothing else grants you permission to modify or distribute the
Program or its derivative works. These actions are prohibited by law if you
do not accept this License. Therefore, by modifying or distributing the
Program (or any work based on the Program), you indicate your acceptance
of this License to do so, and all its terms and conditions for copying,
distributing or modifying the Program or works based on it.
6. Each time you redistribute the Program (or any work based on the
Program), the recipient automatically receives a license from the original
licensor to copy, distribute or modify the Program subject to these terms and
conditions. You may not impose any further restrictions on the recipients'
exercise of the rights granted herein. You are not responsible for enforcing
compliance by third parties to this License.
7. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues), conditions
are imposed on you (whether by court order, agreement or otherwise) that
contradict the conditions of this License, they do not excuse you from the
conditions of this License. If you cannot distribute so as to satisfy
simultaneously your obligations under this License and any other pertinent
obligations, then as a consequence you may not distribute the Program at all.
For example, if a patent license would not permit royalty-free redistribution
of the Program by all those who receive copies directly or indirectly through
you, then the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Program.
If any portion of this section is held invalid or unenforceable under any
particular circumstance, the balance of the section is intended to apply and
the section as a whole is intended to apply in other circumstances.
It is not the purpose of this section to induce you to infringe any patents or
other property right claims or to contest validity of any such claims; this
section has the sole purpose of protecting the integrity of the free software
distribution system, which is implemented by public license practices. Many
people have made generous contributions to the wide range of software
distributed through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing to
distribute software through any other system and a licensee cannot impose
that choice.
This section is intended to make thoroughly clear what is believed to be a
consequence of the rest of this License.
8. If the distribution and/or use of the Program is restricted in certain
countries either by patents or by copyrighted interfaces, the original copyright
holder who places the Program under this License may add an explicit
geographical distribution limitation excluding those countries, so that
distribution is permitted only in or among countries not thus excluded. In such
case, this License incorporates the limitation as if written in the body of this
License.
9. The Free Software Foundation may publish revised and/or new versions
of the General Public License from time to time. Such new versions will be
similar in spirit to the present version, but may differ in detail to address new
problems or concerns.
Each version is given a distinguishing version number. If the Program specifies
a version number of this License which applies to it and "any later version",
you have the option of following the terms and conditions either of that
version or of any later version published by the Free Software Foundation. If
the Program does not specify a version number of this License, you may
choose any version ever published by the Free Software Foundation.
10. If you wish to incorporate parts of the Program into other free programs
whose distribution conditions are different, write to the author to ask for
permission. For software which is copyrighted by the Free Software
Foundation, write to the Free Software Foundation; we sometimes make
exceptions for this. Our decision will be guided by the two goals of
preserving the free status of all derivatives of our free software and of
promoting the sharing and reuse of software generally.
NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE,
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT
PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE
STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
NECESSARY SERVICING, REPAIR OR CORRECTION.
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR
AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR
ANY OTHER PARTY WHO MAY MODIFY AND/OR
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE
LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL,
SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
ARISING OUT OF THE USE OR INABILITY TO USE THE
PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA
OR DATA BEING RENDERED INACCURATE OR LOSSES
SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE
PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN
IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF
THE POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS

86
sites/all/modules/diff/diff.css Normal file
View file

@ -0,0 +1,86 @@
html.js .diff-js-hidden { display:none; }
/**
* Inline diff metadata
*/
.diff-inline-metadata {
padding:4px;
border:1px solid #ddd;
background:#fff;
margin:0px 0px 10px;
}
.diff-inline-legend { font-size:11px; }
.diff-inline-legend span,
.diff-inline-legend label { margin-right:5px; }
/**
* Inline diff markup
*/
span.diff-deleted { color:#ccc; }
span.diff-deleted img { border: solid 2px #ccc; }
span.diff-changed { background:#ffb; }
span.diff-changed img { border:solid 2px #ffb; }
span.diff-added { background:#cfc; }
span.diff-added img { border: solid 2px #cfc; }
/**
* Traditional split diff theming
*/
table.diff {
border-spacing: 4px;
margin-bottom: 20px;
table-layout: fixed;
width: 100%;
}
table.diff tr.even, table.diff tr.odd {
background-color: inherit;
border: none;
}
td.diff-prevlink {
text-align: left;
}
td.diff-nextlink {
text-align: right;
}
td.diff-section-title, div.diff-section-title {
background-color: #f0f0ff;
font-size: 0.83em;
font-weight: bold;
padding: 0.1em 1em;
}
td.diff-deletedline {
background-color: #ffa;
width: 50%;
}
td.diff-addedline {
background-color: #afa;
width: 50%;
}
td.diff-context {
background-color: #fafafa;
}
span.diffchange {
color: #f00;
font-weight: bold;
}
table.diff col.diff-marker {
width: 1.4em;
}
table.diff col.diff-content {
width: 50%;
}
table.diff th {
padding-right: inherit;
}
table.diff td div {
overflow: auto;
padding: 0.1ex 0.5em;
word-wrap: break-word;
}
table.diff td {
padding: 0.1ex 0.4em;
}

10
sites/all/modules/diff/diff.info Normal file
View file

@ -0,0 +1,10 @@
name = Diff
description = Show difference between node revisions.
core = 6.x
; Information added by drupal.org packaging script on 2011-08-07
version = "6.x-2.3"
core = "6.x"
project = "diff"
datestamp = "1312697033"

329
sites/all/modules/diff/diff.module Normal file
View file

@ -0,0 +1,329 @@
<?php
/**
* @file
* Provides functionality to show a diff between two node revisions.
*/
/**
* Number of items on one page of the revision list.
*/
define('REVISION_LIST_SIZE', 50);
/**
* Implementation of hook_help().
*/
function diff_help($path, $arg) {
switch ($path) {
case 'admin/help#diff':
$output = '<p>'. t('The diff module overwrites the normal revisions view. The revisions table is enhanced with a possibility to view the difference between two node revisions. Users with the %view_revisions permission will also be able to view the changes between any two selected revisions. You may disable this for individual content types on the content type configuration page. This module also provides a nifty %preview_changes button while editing a post.', array('%preview_changes' => t('View changes'), '%view_revisions' => t('view revisions'))) .'</p>';
return $output;
case 'node/%/revisions/%/view':
// the following string is copied from string copied from node_help('node/%/revisions')
return '<p>'. t('The revisions let you track differences between multiple versions of a post.') .'</p>';
case 'node/%/revisions/view/%/%':
return '<p>'. t('Comparing two revisions:') .'</p>';
}
}
/**
* Implementation of hook_menu().
*/
function diff_menu() {
$items = array();
/**
* By using MENU_LOCAL_TASK (and 'tab_parent') we can get the various revision-views to
* show the View|Edit|Revision-tabs of the node on top, and have the Revisions-tab open.
* To avoid creating/showing any extra tabs or sub-tabs (tasks below top level) for the
* various paths (i.e. "Diff", "Show latest" and "Show a specific revision") that need
* a revision-id (vid) parameter, we make sure to set 'tab_parent' a bit odd.
* This solution may not be the prettiest one, but by avoiding having two _LOCAL_TASKs
* sharing a parent that can be accessed by its full path, it seems to work as desired.
* Breadcrumbs work decently, at least the node link is among the crumbs. For some reason
* any breadcrumbs "before/above" the node is only seen at 'node/%node/revisions/%/view'.
*/
$items['node/%node/revisions/list'] = array(
// Not used directly, but was created to get the other menu items to work well
'title' => 'List revisions',
'page callback' => 'diff_diffs_overview',
'type' => MENU_DEFAULT_LOCAL_TASK,
'access callback' => 'diff_node_revision_access',
'access arguments' => array(1),
'file' => 'diff.pages.inc',
);
$items['node/%node/revisions/view/%/%'] = array(
'title' => 'Diff',
'page callback' => 'diff_diffs_show',
'page arguments' => array(1, 4, 5),
'type' => MENU_LOCAL_TASK,
'access callback' => 'diff_node_revision_access',
'access arguments' => array(1),
'tab_parent' => 'node/%/revisions/list',
'file' => 'diff.pages.inc',
);
$items['node/%node/revisions/view/latest'] = array(
'title' => 'Show latest diff',
'page callback' => 'diff_latest',
'page arguments' => array(1),
'type' => MENU_LOCAL_TASK,
'access callback' => '_node_revision_access',
'access arguments' => array(1),
'tab_parent' => 'node/%/revisions/view',
'file' => 'diff.pages.inc',
);
$items['node/%node/revisions/diff-inline'] = array(
'page callback' => 'diff_inline_ahah',
'page arguments' => array(1),
'type' => MENU_CALLBACK,
'access callback' => 'diff_node_revision_access',
'access arguments' => array(1),
'file' => 'diff.pages.inc',
);
return $items;
}
/**
* Implementation of hook_menu_alter().
*/
function diff_menu_alter(&$callbacks) {
// Overwrite the default 'Revisions' page
$callbacks['node/%node/revisions']['page callback'] = 'diff_diffs_overview';
$callbacks['node/%node/revisions']['module'] = 'diff';
$callbacks['node/%node/revisions']['file'] = 'diff.pages.inc';
$callbacks['node/%node/revisions/%/view']['tab_parent'] = 'node/%/revisions/list';
$callbacks['node/%node/revisions/%/revert']['tab_parent'] = 'node/%/revisions/%/view';
$callbacks['node/%node/revisions/%/delete']['tab_parent'] = 'node/%/revisions/%/view';
return;
}
/**
* Access callback for the node revisions page.
*/
function diff_node_revision_access($node, $op = 'view') {
$may_revision_this_type = variable_get('enable_revisions_page_'. $node->type, TRUE) || user_access('administer nodes');
return $may_revision_this_type && _node_revision_access($node, $op);
}
/**
* Implementation of hook_block().
*/
function diff_block($op = 'list', $delta = 0, $edit = array()) {
if ($op === 'list') {
return array('inline' => array('info' => t('Inline diff')));
}
elseif ($op === 'view' && $delta === 'inline' && user_access('view revisions') && $node = menu_get_object()) {
$block = array();
$revisions = node_revision_list($node);
if (count($revisions) > 1) {
$block['subject'] = t('Highlight changes');
$block['content'] = drupal_get_form('diff_inline_form', $node, $revisions);
}
return $block;
}
}
/**
* Implementation of hook_nodeapi().
*/
function diff_nodeapi(&$node, $op, $teaser, $page) {
if ($page && $op == 'view' && user_access('view revisions') && variable_get('show_diff_inline_'. $node->type, FALSE)) {
// Ugly but cheap way to check that we are viewing a node's revision page.
if (arg(2) === 'revisions' && arg(3) === $node->vid) {
module_load_include('inc', 'diff', 'diff.pages');
$node->content = array('#value' => diff_inline_show($node, $node->vid));
}
$node->content['#prefix'] = isset($node->content['#prefix']) ? "<div id='diff-inline-{$node->nid}'>" . $node->content['#prefix'] : "<div id='diff-inline-{$node->nid}'>";
$node->content['#suffix'] = isset($node->content['#suffix']) ? $node->content['#suffix'] . "</div>" : "</div>";
}
}
/**
* Implementation of hook_form_alter().
*/
function diff_form_alter(&$form, $form_state, $form_id) {
if (isset($form['type']['#value']) && $form['type']['#value'] .'_node_form' == $form_id) {
// Add a 'View changes' button on the node edit form.
if (variable_get('show_preview_changes_'. $form['type']['#value'], TRUE) && $form['nid']['#value'] > 0) {
$form['buttons']['preview_changes'] = array(
'#type' => 'submit',
'#value' => t('View changes'),
'#weight' => 12,
'#submit' => array('diff_node_form_build_preview_changes')
);
}
}
elseif ($form_id == 'node_type_form' && isset($form['identity']['type'])) {
// Node type edit form.
// Add checkbox to activate 'View changes' button per node type.
$form['workflow']['diff'] = array(
'#title' => t('Diff'),
'#type' => 'item',
'#tree' => FALSE,
);
$form['workflow']['diff']['show_preview_changes'] = array(
'#type' => 'checkbox',
'#title' => t('Show %preview_changes button on node edit form', array('%preview_changes' => t('View changes'))),
'#weight' => 10,
'#default_value' => variable_get('show_preview_changes_'. $form['#node_type']->type, TRUE),
);
$form['workflow']['diff']['show_diff_inline'] = array(
'#type' => 'checkbox',
'#title' => t('Show diffs inline for this content type'),
'#description' => t("You must enable the 'Inline diff' block to use this feature"),
'#weight' => 10,
'#default_value' => variable_get('show_diff_inline_'. $form['#node_type']->type, FALSE),
);
$form['workflow']['diff']['enable_revisions_page'] = array(
'#type' => 'checkbox',
'#title' => t('Enable the %revisions page for this content type', array('%revisions' => t('Revisions'))),
'#weight' => 11,
'#default_value' => variable_get('enable_revisions_page_'. $form['#node_type']->type, TRUE),
);
}
}
/**
* Callback if 'View changes' is pressed.
*/
function diff_node_form_build_preview_changes($form, &$form_state) {
module_load_include('inc', 'diff', 'diff.pages');
$node = node_form_submit_build_node($form, $form_state);
// Create diff of old node and edited node
$rows = _diff_body_rows(node_load($form_state['values']['nid']), $node);
$cols = _diff_default_cols();
$header = _diff_default_header();
$changes = theme('diff_table', $header, $rows, array('class' => 'diff'), NULL, $cols);
// Prepend diff to edit form
$form_state['node_preview'] = isset($form_state['node_preview']) ? $changes . $form_state['node_preview'] : $changes;
}
/**
* Implementation of hook_theme().
*/
function diff_theme() {
return array(
'diff_node_revisions' => array(
'arguments' => array('form' => NULL),
'file' => 'diff.theme.inc',
),
'diff_table' => array(
'arguments' => array('header' => NULL, 'rows' => NULL, 'attributes' => array(), 'caption' => NULL, 'cols' => array()),
'file' => 'diff.theme.inc',
),
'diff_header_line' => array(
'arguments' => array('lineno' => NULL),
'file' => 'diff.theme.inc',
),
'diff_content_line' => array(
'arguments' => array('line' => NULL),
'file' => 'diff.theme.inc',
),
'diff_empty_line' => array(
'arguments' => array('line' => NULL),
'file' => 'diff.theme.inc',
),
'diff_inline_form' => array(
'arguments' => array('form' => array()),
'file' => 'diff.theme.inc',
),
'diff_inline_metadata' => array(
'arguments' => array('node' => NULL),
'file' => 'diff.theme.inc',
),
'diff_inline_chunk' => array(
'arguments' => array('text' => '', 'type' => NULL),
'file' => 'diff.theme.inc',
),
);
}
/**
* Render a diff of two strings to a $rows array suitable for use with
* theme('table') or theme('diff_table').
*
* @param string $a
* The source string to compare from.
* @param string $b
* The target string to compare to.
* @param boolean $show_header
* Display diff context headers, e.g. "Line x".
* @return
* Array of rows usable with theme('table').
*/
function diff_get_rows($a, $b, $show_header = FALSE) {
$a = is_array($a) ? $a : explode("\n", $a);
$b = is_array($b) ? $b : explode("\n", $b);
module_load_include('php', 'diff', 'DiffEngine');
$formatter = new DrupalDiffFormatter();
$formatter->show_header = $show_header;
$diff = new Diff($a, $b);
return $formatter->format($diff);
}
/**
* Render a diff of two strings into HTML markup indicating additions, changes
* and deletions.
*
* @param string $a
* The source string to compare from.
* @param string $b
* The target string to compare to.
* @return
* String containing HTML markup.
*/
function diff_get_inline($a, $b) {
module_load_include('php', 'diff', 'DiffEngine');
$diff = new DrupalDiffInline($a, $b);
return $diff->render();
}
/**
* Form builder: Inline diff controls.
*/
function diff_inline_form($form_state, $node, $revisions) {
$form = array();
$form['node'] = array(
'#type' => 'value',
'#value' => $node
);
$form['revision'] = array(
'#type' => 'select',
'#options' => array(0 => '< '. t('No highlighting') . ' >'),
'#default_value' => (arg(2) === 'revisions' && arg(3) === $node->vid) ? $node->vid : 0,
'#ahah' => array(
'path' => "node/{$node->nid}/revisions/diff-inline",
'wrapper' => "diff-inline-{$node->nid}",
'method' => 'replace',
),
);
foreach ($revisions as $revision) {
$form['revision']['#options'][$revision->vid] = t('@revision by @name', array(
'@revision' => format_date($revision->timestamp, 'small'),
'@name' => $revision->name,
));
}
$form['submit'] = array(
'#type' => 'submit',
'#value' => t('View'),
'#submit' => array('diff_inline_form_submit'),
'#attributes' => array('class' => 'diff-js-hidden'),
);
return $form;
}
/**
* Form submission handler for diff_inline_form() for JS-disabled clients.
*/
function diff_inline_form_submit(&$form, &$form_state) {
if (isset($form_state['values']['revision'], $form_state['values']['node'])) {
$node = $form_state['values']['node'];
$vid = $form_state['values']['revision'];
$form_state['redirect'] = "node/{$node->nid}/revisions/{$vid}/view";
}
}

458
sites/all/modules/diff/diff.pages.inc Normal file
View file

@ -0,0 +1,458 @@
<?php
/**
* @file
* Menu callbacks for hook_menu().
*/
/**
* Menu callback - show latest diff for a given node.
*/
function diff_latest($node) {
$revisions = node_revision_list($node);
$new = array_shift($revisions);
$old = array_shift($revisions);
drupal_goto("node/{$node->nid}/revisions/view/{$old->vid}/{$new->vid}");
}
/**
* Generate an overview table of older revisions of a node and provide
* an input form to select two revisions for a comparison.
*/
function diff_diffs_overview($node) {
drupal_set_title(t('Revisions for %title', array('%title' => $node->title)));
return drupal_get_form('diff_node_revisions', $node);
}
/**
* Input form to select two revisions.
*
* @param $node
* Node whose revisions are displayed for selection.
*/
function diff_node_revisions($form_state, $node) {
global $form_values;
$form = array();
$form['nid'] = array(
'#type' => 'hidden',
'#value' => $node->nid,
);
$revision_list = node_revision_list($node);
if (count($revision_list) > REVISION_LIST_SIZE) {
// If the list of revisions is longer than the number shown on one page split the array.
$page = isset($_GET['page']) ? $_GET['page'] : '0';
$revision_chunks = array_chunk(node_revision_list($node), REVISION_LIST_SIZE);
$revisions = $revision_chunks[$page];
// Set up global pager variables as would 'pager_query' do.
// These variables are then used in the theme('pager') call later.
global $pager_page_array, $pager_total, $pager_total_items;
$pager_total_items[0] = count($revision_list);
$pager_total[0] = ceil(count($revision_list) / REVISION_LIST_SIZE);
$pager_page_array[0] = max(0, min($page, ((int)$pager_total[0]) - 1));
}
else {
$revisions = $revision_list;
}
$revert_permission = FALSE;
if ((user_access('revert revisions') || user_access('administer nodes')) && node_access('update', $node)) {
$revert_permission = TRUE;
}
$delete_permission = FALSE;
if ((user_access('delete revisions') || user_access('administer nodes')) && node_access('delete', $node)) {
$delete_permission = TRUE;
}
foreach ($revisions as $revision) {
$operations = array();
$revision_ids[$revision->vid] = '';
if ($revision->current_vid > 0) {
$form['info'][$revision->vid] = array(
'#value' => t('!date by !username', array(
'!date' => l(format_date($revision->timestamp, 'small'), "node/$node->nid"),
'!username' => theme('username', $revision)))
. (($revision->log != '') ? '<p class="revision-log">'. filter_xss($revision->log) .'</p>' : ''),
);
}
else {
$form['info'][$revision->vid] = array(
'#value' => t('!date by !username', array(
'!date' => l(format_date($revision->timestamp, 'small'), "node/$node->nid/revisions/$revision->vid/view"),
'!username' => theme('username', $revision)))
. (($revision->log != '') ? '<p class="revision-log">'. filter_xss($revision->log) .'</p>' : '')
);
if ($revert_permission) {
$operations[] = array('#value' => l(t('revert'), "node/$node->nid/revisions/$revision->vid/revert"));
}
if ($delete_permission) {
$operations[] = array('#value' => l(t('delete'), "node/$node->nid/revisions/$revision->vid/delete"));
}
// Set a dummy, even if the user has no permission for the other
// operations, so that we can check if the operations array is
// empty to know if the row denotes the current revision.
$operations[] = array();
}
$form['operations'][$revision->vid] = $operations;
}
$new_vid = key($revision_ids);
next($revision_ids);
$old_vid = key($revision_ids);
$form['diff']['old'] = array(
'#type' => 'radios',
'#options' => $revision_ids,
'#default_value' => $old_vid
);
$form['diff']['new'] = array(
'#type' => 'radios',
'#options' => $revision_ids,
'#default_value' => $new_vid
);
$form['submit'] = array('#type' => 'submit', '#value' => t('Show diff'));
if (count($revision_list) > REVISION_LIST_SIZE) {
$form['#suffix'] = theme('pager', NULL, REVISION_LIST_SIZE, 0);
}
return $form;
}
/**
* Submit code for input form to select two revisions.
*/
function diff_node_revisions_submit($form, &$form_state) {
// the ids are ordered so the old revision is always on the left
$old_vid = min($form_state['values']['old'], $form_state['values']['new']);
$new_vid = max($form_state['values']['old'], $form_state['values']['new']);
$form_state['redirect'] = 'node/'. $form_state['values']['nid'] .'/revisions/view/'. $old_vid .'/'. $new_vid;
}
/**
* Validation for input form to select two revisions.
*/
function diff_node_revisions_validate($form, &$form_state) {
$old_vid = $form_state['values']['old'];
$new_vid = $form_state['values']['new'];
if ($old_vid==$new_vid || !$old_vid || !$new_vid) {
form_set_error('diff', t('Select different revisions to compare.'));
}
}
/**
* Create output string for a comparison of 'node' between
* versions 'old_vid' and 'new_vid'.
*
* @param $node
* Node on which to perform comparison
* @param $old_vid
* Version ID of the old revision.
* @param $new_vid
* Version ID of the new revision.
*/
function diff_diffs_show($node, $old_vid, $new_vid) {
// Set same title as on the 'Revisions' tab for consistency
drupal_set_title(t('Revisions for %title', array('%title' => $node->title)));
$node_revisions = node_revision_list($node);
$old_node = node_load($node->nid, $old_vid);
$new_node = node_load($node->nid, $new_vid);
// Generate table header (date, username, logmessage).
$old_header = t('!date by !username', array(
'!date' => l(format_date($old_node->revision_timestamp), "node/$node->nid/revisions/$old_node->vid/view"),
'!username' => theme('username', $node_revisions[$old_vid]),
));
$new_header = t('!date by !username', array(
'!date' => l(format_date($new_node->revision_timestamp), "node/$node->nid/revisions/$new_node->vid/view"),
'!username' => theme('username', $node_revisions[$new_vid]),
));
$old_log = $old_node->log != '' ? '<p class="revision-log">'. filter_xss($old_node->log) .'</p>' : '';
$new_log = $new_node->log != '' ? '<p class="revision-log">'. filter_xss($new_node->log) .'</p>' : '';
// Generate previous diff/next diff links.
$next_vid = _diff_get_next_vid($node_revisions, $new_vid);
if ($next_vid) {
$next_link = l(t('next diff >'), 'node/'. $node->nid .'/revisions/view/'. $new_vid .'/'. $next_vid);
}
else {
$next_link = '';
}
$prev_vid = _diff_get_previous_vid($node_revisions, $old_vid);
if ($prev_vid) {
$prev_link = l(t('< previous diff'), 'node/'. $node->nid .'/revisions/view/'. $prev_vid .'/'. $old_vid);
}
else {
$prev_link = '';
}
$cols = _diff_default_cols();
$header = _diff_default_header($old_header, $new_header);
$rows = array();
if ($old_log || $new_log) {
$rows[] = array(
array(
'data' => $old_log,
'colspan' => 2
),
array(
'data' => $new_log,
'colspan' => 2
)
);
}
$rows[] = array(
array(
'data' => $prev_link,
'class' => 'diff-prevlink',
'colspan' => 2
),
array(
'data' => $next_link,
'class' => 'diff-nextlink',
'colspan' => 2
)
);
$rows = array_merge($rows, _diff_body_rows($old_node, $new_node));
$output = theme('diff_table', $header, $rows, array('class' => 'diff'), NULL, $cols);
if ($node->vid == $new_vid) {
$output .= '<div class="diff-section-title">'. t('Current revision:') .'</div>';
}
else {
$output .= '<div class="diff-section-title">'. t('Revision of !new_date:', array('!new_date' => format_date($new_node->revision_timestamp))) .'</div>';
}
// Don't include node links (final argument) when viewing the diff.
$output .= node_view($new_node, FALSE, FALSE, FALSE);
return $output;
}
/**
* Creates an array of rows which represent a diff between $old_node and $new_node.
* The rows can be used via theme('diff_table') to be displayed.
*
* @param $old_node
* Node for comparison which will be displayed on the left side.
* @param $new_node
* Node for comparison which will be displayed on the right side.
*/
function _diff_body_rows($old_node, $new_node) {
drupal_add_css(drupal_get_path('module', 'diff') .'/diff.css', 'module', 'all', FALSE);
module_load_include('inc', 'diff', 'includes/node');
if (module_exists('taxonomy')) {
module_load_include('inc', 'diff', 'includes/taxonomy');
}
if (module_exists('upload')) {
module_load_include('inc', 'diff', 'includes/upload');
}
$rows = array();
$any_visible_change = FALSE;
// @todo quick workaround for PHP >= 5.3.0 date_diff() conflict.
$node_diffs = _diff_module_invoke_all($old_node, $new_node);
// We start off assuming all form elements are in the correct order.
$node_diffs['#sorted'] = TRUE;
// Recurse through all child elements.
$count = 0;
foreach (element_children($node_diffs) as $key) {
// Assign a decimal placeholder weight to preserve original array order.
if (!isset($node_diffs[$key]['#weight'])) {
$node_diffs[$key]['#weight'] = $count/1000;
}
else {
// If one of the child elements has a weight then we will need to sort
// later.
unset($node_diffs['#sorted']);
}
$count++;
}
// One of the children has a #weight.
if (!isset($node_diffs['#sorted'])) {
uasort($node_diffs, "element_sort");
}
// Render diffs for each.
foreach ($node_diffs as $node_diff) {
$show_header = isset($node_diff['#format']['show_header']) ? $node_diff['#format']['show_header'] : FALSE;
if ($node_diff_rows = diff_get_rows($node_diff['#old'], $node_diff['#new'], $show_header)) {
$rows[] = array(array(
'data' => t('Changes to %name', array('%name' => $node_diff['#name'])),
'class' => 'diff-section-title',
'colspan' => 4
));
$rows = array_merge($rows, $node_diff_rows);
$any_visible_change = TRUE;
}
}
if (!$any_visible_change) {
$rows[] = array(array(
'data' => t('No visible changes'),
'class' => 'diff-section-title',
'colspan' => 4
));
// Needed to keep safari happy
$rows[] = array(
array('data' => ''),
array('data' => ''),
array('data' => ''),
array('data' => ''),
);
}
return $rows;
}
/**
* Helper function to invoke hook_diff in all enabled modules that implement it.
*
* Don't use module_invoke_all() since if date.module is enabled will clash with
* PHP 5.3's date_diff() function.
*
* @todo figure out any else possible solution but not workaround.
* @link http://drupal.org/node/639320
* @see module_invoke_all()
*/
function _diff_module_invoke_all($old_node, $new_node) {
$return = array();
foreach (module_implements('diff') as $module) {
if ($module == 'date') {
continue; // Avoid function name collision with date_diff().
}
$result = module_invoke($module, 'diff', $old_node, $new_node);
if (isset($result) && is_array($result)) {
$return = array_merge_recursive($return, $result);
}
elseif (isset($result)) {
$return[] = $result;
}
}
return $return;
}
/**
* Get the entry in the revisions list after $vid.
* Returns FALSE if $vid is the last entry.
*
* @param $node_revisions
* Array of node revision IDs in descending order.
* @param $vid
* Version ID to look for.
*/
function _diff_get_next_vid($node_revisions, $vid) {
$previous = NULL;
foreach ($node_revisions as $revision) {
if ($revision->vid == $vid) {
return ($previous ? $previous->vid : FALSE);
}
$previous = $revision;
}
return FALSE;
}
/**
* Get the entry in the revision list before $vid.
* Returns FALSE if $vid is the first entry.
*
* @param $node_revisions
* Array of node revision IDs in descending order.
* @param $vid
* Version ID to look for.
*/
function _diff_get_previous_vid($node_revisions, $vid) {
$previous = NULL;
foreach ($node_revisions as $revision) {
if ($previous && $previous->vid == $vid) {
return $revision->vid;
}
$previous = $revision;
}
return FALSE;
}
/**
* Helper function to create default 'cols' array for diff table.
*/
function _diff_default_cols() {
return array(
array(
array(
'class' => 'diff-marker',
),
array(
'class' => 'diff-content',
),
array(
'class' => 'diff-marker',
),
array(
'class' => 'diff-content',
),
),
);
}
/**
* Helper function to create default 'header' array for diff table.
*/
function _diff_default_header($old_header = '', $new_header = '') {
return array(
array(
'data' => $old_header,
'colspan' => 2
),
array(
'data' => $new_header,
'colspan' => 2
)
);
}
/**
* AHAH callback for rendering the inline diff of a node.
*/
function diff_inline_ahah($node) {
$form_state = array('values' => $_POST);
if ($form = form_get_cache($form_state['values']['form_build_id'], $form_state)) {
if (!empty($form_state['values']['revision']) && is_numeric($form_state['values']['revision'])) {
$vid = $form_state['values']['revision'];
}
else {
$vid = 0;
}
drupal_json(array('status' => TRUE, 'data' => diff_inline_show($node, $vid)));
exit;
}
drupal_json(array('status' => FALSE, 'data' => ''));
exit;
}
/**
* Show the inline diff for a given node, vid. If vid = 0 or no previous vid
* exists for the given revision returns the normally rendered content of the
* specified revision.
*/
function diff_inline_show($node, $vid = 0, $metadata = TRUE) {
$new_node = $vid ? node_load($node->nid, $vid, TRUE) : drupal_clone($node);
$new = node_build_content($new_node);
$new = drupal_render($new->content);
$old = $vid ? _diff_get_previous_vid(node_revision_list($node), $vid) : 0;
if ($old) {
$old = node_build_content(node_load($node->nid, $old, TRUE));
$old = drupal_render($old->content);
$output = $metadata ? theme('diff_inline_metadata', $new_node) : '';
$output .= diff_get_inline($old, $new);
return $output;
}
return $new;
}

317
sites/all/modules/diff/diff.theme.inc Normal file
View file

@ -0,0 +1,317 @@
<?php
/**
* @file
* Themeable function callbacks for diff.module.
*/
/**
* Theme function to display the revisions formular with means to select
* two revisions.
*/
function theme_diff_node_revisions($form) {
$output = '';
// Overview table:
$header = array(
t('Revision'),
array('data' => drupal_render($form['submit']), 'colspan' => 2),
array('data' => t('Operations'), 'colspan' => 2)
);
if (isset($form['info']) && is_array($form['info'])) {
foreach (element_children($form['info']) as $key) {
$row = array();
if (isset($form['operations'][$key][0])) {
// Note: even if the commands for revert and delete are not permitted,
// the array is not empty since we set a dummy in this case.
$row[] = drupal_render($form['info'][$key]);
$row[] = drupal_render($form['diff']['old'][$key]);
$row[] = drupal_render($form['diff']['new'][$key]);
$row[] = drupal_render($form['operations'][$key][0]);
$row[] = drupal_render($form['operations'][$key][1]);
$rows[] = $row;
}
else {
// its the current revision (no commands to revert or delete)
$row[] = array('data' => drupal_render($form['info'][$key]), 'class' => 'revision-current');
$row[] = array('data' => drupal_render($form['diff']['old'][$key]), 'class' => 'revision-current');
$row[] = array('data' => drupal_render($form['diff']['new'][$key]), 'class' => 'revision-current');
$row[] = array('data' => theme('placeholder', t('current revision')), 'class' => 'revision-current', 'colspan' => '2');
$rows[] = array(
'data' => $row,
'class' => 'error',
);
}
}
}
$output .= theme('table', $header, $rows);
$output .= drupal_render($form);
return $output;
}
/**
* Theme functions
*/
/**
* Return a themed table. This is a modified version of theme_table, adding
* colgroup tag and col tag options.
*
* @param $header
* An array containing the table headers. Each element of the array can be
* either a localized string or an associative array with the following keys:
* - "data": The localized title of the table column.
* - "field": The database field represented in the table column (required if
* user is to be able to sort on this column).
* - "sort": A default sort order for this column ("asc" or "desc").
* - Any HTML attributes, such as "colspan", to apply to the column header cell.
* @param $rows
* An array of table rows. Every row is an array of cells, or an associative
* array with the following keys:
* - "data": an array of cells
* - Any HTML attributes, such as "class", to apply to the table row.
*
* Each cell can be either a string or an associative array with the following keys:
* - "data": The string to display in the table cell.
* - "header": Indicates this cell is a header.
* - Any HTML attributes, such as "colspan", to apply to the table cell.
*
* Here's an example for $rows:
* @verbatim
* $rows = array(
* // Simple row
* array(
* 'Cell 1', 'Cell 2', 'Cell 3'
* ),
* // Row with attributes on the row and some of its cells.
* array(
* 'data' => array('Cell 1', array('data' => 'Cell 2', 'colspan' => 2)), 'class' => 'funky'
* )
* );
* @endverbatim
*
* @param $attributes
* An array of HTML attributes to apply to the table tag.
* @param $caption
* A localized string to use for the <caption> tag.
* @param $cols
* An array of table colum groups. Every column group is an array of columns,
* or an associative array with the following keys:
* - "data": an array of cells
* - Any HTML attributes, such as "class", to apply to the table column group.
*
* Each column can be either an empty array or associative array with the following keys:
* - Any HTML attributes, such as "class", to apply to the table column group.
*
* Here's an example for $cols:
* @verbatim
* $cols = array(
* // Simple colgroup.
* array(),
* // Simple colgroup with attributes.
* array(
* 'data' => array(), 'colspan' => 2, 'style' => 'color: green;',
* ),
* // Simple colgroup with one col.
* array(
* array(),
* ),
* // Colgroup with attributes on the colgroup and some of its cols.
* array(
* 'data' => array(array('class' => 'diff-marker'), array('colspan' => 2)), 'class' => 'funky',
* ),
* );
* @endverbatim
*
* The HTML will look as follows:
* @verbatim
* <table>
* <!-- Simple colgroup. -->
* <colgroup />
*
* <!-- Simple colgroup with attributes. -->
* <colgroup colspan="2" style="color: green;" />
*
* <!-- Simple colgroup with one col. -->
* <colgroup>
* <col />
* </colgroup>
*
* <!-- Colgroup with attributes on the colgroup and some of its cols. -->
* <colgroup class="funky">
* <col class="diff-marker" />
* <col colspan="2" />
* </colgroup>
* ...
* </table>
* @endverbatim
*
* @return
* An HTML string representing the table.
*/
function theme_diff_table($header, $rows, $attributes = array(), $caption = NULL, $cols = array()) {
$output = '<table'. drupal_attributes($attributes) .">\n";
if (isset($caption)) {
$output .= '<caption>'. $caption ."</caption>\n";
}
// Format the table columns:
if (count($cols)) {
foreach ($cols as $number => $col) {
$attributes = array();
// Check if we're dealing with a simple or complex column
if (isset($col['data'])) {
foreach ($col as $key => $value) {
if ($key == 'data') {
$cells = $value;
}
else {
$attributes[$key] = $value;
}
}
}
else {
$cells = $col;
}
// Build colgroup
if (is_array($cells) && count($cells)) {
$output .= ' <colgroup'. drupal_attributes($attributes) .'>';
$i = 0;
foreach ($cells as $cell) {
$output .= ' <col'. drupal_attributes($cell) .' />';
}
$output .= " </colgroup>\n";
}
else {
$output .= ' <colgroup'. drupal_attributes($attributes) ." />\n";
}
}
}
// Format the table header:
if (count($header)) {
$ts = tablesort_init($header);
$output .= ' <thead><tr>';
foreach ($header as $cell) {
$cell = tablesort_header($cell, $header, $ts);
$output .= _theme_table_cell($cell, TRUE);
}
$output .= " </tr></thead>\n";
}
// Format the table rows:
$output .= "<tbody>\n";
if (count($rows)) {
$flip = array('even' => 'odd', 'odd' => 'even');
$class = 'even';
foreach ($rows as $number => $row) {
$attributes = array();
// Check if we're dealing with a simple or complex row
if (isset($row['data'])) {
foreach ($row as $key => $value) {
if ($key == 'data') {
$cells = $value;
}
else {
$attributes[$key] = $value;
}
}
}
else {
$cells = $row;
}
// Add odd/even class
$class = $flip[$class];
if (isset($attributes['class'])) {
$attributes['class'] .= ' '. $class;
}
else {
$attributes['class'] = $class;
}
// Build row
$output .= ' <tr'. drupal_attributes($attributes) .'>';
$i = 0;
foreach ($cells as $cell) {
$cell = tablesort_cell($cell, $header, $ts, $i++);
$output .= _theme_table_cell($cell);
}
$output .= " </tr>\n";
}
}
$output .= "</tbody></table>\n";
return $output;
}
/**
* Theme function for a header line in the diff.
*/
function theme_diff_header_line($lineno) {
return '<strong>'. t('Line %lineno', array('%lineno' => $lineno)) .'</strong>';
}
/**
* Theme function for a content line in the diff.
*/
function theme_diff_content_line($line) {
return '<div>'. $line .'</div>';
}
/**
* Theme function for an empty line in the diff.
*/
function theme_diff_empty_line($line) {
return $line;
}
/**
* Theme function for inline diff form.
*/
function theme_diff_inline_form($form) {
drupal_add_css(drupal_get_path('module', 'diff') .'/diff.css');
return drupal_render($form);
}
/**
* Display inline diff metadata.
*/
function theme_diff_inline_metadata($node) {
drupal_add_css(drupal_get_path('module', 'diff') .'/diff.css');
$output = "<div class='diff-inline-metadata clear-block'>";
$output .= "<div class='diff-inline-byline'>";
$output .= t('Updated by !name on @date', array(
'!name' => theme('username', $node),
'@date' => format_date($node->revision_timestamp, 'small'),
));
$output .= "</div>";
$output .= "<div class='diff-inline-legend clear-block'>";
$output .= "<label>". t('Legend') ."</label>";
$output .= theme('diff_inline_chunk', t('Added'), 'add');
$output .= theme('diff_inline_chunk', t('Changed'), 'change');
$output .= theme('diff_inline_chunk', t('Deleted'), 'delete');
$output .= "</div>";
$output .= "</div>";
return $output;
}
/**
* Theme a span of changed text in an inline diff display.
*/
function theme_diff_inline_chunk($text, $type = NULL) {
switch ($type) {
case 'add':
return "<span class='diff-added'>{$text}</span>";
case 'change':
return "<span class='diff-changed'>{$text}</span>";
case 'delete':
return "<span class='diff-deleted'>{$text}</span>";
default:
return $text;
}
}

32
sites/all/modules/diff/includes/node.inc Normal file
View file

@ -0,0 +1,32 @@
<?php
/**
* @file
* Implementation of hook_diff() for node.module (body and title).
*/
/**
* Implementation of hook_diff() for node.module (body and title).
*/
function node_diff($old_node, $new_node) {
$result = array();
$type = node_get_types('type', $new_node);
$result['title'] = array(
'#name' => $type->title_label,
'#old' => array($old_node->title),
'#new' => array($new_node->title),
'#weight' => -5,
'#format' => array(
'show_header' => FALSE,
)
);
if ($type->has_body) {
$result['body'] = array(
'#name' => $type->body_label,
'#old' => explode("\n", $old_node->body),
'#new' => explode("\n", $new_node->body),
);
}
return $result;
}

66
sites/all/modules/diff/includes/taxonomy.inc Normal file
View file

@ -0,0 +1,66 @@
<?php
/**
* @file
* Implementation of hook_diff() for taxonomy.
*/
/**
* Implementation of hook_diff() for taxonomy.
*/
function taxonomy_diff($old_node, $new_node) {
$result = array();
// TODO: make taxonomy by category not only by whole taxonomy?
$old_taxonomy = array();
$new_taxonomy = array();
if (isset($old_node->taxonomy) && $old_node->taxonomy) {
foreach ($old_node->taxonomy as $term) {
$old_taxonomy[] = $term->name;
}
}
if (isset($new_node->taxonomy) && $new_node->taxonomy) {
foreach ($new_node->taxonomy as $id => $entry) {
if (is_array($entry)) {
// During editing the taxonomy is built up as a list of vocabulary ids as keys
// and a list of term ids per array entry.
if (is_numeric($id)) {
foreach ($entry as $tid) {
$term = taxonomy_get_term($tid);
$new_taxonomy[] = $term->name;
}
}
else {
// If the id is not numeric than it has to be 'tags' which denotes freetagging
// vocabularies. These are stored as an array which map the vocabulary id to
// a string of terms.
foreach ($entry as $taglist) {
// The regular expression is taken from taxonomy.module.
preg_match_all('%(?:^|,\ *)("(?>[^"]*)(?>""[^"]* )*"|(?: [^",]*))%x', $taglist, $matches);
foreach ($matches[1] as $term) {
$new_taxonomy[] = $term;
}
}
}
}
elseif (is_numeric($entry)) {
// During editing, taxonomy is a single id.
$term = taxonomy_get_term($entry);
$new_taxonomy[] = $term->name;
}
else {
// Not during editing the taxonomy list is a list of terms.
$new_taxonomy[] = $entry->name;
}
}
}
$result['taxonomy'] = array(
'#name' => t('Taxonomy'),
'#old' => $old_taxonomy,
'#new' => $new_taxonomy,
'#weight' => -3,
'#format' => array(
'show_header' => FALSE,
)
);
return $result;
}

47
sites/all/modules/diff/includes/upload.inc Normal file
View file

@ -0,0 +1,47 @@
<?php
/**
* @file
* Implementation of hook_diff() for file attachments.
*/
/**
* Implementation of hook_diff() for file attachments.
*/
function upload_diff($old_node, $new_node) {
$result = array();
$old_files = array();
if (isset($old_node->files)) {
foreach ($old_node->files as $file) {
$old_files[] = $file->filename;
}
}
$new_files = array();
if (isset($new_node->files)) {
foreach ($new_node->files as $key => $file) {
if (is_array($file)) {
// During editing the files are stored as arrays, not objects.
if ($file['remove']) {
// It looks better if a blank line is inserted for removed files.
$new_files[] = '';
}
else {
$new_files[] = $file['filename'];
}
}
else {
$new_files[] = $file->filename;
}
}
}
$result['attachments'] = array(
'#name' => t('Attachments'),
'#old' => $old_files,
'#new' => $new_files,
'#weight' => 30,
'#format' => array(
'show_header' => FALSE,
)
);
return $result;
}

41
sites/all/modules/diff/readme.txt Normal file
View file

@ -0,0 +1,41 @@
Diff 2.x for Drupal 6.x
-----------------------
Diff enhances usage of node revisions by adding the following features:
- diff between node revisions on the 'Revisions' tab to view all the changes
between any two revisions of a node
- highlight changes inline while viewing a node to quickly see color-coded
additions, changes, and deletions
- preview changes as a diff before updating a node
Installation
------------
Diff can be installed like any other Drupal module -- place it in
the modules directory for your site and enable it on the `admin/build/modules`
page.
Diff needs to be configured to be used with specific node types on your site.
Enable any of diff's options on a content type's settings page (e.g.
`admin/content/node-type/page`).
Technical
---------
- Diff compares the raw data, not the filtered output, making it easier to see
changes to HTML entities, etc.
- The diff engine itself is a GPL'ed php diff engine from phpwiki.
API
---
This module offers `hook_diff()` which modules may use to inject their changes
into the presentation of the diff. For example, this is used by
`content.diff.inc` (see CCK), `upload.inc`, and `taxonomy.inc`.
Maintainers
-----------
- dww (Derek Wright)
- moshe (Moshe Weitzman)
- rötzi (Julian)
- yhahn (Young Hahn)