diff --git LICENSE.txt LICENSE.txt deleted file mode 100644 index 2c095c8..0000000 --- LICENSE.txt +++ /dev/null @@ -1,274 +0,0 @@ -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 diff --git role_change_notify.module role_change_notify.module index 8e4ec6b..94d6b8d 100644 --- role_change_notify.module +++ role_change_notify.module @@ -197,6 +197,7 @@ function _role_change_notify_update_user($edit, $account, $category) { $role = $roles[$roleid]; $account->role_changed = $role; + // Invoke actions for role addition. role_change_notify_trigger_actions('role_added', $account); if (variable_get("role_change_notify_$roleid", FALSE)) { @@ -218,11 +219,11 @@ function _role_change_notify_update_user($edit, $account, $category) { } } - // Invoke hook for trigger/actions on role removal. + // Invoke actions on role removal. foreach ($roles_removed as $roleid) { $role = $roles[$roleid]; $account->role_changed = $role; - role_change_notify_trigger_actions('role_added', $account); + role_change_notify_trigger_actions('role_removed', $account); } } diff --git role_change_notify.test role_change_notify.test index 66a5435..22607f7 100644 --- role_change_notify.test +++ role_change_notify.test @@ -9,7 +9,7 @@ * expected. * */ -class RoleChangeNotifyTestCase extends DrupalWebTestCase { +class RoleChangeNotifyTestCase extends TriggerWebTestCase { protected $web_user; protected $admin_user; @@ -37,15 +37,16 @@ class RoleChangeNotifyTestCase extends DrupalWebTestCase { function testBasicNotification() { // Login the admin user. $this->drupalLogin($this->admin_user); + // Create a role that we'll use for testing. $newrole = $this->drupalCreateRole(array('access content'), 'testrole'); - // Test the typical use from the role_change_notify form. + // Configure notifications for the new role $edit = array("role_change_notify_$newrole" => TRUE); $this->drupalPost("admin/people/role_change_notify", $edit, t('Save configuration')); - $edit = array('operation' => "add_role-$newrole", "accounts[{$this->web_user->uid}]" => TRUE); - $this->drupalPost("admin/people", $edit, t("Update")); - $this->assertText(t("The update has been performed")); + // Test the typical use from the role_change_notify form. + $this->assignRole($this->web_user, $newrole); + $this->assertText(t("User @user notified of added role @role", array('@user' => $this->web_user->name, '@role' => 'testrole'))); $this->assertMail('to', $this->web_user->mail, t("Email is to the correct user")); @@ -53,32 +54,61 @@ class RoleChangeNotifyTestCase extends DrupalWebTestCase { $this->assertEmailBodyText($msg, t("Expected 'role has been added' text found in email body"), $msg); $this->verboseEmail(); - // Unfortunately, due to http://drupal.org/node/601398, we can't actually - // assign actions to triggers, so this test will have to wait. -// -// // Now test using a trigger to display a message to the screen. -// // Create an advanced action. -// $hash = md5('system_message_action'); -// $label = t('RCNADDTEST'); -// $edit = array('actions_label' => $label, 'message' => t('RCN Action: Added role [user:role_changed] to user [user:name]')); -// $this->drupalPost("admin/config/system/actions/configure/$hash", $edit, t('Save')); -// $this->assertText(t('The action has been successfully saved.')); -// -// // Now we have to find out the action ID of what we created. -// $cell_to_find = "//div/table/tbody/tr/td[2][. = '$label']/../td[3]/a[@href]"; -// $this->assertFieldByXPath($cell_to_find, t('configure'), t('Found the configure link')); -// $atag = $this->xpath($cell_to_find); -// $href = (string)$atag[0]->attributes()->href; -// $aid = preg_replace('/^.*\//', '', (string)$href); -// $hash = md5($aid); -// $string_href = print_r($href,TRUE); -// $this->verbose("href=$string_href, aid=$aid, hash=$hash"); -// -// $edit = array('aid' => $hash); -// $this->drupalPost('admin/structure/trigger/user', $edit, t('Assign')); -// // Find the label in cell 2 and 'configure' in cell 3. -// $this->assertFieldByXPath("//*[@id='block-system-main']/div/table[2]/tbody/tr/td[2][. = 'RCNADDTEST']/../td[3]", $label, t("Action was successfully assigned to the role_added trigger")); + // Turn off standard non-trigger notifications. + $edit = array("role_change_notify_$newrole" => FALSE); + $this->drupalPost("admin/people/role_change_notify", $edit, t('Save configuration')); + + // Create an advanced system_message_action to issue a message. + $message = "Message: Role added=[user:role_changed] User=[user:name]"; + $actions_edit = array( + 'actions_label' => 'RCN Add Role', + 'message' => $message, + ); + $aid = $this->configureAdvancedAction('system_message_action', $actions_edit); + $edit = array('aid' => md5($aid)); + // And assign it to the role_added trigger. + $this->drupalPost('admin/structure/trigger/user', $edit, t('Assign'), array(), array(), 'trigger_role_added_assign_form'); + + + // Verify that the action has been assigned to the correct hook. + $actions = trigger_get_assigned_actions('role_added'); + $this->assertEqual(1, count($actions), t('One Action assigned to the hook')); + $this->assertEqual($actions[$aid]['label'], $actions_edit['actions_label'], t('Correct action label found.')); + + // Now change the role and see if we get the system message. + $this->assignRole($this->admin_user, $newrole); + + $this->assertText(t("Message: Role added=@role User=@user", array('@role' => 'testrole', '@user' => $this->admin_user->name))); + + + // Create a system email message that will be sent when a role is removed. + $message = "Message: Role removed=[user:role_changed] User=[user:name]"; + $actions_edit = array( + 'actions_label' => 'RCN Remove Role', + 'recipient' => 'nobody@example.com', + 'subject' => t('Role removal message'), + 'message' => $message, + ); + $aid = $this->configureAdvancedAction('system_send_email_action', $actions_edit); + $edit = array('aid' => md5($aid)); + // And assign it to the role_removed trigger. + $this->drupalPost('admin/structure/trigger/user', $edit, t('Assign'), array(), array(), 'trigger_role_removed_assign_form'); + + + // Verify that the action has been assigned to the correct hook. + $actions = trigger_get_assigned_actions('role_removed'); + $this->assertEqual(1, count($actions), t('One Action assigned to the hook "role_removed"')); + $this->assertEqual($actions[$aid]['label'], $actions_edit['actions_label'], t('Correct action label found.')); + if (defined("issue_714190")) { // This part won't pass testing until #714190 lands + + // Now change the role and see if we get the system message. + $this->removeRole($this->admin_user, $newrole); + + $this->verboseEmail(); + $this->assertEmailBodyText(t("Message: Role removed=@role User=@user", array('@role' => 'testrole', '@user' => $this->admin_user->name))); + $this->assertMail('to', $actions_edit['recipient'], t("Correct recipient for role removed email")); + } } /** @@ -88,7 +118,7 @@ class RoleChangeNotifyTestCase extends DrupalWebTestCase { * @param string $message * Message for simpletest. */ - protected function assertEmailBodyText($regex, $message) { + protected function assertEmailBodyText($regex) { $mails = $this->drupalGetMails(); $mail = end($mails); $regex_found = preg_match("/$regex/", $mail['body']); @@ -102,4 +132,34 @@ class RoleChangeNotifyTestCase extends DrupalWebTestCase { $mail = end($mails); $this->verbose(t("Email was:") . "
" . print_r($mail, TRUE) . "
"); } + + /** + * Assign a role to a user. + * + * @param $account + * The user object + * @param $role + * The role to be assigned, as an integer. + */ + protected function assignRole($account, $role) { + $edit = array('operation' => "add_role-$role", "accounts[{$account->uid}]" => TRUE); + $this->drupalPost("admin/people", $edit, t("Update")); + $this->assertText(t("The update has been performed")); + } + + /** + * Remove a role from a user. + * + * @param $account + * The user object + * @param $role + * The role to be removed, as an integer. + */ + protected function removeRole($account, $role) { + $edit = array('operation' => "remove_role-$role", "accounts[{$account->uid}]" => TRUE); + $this->drupalPost("admin/people", $edit, t("Update")); + $this->assertText(t("The update has been performed")); + } } + +