first import
This commit is contained in:
29
sites/all/modules/publishcontent/ChangeLog.txt
Normal file
29
sites/all/modules/publishcontent/ChangeLog.txt
Normal file
@@ -0,0 +1,29 @@
|
||||
#1304846 by Thomas_Zahreddin: Don't explain UI-elements to the user
|
||||
|
||||
publishcontent-7.x-1.0 release
|
||||
#1244136 by gionnibgud - fixed PHP Notice in views handler
|
||||
#1204540, #1267484 - fixed typo in permission hook
|
||||
#1131818 by Simon Georges - add a class to pub/unpub links
|
||||
#1131526 by Simon Georges - add unpub link to contextual hooks
|
||||
|
||||
|
||||
publishcontent-7.x-1.0-beta3 release
|
||||
#873466 by martinquested: add additional "editable" publish/unpublish permission to support node access modules
|
||||
#454660 - respect publishing options
|
||||
- Updating views support
|
||||
- Add option to enable or disable specific node-types
|
||||
- Publish/unpublish menu local task returns to referer, instead of node/$nid
|
||||
|
||||
publishcontent-6.x-1.1 release
|
||||
#443762 by maryts23, Taz and malaussene: Publish link doesn't appear in Views
|
||||
when using publish own content permissions.
|
||||
#366034 by malaussene: Fixed permission with own content.
|
||||
#382280 by grndlvl, malaussene: Added publish/unpublish checkbox to node form.
|
||||
#406190 by vr_mex, malaussene: Added permissions for node type declared modules
|
||||
other than the node module.
|
||||
Fix CSRF
|
||||
#366034 by freakalis: Added permissions to publish/unpublish own content.
|
||||
#369652 by Eikaa: Added german translation.
|
||||
|
||||
publishcontent-6.x-1.0 release
|
||||
#365534 by Nick_vh, malaussene: Added custom label in views.
|
339
sites/all/modules/publishcontent/LICENSE.txt
Normal file
339
sites/all/modules/publishcontent/LICENSE.txt
Normal file
@@ -0,0 +1,339 @@
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 2, June 1991
|
||||
|
||||
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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 Lesser 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
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
free software which everyone can redistribute and change under these terms.
|
||||
|
||||
To do so, attach the following notices to the program. It is safest
|
||||
to attach them to the start of each source file to most effectively
|
||||
convey the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License along
|
||||
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If the program is interactive, make it output a short notice like this
|
||||
when it starts in an interactive mode:
|
||||
|
||||
Gnomovision version 69, Copyright (C) year name of author
|
||||
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||
This is free software, and you are welcome to redistribute it
|
||||
under certain conditions; type `show c' for details.
|
||||
|
||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||
parts of the General Public License. Of course, the commands you use may
|
||||
be called something other than `show w' and `show c'; they could even be
|
||||
mouse-clicks or menu items--whatever suits your program.
|
||||
|
||||
You should also get your employer (if you work as a programmer) or your
|
||||
school, if any, to sign a "copyright disclaimer" for the program, if
|
||||
necessary. Here is a sample; alter the names:
|
||||
|
||||
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
|
||||
`Gnomovision' (which makes passes at compilers) written by James Hacker.
|
||||
|
||||
<signature of Ty Coon>, 1 April 1989
|
||||
Ty Coon, President of Vice
|
||||
|
||||
This General Public License does not permit incorporating your program into
|
||||
proprietary programs. If your program is a subroutine library, you may
|
||||
consider it more useful to permit linking proprietary applications with the
|
||||
library. If this is what you want to do, use the GNU Lesser General
|
||||
Public License instead of this License.
|
36
sites/all/modules/publishcontent/README.txt
Normal file
36
sites/all/modules/publishcontent/README.txt
Normal file
@@ -0,0 +1,36 @@
|
||||
PUBLISH CONTENT MODULE
|
||||
|
||||
The Publish Content module allows users to publish and unpublish nodes,
|
||||
on a per "node type" basis or for all "node types", without granting users
|
||||
the very broad "administer nodes" permission.
|
||||
|
||||
It allows easily to create editor or moderator roles by granting them
|
||||
either publishing or unpublishing permissions, or both.
|
||||
|
||||
This module is also integrated with the Views module:
|
||||
you can add a publish/unpublish link on all your views, making it easy
|
||||
to create lists for reviewers, editors and publishers.
|
||||
|
||||
|
||||
INSTALLATION
|
||||
|
||||
Put the module in your drupal modules directory and enable it in admin/modules.
|
||||
|
||||
Then, you just need to go to the Drupal permissions page,
|
||||
and set the various permissions:
|
||||
- "publish all content": you can publish any node
|
||||
- "publish 'nodetype' content": you can publish any node whose type is 'nodetype'
|
||||
- "unpublish all content": you can unpublish any node
|
||||
- "publish 'nodetype' content": you can publish any node whose type is 'nodetype'
|
||||
|
||||
|
||||
USAGE
|
||||
|
||||
A tab button (like Edit and View) 'Publish' or 'Unpublish' should appear on the
|
||||
node edit and view pages.
|
||||
Click on 'Publish' to publish and 'Unpublish' to unpublish, it's that simple!
|
||||
|
||||
CONFIGURATION
|
||||
|
||||
admin/config/content/publishcontent
|
||||
Here you can disable the display of Publish/Unpublish tabs.
|
19
sites/all/modules/publishcontent/publishcontent.admin.inc
Normal file
19
sites/all/modules/publishcontent/publishcontent.admin.inc
Normal file
@@ -0,0 +1,19 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Contains page callbacks for publishcontent
|
||||
*/
|
||||
|
||||
function publishcontent_config_form($form, &$form_state) {
|
||||
|
||||
$form['publishcontent_tabs'] = array(
|
||||
'#type' => 'checkbox',
|
||||
'#title' => t('Display Publish/Unpublish tabs'),
|
||||
'#default_value' => variable_get('publishcontent_tabs', TRUE),
|
||||
'#description' => t("Uncheck this box to hide the publish/unpublish tabs on nodes."),
|
||||
);
|
||||
|
||||
return system_settings_form($form);
|
||||
}
|
||||
|
14
sites/all/modules/publishcontent/publishcontent.info
Normal file
14
sites/all/modules/publishcontent/publishcontent.info
Normal file
@@ -0,0 +1,14 @@
|
||||
name = Publish Content
|
||||
description = "Adds a 'Publish' or 'Unpublish' link on the node edit/view pages,<br />and a field 'Publish Link' if the Views module is enabled."
|
||||
core = 7.x
|
||||
|
||||
files[] = publishcontent.module
|
||||
files[] = publishcontent.install
|
||||
files[] = publishcontent_views_handler_field_node_link.inc
|
||||
|
||||
; Information added by drupal.org packaging script on 2012-08-15
|
||||
version = "7.x-1.0+9-dev"
|
||||
core = "7.x"
|
||||
project = "publishcontent"
|
||||
datestamp = "1344991505"
|
||||
|
23
sites/all/modules/publishcontent/publishcontent.install
Normal file
23
sites/all/modules/publishcontent/publishcontent.install
Normal file
@@ -0,0 +1,23 @@
|
||||
<?php
|
||||
|
||||
function publishcontent_update_6001() {
|
||||
$ret = $node_types = array();
|
||||
$query = 'SELECT pid, perm FROM {permission}';
|
||||
$result = db_query($query);
|
||||
$update_sql = 'UPDATE {permission} SET perm = "%s" WHERE pid = %d';
|
||||
while ($row = db_fetch_array($result)) {
|
||||
$old_perm = $row['perm'];
|
||||
$subjects = array('*all*');
|
||||
$replacements = array('any');
|
||||
foreach (node_get_types() as $type) {
|
||||
$subjects[] = 'publish ' . check_plain($type->type) . ' content';
|
||||
$subjects[] = 'unpublish ' . check_plain($type->type) . ' content';
|
||||
$replacements[] = 'publish any ' . check_plain($type->type) . ' content';
|
||||
$replacements[] = 'unpublish any '. check_plain($type->type) . ' content';
|
||||
}
|
||||
$new_perm = str_replace($subjects, $replacements, $row['perm']);
|
||||
$ret[] = array('success' => db_query($update_sql, $new_perm, $row['pid']), 'query' => t('Updated permission set @set', array('@set' => $row['pid'])));
|
||||
}
|
||||
variable_set('menu_rebuild_needed', TRUE);
|
||||
return $ret;
|
||||
}
|
255
sites/all/modules/publishcontent/publishcontent.module
Normal file
255
sites/all/modules/publishcontent/publishcontent.module
Normal file
@@ -0,0 +1,255 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Add link to publish or unpublish a node, with access control based on the
|
||||
* node type
|
||||
*/
|
||||
|
||||
/**
|
||||
* Implements hook_menu().
|
||||
*/
|
||||
function publishcontent_menu() {
|
||||
$items = array();
|
||||
$items['admin/config/content/publishcontent'] = array(
|
||||
'title' => 'Publish content settings',
|
||||
'page callback' => 'drupal_get_form',
|
||||
'page arguments' => array('publishcontent_config_form'),
|
||||
'access callback' => 'user_access',
|
||||
'access arguments' => array('administer site configuration'),
|
||||
'description' => 'Configure settings.',
|
||||
'file' => 'publishcontent.admin.inc',
|
||||
'type' => MENU_NORMAL_ITEM,
|
||||
);
|
||||
$items['node/%publishcontent_tab/publish/%publishcontent_security_token'] = array(
|
||||
'title' => 'Publish',
|
||||
'page callback' => 'publishcontent_toggle_status',
|
||||
'page arguments' => array(1),
|
||||
'access callback' => '_publishcontent_publish_access',
|
||||
'access arguments' => array(1, 3),
|
||||
'weight' => 5,
|
||||
'type' => MENU_LOCAL_TASK,
|
||||
'options' => array('attributes' => array('class' => array('publishcontent-link', 'publishcontent-publish'))),
|
||||
'context' => MENU_CONTEXT_PAGE | MENU_CONTEXT_INLINE,
|
||||
);
|
||||
$items['node/%publishcontent_tab/unpublish/%publishcontent_security_token'] = array(
|
||||
'title' => 'Unpublish',
|
||||
'page callback' => 'publishcontent_toggle_status',
|
||||
'page arguments' => array(1),
|
||||
'access callback' => '_publishcontent_unpublish_access',
|
||||
'access arguments' => array(1, 3),
|
||||
'weight' => 5,
|
||||
'type' => MENU_LOCAL_TASK,
|
||||
'options' => array('attributes' => array('class' => array('publishcontent-link', 'publishcontent-unpublish'))),
|
||||
'context' => MENU_CONTEXT_PAGE | MENU_CONTEXT_INLINE,
|
||||
);
|
||||
return $items;
|
||||
}
|
||||
|
||||
/**
|
||||
* Decide to show the (un)publish tab or not.
|
||||
*/
|
||||
function publishcontent_tab_load($nid) {
|
||||
if (is_numeric($nid)) {
|
||||
$node = node_load($nid);
|
||||
if (variable_get('publishcontent_tabs', TRUE)) {
|
||||
return $node;
|
||||
}
|
||||
}
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
/**
|
||||
* Used to append a security token to prevent XSS.
|
||||
*
|
||||
* @see Dynamic argument replacement (wildcard) for hook_menu at
|
||||
* http://drupal.org/node/109153
|
||||
*/
|
||||
function publishcontent_security_token_to_arg($arg, $map, $index) {
|
||||
return drupal_get_token();
|
||||
}
|
||||
|
||||
/**
|
||||
* Access callback for publish action. Only allow access based on permissions
|
||||
* and current node status = unpublished
|
||||
*/
|
||||
function _publishcontent_publish_access($node, $token = FALSE) {
|
||||
if (empty($node->nid) || !is_object($node)) {
|
||||
return FALSE;
|
||||
}
|
||||
if ($token && !drupal_valid_token($token)) {
|
||||
return FALSE;
|
||||
}
|
||||
if (!variable_get('publishcontent_' . $node->type, TRUE)) {
|
||||
return FALSE;
|
||||
}
|
||||
if (!is_object($node)) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
global $user;
|
||||
return !$node->status &&
|
||||
(user_access('publish any content')
|
||||
|| (user_access('publish own content') && $user->uid == $node->uid)
|
||||
|| (user_access('publish editable content') && node_access('update', $node))
|
||||
|| (user_access('publish own '. check_plain($node->type) .' content', $user) && $user->uid == $node->uid)
|
||||
|| user_access('publish any '. check_plain($node->type) .' content')
|
||||
|| (user_access('publish editable '. check_plain($node->type) .' content') && node_access('update', $node))
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Access callback for unpublish action. Only allow access based on permissions
|
||||
* and current node status = published
|
||||
*/
|
||||
function _publishcontent_unpublish_access($node, $token = FALSE) {
|
||||
if (empty($node->nid) || !is_object($node)) {
|
||||
return FALSE;
|
||||
}
|
||||
if ($token && !drupal_valid_token($token)) {
|
||||
return FALSE;
|
||||
}
|
||||
if (!variable_get('publishcontent_' . $node->type, TRUE)) {
|
||||
return FALSE;
|
||||
}
|
||||
if (!is_object($node)) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
global $user;
|
||||
return $node->status &&
|
||||
(user_access('unpublish any content')
|
||||
|| (user_access('unpublish own content') && $user->uid == $node->uid)
|
||||
|| (user_access('unpublish editable content') && node_access('update', $node))
|
||||
|| (user_access('unpublish own '. check_plain($node->type) .' content', $user) && $user->uid == $node->uid)
|
||||
|| user_access('unpublish any '. check_plain($node->type) .' content')
|
||||
|| (user_access('unpublish editable '. check_plain($node->type) .' content') && node_access('update', $node))
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Implementation of hook_permission().
|
||||
*/
|
||||
function publishcontent_permission() {
|
||||
$perms = array(
|
||||
'publish any content' => array(
|
||||
'title' => t('Publish any content'),
|
||||
),
|
||||
'unpublish any content' => array(
|
||||
'title' => t('Unpublish any content'),
|
||||
),
|
||||
'publish editable content' => array(
|
||||
'title' => t('Publish editable content'),
|
||||
),
|
||||
'unpublish editable content' => array(
|
||||
'title' => t('Unpublish editable content'),
|
||||
),
|
||||
);
|
||||
|
||||
foreach (node_type_get_types() as $type) {
|
||||
if (!variable_get('publishcontent_' . $type->type, TRUE)) {
|
||||
continue;
|
||||
}
|
||||
if (isset($type->type)) {
|
||||
$perms['publish any ' . $type->type . ' content'] = array(
|
||||
'title' => t('Publish any @type content', array('@type' => $type->name)));
|
||||
$perms['publish own ' . $type->type . ' content'] = array(
|
||||
'title' => t('Publish own @type content', array('@type' => $type->name)));
|
||||
$perms['publish editable ' . $type->type . ' content'] = array(
|
||||
'title' => t('Publish editable @type content', array('@type' => $type->name)));
|
||||
$perms['unpublish any ' . $type->type . ' content'] = array(
|
||||
'title' => t('Unpublish any @type content', array('@type' => $type->name)));
|
||||
$perms['unpublish own ' . $type->type . ' content'] = array(
|
||||
'title' => t('Unpublish own @type content', array('@type' => $type->name)));
|
||||
$perms['unpublish editable ' . $type->type . ' content'] = array(
|
||||
'title' => t('Unpublish editable @type content', array('@type' => $type->name)));
|
||||
}
|
||||
}
|
||||
return $perms;
|
||||
}
|
||||
|
||||
/**
|
||||
* Helper function to generate change of status message.
|
||||
*/
|
||||
function _publishcontent_get_message($nid, $title, $status) {
|
||||
return t($status ? '"@title" [@nid] has been published'
|
||||
: '"@title" [@nid] has been unpublished',
|
||||
array('@title' => $title, '@nid' => $nid));
|
||||
}
|
||||
|
||||
/**
|
||||
* Menu callback for publish / unpublish content actions.
|
||||
* @param $node a node object
|
||||
*/
|
||||
function publishcontent_toggle_status($node) {
|
||||
// XOR the current status with 1 to get the opposite value.
|
||||
$node->status = $node->status ^ 1;
|
||||
// If this content type specifies that a new revision should be created on
|
||||
// editing, then make sure to respect this option.
|
||||
$node_options = variable_get('node_options_' . $node->type, array());
|
||||
if (in_array('revision', $node_options)) {
|
||||
$node->revision = 1;
|
||||
}
|
||||
node_save($node);
|
||||
drupal_set_message(_publishcontent_get_message($node->nid, $node->title, $node->status));
|
||||
drupal_goto($_SERVER['HTTP_REFERER']);
|
||||
}
|
||||
|
||||
/**
|
||||
* Implementation of hook_form_alter()
|
||||
*
|
||||
* allow to use the 'Publishing options' on the edit/add page
|
||||
*/
|
||||
function publishcontent_form_alter(&$form, &$form_state, $form_id) {
|
||||
if ($form_id == 'node_type_form') {
|
||||
$form['workflow']['publishcontent'] = array(
|
||||
'#type' => 'checkbox',
|
||||
'#title' => t('Enable publishcontent'),
|
||||
'#default_value' => variable_get('publishcontent_' . $form['#node_type']->type, TRUE),
|
||||
'#description' => t('Display publish or unpublish link for nodes of this type.'),
|
||||
);
|
||||
}
|
||||
elseif (user_access('administer nodes')
|
||||
|| empty($form['#node']) || empty($form['#node']->type)
|
||||
|| $form['#node']->type . '_node_form' != $form_id
|
||||
|| (!_publishcontent_unpublish_access($form['#node'])
|
||||
&& !_publishcontent_publish_access($form['#node']))) {
|
||||
return;
|
||||
}
|
||||
$form['options']['status']['#access'] = TRUE;
|
||||
if (!empty($form['options']['#access'])) {
|
||||
return;
|
||||
}
|
||||
else {
|
||||
$form['options']['#access'] = TRUE;
|
||||
}
|
||||
foreach (element_children($form['options']) as $key) {
|
||||
// If another form has afforded access to a particular option, do not
|
||||
// override that access. Otherwise, disable it.
|
||||
$form['options'][$key]['#access'] =
|
||||
isset($form['options'][$key]['#access'])
|
||||
? $form['options'][$key]['#access'] : FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Implements hook_views_api()
|
||||
*/
|
||||
function publishcontent_views_api() {
|
||||
return array('api' => 3);
|
||||
}
|
||||
|
||||
/**
|
||||
* Implements hook_views_data_alter() to add items to the node table that are
|
||||
* relevant to publishcontent.
|
||||
*/
|
||||
function publishcontent_views_data_alter(&$data) {
|
||||
// new comments
|
||||
$data['node']['publishcontent'] = array(
|
||||
'title' => t('Publish link'),
|
||||
'help' => t('Display a link to publish the node.'),
|
||||
'field' => array(
|
||||
'handler' => 'publishcontent_views_handler_field_node_link',
|
||||
),
|
||||
);
|
||||
}
|
@@ -0,0 +1,63 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* Field handler to present a link node publish.
|
||||
*/
|
||||
class publishcontent_views_handler_field_node_link extends views_handler_field_node_link {
|
||||
function construct() {
|
||||
parent::construct();
|
||||
$this->additional_fields['nid'] = 'nid';
|
||||
$this->additional_fields['type'] = 'type';
|
||||
$this->additional_fields['status'] = 'status';
|
||||
$this->additional_fields['uid'] = 'uid';
|
||||
}
|
||||
|
||||
function option_definition() {
|
||||
$options = parent::option_definition();
|
||||
$options['publish'] =
|
||||
$options['unpublish'] = array('default' => '', 'translatable' => TRUE);
|
||||
|
||||
return $options;
|
||||
}
|
||||
|
||||
function options_form(&$form, &$form_state) {
|
||||
parent::options_form($form, $form_state);
|
||||
unset($form['text']);
|
||||
$form['publish'] = array(
|
||||
'#type' => 'textfield',
|
||||
'#title' => t('Text to display for publishing'),
|
||||
'#default_value' => $this->options['publish'],
|
||||
);
|
||||
$form['unpublish'] = array(
|
||||
'#type' => 'textfield',
|
||||
'#title' => t('Text to display for unpublishing'),
|
||||
'#default_value' => $this->options['unpublish'],
|
||||
);
|
||||
}
|
||||
|
||||
function query() {
|
||||
$this->ensure_my_table();
|
||||
$this->add_additional_fields();
|
||||
}
|
||||
|
||||
function render_link($node, $values) {
|
||||
// ensure user has access to edit this node.
|
||||
if ($node->status && _publishcontent_unpublish_access($node)) {
|
||||
$op = 'unpublish';
|
||||
}
|
||||
|
||||
if (!$node->status && _publishcontent_publish_access($node)) {
|
||||
$op = 'publish';
|
||||
}
|
||||
|
||||
if (isset($op)) {
|
||||
$this->options['alter']['make_link'] = TRUE;
|
||||
$this->options['alter']['path'] = "node/$node->nid/$op/" . drupal_get_token();
|
||||
$this->options['alter']['query'] = drupal_get_destination();
|
||||
$this->options['alter']['link_class'] = 'publishcontent-link publishcontent-' . $op;
|
||||
|
||||
$text = empty($this->options[$op]) ? t($op) : $this->options[$op];
|
||||
return $text;
|
||||
}
|
||||
}
|
||||
}
|
211
sites/all/modules/publishcontent/tests/publishcontent.test
Normal file
211
sites/all/modules/publishcontent/tests/publishcontent.test
Normal file
@@ -0,0 +1,211 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Unit tests for Publish Content module.
|
||||
* prerequesite: make sure that 'authenticated user' does not have any access like
|
||||
* 'publish [content type] content' or 'unpublish [content type] content'
|
||||
*
|
||||
* @note: We test to ensure we are not messing up with the default Drupal access for view node
|
||||
* i.e. a owner of a node can view it even if unpublished.
|
||||
*/
|
||||
class PublishContentWebCaseTest extends DrupalWebTestCase {
|
||||
|
||||
/**
|
||||
* Drupal SimpleTest method: return metadata about the test.
|
||||
*/
|
||||
function getInfo() {
|
||||
return array(
|
||||
'name' => t('Publish Content: access control'),
|
||||
'description' => t('Executes test suite for Publish Content module.'),
|
||||
'group' => t('Publish Content'),
|
||||
);
|
||||
}
|
||||
|
||||
function setUp() {
|
||||
parent::setUp('publishcontent');
|
||||
}
|
||||
|
||||
function publishcontent_do_operation($nid, $op, $expected_status, $msg = NULL) {
|
||||
$this->drupalGet("node/$nid/$op");
|
||||
$node = node_load($nid, NULL, TRUE);
|
||||
$this->assertEqual($node->status, $expected_status, $msg);
|
||||
}
|
||||
|
||||
function assert_access_node($node, $msg = NULL) {
|
||||
$this->drupalGet('node/'. $node->nid);
|
||||
$this->assertResponse(200);
|
||||
$this->assertTitle($node->title . ' | '. variable_get('site_name', 'Drupal'), $msg);
|
||||
}
|
||||
|
||||
function assert_access_denied($url, $msg = NULL) {
|
||||
$this->drupalGet($url);
|
||||
$this->assertResponse(403);
|
||||
$this->assertText('Access denied' . ' | '. variable_get('site_name', 'Drupal'), $msg);
|
||||
}
|
||||
|
||||
function assert_node_status($nid, $status, $msg = 'node status mismatches') {
|
||||
$result = node_load($nid, NULL, TRUE);
|
||||
$this->assertEqual($result->status, $status, $msg);
|
||||
}
|
||||
|
||||
function set_node_status(&$node, $status, $msg = 'unable to set correct node status') {
|
||||
$node->status = $status;
|
||||
node_save($node);
|
||||
$this->assert_node_status($node->nid, $status, $msg);
|
||||
}
|
||||
|
||||
function assert_current_user_cannot_publish_node(&$node) {
|
||||
$this->assertEqual($node->status, 1, 'pre-requesite: status MUST be 1');
|
||||
$this->assert_access_denied("node/{$node->nid}/publish", "no publish permission --> access denied");
|
||||
$this->assert_node_status($node->nid, 1, 'node should be still published');
|
||||
$this->assert_access_node($node, 'node MUST BE viewable');
|
||||
|
||||
$this->set_node_status($node, 0);
|
||||
|
||||
$this->assert_access_denied("node/{$node->nid}/publish", "no publish permission --> access denied");
|
||||
$this->assert_node_status($node->nid, 0, 'node should be still unpublished');
|
||||
|
||||
$this->set_node_status($node, 1, 'post-requesite: status MUST be 1');
|
||||
}
|
||||
|
||||
function assert_current_user_cannot_unpublish_node(&$node) {
|
||||
$this->assertEqual($node->status, 1, 'pre-requesite: status MUST be 1');
|
||||
$this->assert_access_denied("node/{$node->nid}/unpublish", "no unpublish permission --> access denied");
|
||||
$this->assert_node_status($node->nid, 1, 'node should be still published');
|
||||
$this->assert_access_node($node, 'node MUST BE viewable');
|
||||
|
||||
$this->set_node_status($node, 0);
|
||||
|
||||
$this->assert_access_denied("node/{$node->nid}/unpublish", "no unpublish permission --> access denied");
|
||||
$this->assert_node_status($node->nid, 0, 'node should be still unpublished');
|
||||
|
||||
$this->set_node_status($node, 1, 'post-requesite: status MUST be 1');
|
||||
}
|
||||
|
||||
function assert_current_user_can_publish_node(&$node) {
|
||||
$this->assertEqual($node->status, 1, 'pre-requesite: status MUST be 1');
|
||||
$this->publishcontent_do_operation($node->nid, 'publish', 1, 'node should be still published');
|
||||
$this->assert_access_node($node, 'node MUST BE viewable');
|
||||
|
||||
$this->set_node_status($node, 0);
|
||||
|
||||
$this->assert_access_node($node, 'node MUST BE viewable even if unpublished');
|
||||
|
||||
$this->publishcontent_do_operation($node->nid, 'publish', 1, 'node should be now published');
|
||||
$this->assertText(_publishcontent_get_message($node->nid, $node->title, TRUE),
|
||||
'drupal_set_message not working for publish.');
|
||||
|
||||
$this->set_node_status($node, 1, 'post-requesite: status MUST be 1');
|
||||
}
|
||||
|
||||
function assert_current_user_can_unpublish_node(&$node) {
|
||||
$this->assertEqual($node->status, 1, 'pre-requesite: status MUST be 1');
|
||||
$this->publishcontent_do_operation($node->nid, 'unpublish', 0, 'node should be published');
|
||||
$this->assertText(_publishcontent_get_message($node->nid, $node->title, FALSE),
|
||||
'drupal_set_message not working for unpublish.');
|
||||
|
||||
$this->assert_access_node($node, 'node MUST BE viewable even if unpublished');
|
||||
|
||||
$this->publishcontent_do_operation($node->nid, 'unpublish', 0, 'node should be still unpublished');
|
||||
|
||||
$this->set_node_status($node, 1, 'post-requesite: status MUST be 1');
|
||||
}
|
||||
|
||||
/**
|
||||
* Test the access for the owner of a node without the permission to
|
||||
* publish or unpublish.
|
||||
*
|
||||
* @note: node's owner can see it even if unpublished by default in Drupal
|
||||
*/
|
||||
function testNoPermissionByOwner() {
|
||||
// Prepare a user to do the stuff
|
||||
$web_user = $this->drupalCreateUser(array('access content'));
|
||||
$this->drupalLogin($web_user);
|
||||
$node = $this->drupalCreateNode(
|
||||
array(
|
||||
'type' => 'page',
|
||||
'uid' => $web_user->uid,
|
||||
'status' => 1,
|
||||
)
|
||||
);
|
||||
$this->assert_current_user_cannot_publish_node($node);
|
||||
$this->assert_current_user_cannot_unpublish_node($node);
|
||||
|
||||
$this->set_node_status($node, 0);
|
||||
$this->assert_access_node($node, 'node MUST BE viewable if unpublished');
|
||||
}
|
||||
|
||||
function testNoPermissionAndNotOwner() {
|
||||
$node = $this->drupalCreateNode(
|
||||
array(
|
||||
'type' => 'page',
|
||||
'uid' => 0,
|
||||
'status' => 1,
|
||||
)
|
||||
);
|
||||
|
||||
$this->drupalLogin($this->drupalCreateUser(array('access content')));
|
||||
$this->assert_current_user_cannot_publish_node($node);
|
||||
$this->assert_current_user_cannot_unpublish_node($node);
|
||||
}
|
||||
|
||||
function testDoPublishByNodeOwner() {
|
||||
$type = 'page';
|
||||
$web_user = $this->drupalCreateUser(array('publish any '. $type .' content'));
|
||||
$this->drupalLogin($web_user);
|
||||
|
||||
$node = $this->drupalCreateNode(
|
||||
array(
|
||||
'type' => $type,
|
||||
'uid' => $web_user->uid,
|
||||
'status' => 1,
|
||||
)
|
||||
);
|
||||
$this->assert_current_user_can_publish_node($node);
|
||||
$this->assert_current_user_cannot_unpublish_node($node);
|
||||
}
|
||||
|
||||
function testDoUnpublishByNodeOwner() {
|
||||
$type = 'page';
|
||||
$web_user = $this->drupalCreateUser(array('unpublish any '. $type .' content'));
|
||||
$this->drupalLogin($web_user);
|
||||
|
||||
$node = $this->drupalCreateNode(
|
||||
array(
|
||||
'type' => $type,
|
||||
'uid' => $web_user->uid,
|
||||
'status' => 1,
|
||||
)
|
||||
);
|
||||
$this->assert_current_user_cannot_publish_node($node);
|
||||
$this->assert_current_user_can_unpublish_node($node);
|
||||
}
|
||||
|
||||
function testDoPublishAndUnpublishNotByNodeOwner() {
|
||||
$type = 'page';
|
||||
$node = $this->drupalCreateNode(
|
||||
array(
|
||||
'type' => $type,
|
||||
'uid' => 0,
|
||||
'status' => 1,
|
||||
)
|
||||
);
|
||||
|
||||
$this->drupalLogin($this->drupalCreateUser(array('publish any '. $type .' content')));
|
||||
$this->assert_current_user_can_publish_node($node);
|
||||
$this->assert_current_user_cannot_unpublish_node($node);
|
||||
|
||||
$this->drupalLogin($this->drupalCreateUser(array('unpublish any '. $type .' content')));
|
||||
$this->assert_current_user_cannot_publish_node($node);
|
||||
$this->assert_current_user_can_unpublish_node($node);
|
||||
|
||||
$this->drupalLogin($this->drupalCreateUser(array('publish any content')));
|
||||
$this->assert_current_user_can_publish_node($node);
|
||||
$this->assert_current_user_cannot_unpublish_node($node);
|
||||
|
||||
$this->drupalLogin($this->drupalCreateUser(array('unpublish any content')));
|
||||
$this->assert_current_user_cannot_publish_node($node);
|
||||
$this->assert_current_user_can_unpublish_node($node);
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user