diff --git a/sites/all/modules/trailing_slash/LICENSE.txt b/sites/all/modules/trailing_slash/LICENSE.txt new file mode 100644 index 0000000000000000000000000000000000000000..d159169d1050894d3ea3b98e1c965c4058208fe1 --- /dev/null +++ b/sites/all/modules/trailing_slash/LICENSE.txt @@ -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. diff --git a/sites/all/modules/trailing_slash/README.txt b/sites/all/modules/trailing_slash/README.txt new file mode 100644 index 0000000000000000000000000000000000000000..32f5c106975ceda0aeb569a3c27f00fcac954f7d --- /dev/null +++ b/sites/all/modules/trailing_slash/README.txt @@ -0,0 +1,53 @@ +TRAILING SLASH DRUPAL MODULE +---------------------------- + +What is it? +----------- +Adds trailing slashes to all Drupal generated clean URLs. +For example: example.com/user/. + +How do I install it? +-------------------- +1. Install and enable this module using one of the following methods: +http://drupal.org/documentation/install/modules-themes/modules-7 + +2. Add a redirect for your website that enforces trailing slashes using one of the following methods (not having duplicate pages is good for SEO): + +Apache mod_rewrite example (in .htaccess): + +RewriteEngine On +RewriteBase / +RewriteCond %{REQUEST_METHOD} !=post [NC] +RewriteRule ^(.*(?:^|/)[^/\.]+)$ $1/ [L,R=301] + +IIS URL Rewrite example (in web.config): + +<configuration> + <system.webServer> + <rewrite> + <rules> + <rule name="Redirect to Trailing Slashes" enabled="true" stopProcessing="true"> + <match url="^(.*(?:^|/)[^/\.]+)$" /> + <conditions logicalGrouping="MatchAll" trackAllCaptures="false"> + <add input="{REQUEST_METHOD}" pattern="post" negate="true" /> + </conditions> + <action type="Redirect" url="{R:1}/" /> + </rule> + </rules> + </rewrite> + </system.webServer> +</configuration> + +GlobalRedirect module [http://drupal.org/project/globalredirect] +Installing this module is a good way to perform global redirects if you can't or don't want to use web server configured redirects. + +3. Go to Administration > Configuration > Search and metadata > Clean URLs in +Drupal and ensure that Enable trailing slashes is checked. Easy as that!! + +Known Issues/Bugs +----------------- +None. + +Sponsors +-------- +Development of this module was sponsored by the Australian War Memorial [http://www.awm.gov.au/]. diff --git a/sites/all/modules/trailing_slash/trailing_slash.info b/sites/all/modules/trailing_slash/trailing_slash.info new file mode 100644 index 0000000000000000000000000000000000000000..a9b4cd5ed0625a7ba76e0f022fc088fe370852f1 --- /dev/null +++ b/sites/all/modules/trailing_slash/trailing_slash.info @@ -0,0 +1,11 @@ +name = Trailing Slash +description = Adds trailing slashes to all Drupal generated URLs. +core = 7.x +configure = admin/config/search/clean-urls + +; Information added by drupal.org packaging script on 2012-07-03 +version = "7.x-1.0" +core = "7.x" +project = "trailing_slash" +datestamp = "1341302749" + diff --git a/sites/all/modules/trailing_slash/trailing_slash.install b/sites/all/modules/trailing_slash/trailing_slash.install new file mode 100644 index 0000000000000000000000000000000000000000..8ddd85acd40faa78803c0cfe3e4a972ba666a2f9 --- /dev/null +++ b/sites/all/modules/trailing_slash/trailing_slash.install @@ -0,0 +1,13 @@ +<?php + +/** + * @file + * Install, update and uninstall functions for the Trailing Slash module. + */ + +/** + * Implements hook_uninstall(). + */ +function trailing_slash_uninstall() { + variable_del('trailing_slash'); +} diff --git a/sites/all/modules/trailing_slash/trailing_slash.module b/sites/all/modules/trailing_slash/trailing_slash.module new file mode 100644 index 0000000000000000000000000000000000000000..38dd83d9c962e6eb025e2e07e4dec3de896aab32 --- /dev/null +++ b/sites/all/modules/trailing_slash/trailing_slash.module @@ -0,0 +1,154 @@ +<?php + +/** + * @file + * Adds checkbox to the Clean URLs settings form and alters outbound URLs. + */ + +/** + * Function to add a trailing slash to a path if there isn't one already. + */ +function trailing_slash_add(&$path) { + $path = preg_replace('/((?:^|\\/)[^\\/\\.]+?)$/isD', '$1/', $path); +} + +/** + * Implements hook_url_outbound_alter(). + */ +function trailing_slash_url_outbound_alter(&$path, &$options, $original_path) { + // If Clean URLs and Trailing Slashes aren't enabled, don't run. + if (empty($GLOBALS['conf']['clean_url']) || !variable_get('trailing_slash', TRUE)) { + return; + } + + // If URL is empty but has a prefix, set the path to the prefix. + if (($path == '<front>' || empty($path)) && isset($options['prefix']) && $options['prefix'] != '') { + $path = $options['prefix']; + $options['prefix'] = ''; + } + + // If the URL is external, the front page, or an empty path, don't run. + if ($options['external'] || $path == '<front>' || empty($path)) { + return; + } + + // If Global Redirect is installed but not being used to enforce trailing + // slashes, we need to not add a trailing slash when it checks to see if a + // page needs to be redirected. + if (module_exists('globalredirect') && ($settings = _globalredirect_get_settings()) && _globalredirect_is_active($settings) && !$settings['deslash']) { + // Use backtrace to find out if the globalredirect_init() function called + // this function. + $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 3); + if (isset($backtrace[2]) && isset($backtrace[2]['function']) && strtolower($backtrace[2]['function']) == 'globalredirect_init') { + return; + } + unset($backtrace); + } + + // Pre-alias if not already an alias. The only available hook is before + // aliasing is done, so we need to pre-alias to modify the final URL path. + if (!$options['alias']) { + // This is a copy of Drupal core code. + $language = isset($options['language']) && isset($options['language']->language) ? $options['language']->language : ''; + $alias = drupal_get_path_alias($original_path, $language); + if ($alias != $original_path) { + $path = $alias; + } + // This is where the copy of Drupal core code ends. + + // Mark the path as an alias so the alias code isn't needlessly re-run. + $options['alias'] = TRUE; + } + + // Add a trailing slash. + trailing_slash_add($path); + +} + +/** + * Implements hook_admin_paths_alter(). + * + * Adds trailing slash versions of admin paths. + */ +function trailing_slash_admin_paths_alter(&$paths) { + $new_paths = array(); + foreach ($paths as $path => $enabled) { + // Ignore paths that end in a wildcard (*) as these will already + // work with trailing slashes. + if (!preg_match('/\\*$/isD', $path)) { + $new_path = $path; + trailing_slash_add($new_path); + + // Only add a new admin path if the trailing slash version is + // different. + if ($new_path != $path) { + $new_paths[$new_path] = $enabled; + } + } + } + + $paths = array_merge($new_paths, $paths); +} + +/** + * Implements hook_boot(). + * + * Cleanup $_GET['q'] on bootstrap. + * + * Some modules might not cater for URLs that end in a trailing slash and might + * accidentally concatenate two or more slashes together in a URL path. This + * replaces any occurences of multiple slashes in $_GET['q'] with only one so + * that such URLs are still routed by Drupal properly. + */ +function trailing_slash_boot() { + $_GET['q'] = preg_replace('/\/{2,}/', '/', $_GET['q']); +} + +/** + * Implements hook_form_FORM_ID_alter(). + */ +function trailing_slash_form_system_clean_url_settings_alter(&$form, &$form_state, $form_id) { + // If Clean URLs can be enabled, add checkbox to enable/disable trailing + // slashes. + if (isset($form['clean_url'])) { + $form['trailing_slash'] = array( + '#type' => 'checkbox', + '#title' => t('Enable trailing slashes'), + '#default_value' => variable_get('trailing_slash', TRUE), + '#description' => t('Add a trailing slash to URLs eg. <code>example.com/user/</code>.'), + '#states' => array( + 'invisible' => array( + 'input[name="clean_url"]' => array('checked' => FALSE), + ), + ), + ); + } +} + +/** + * Implements custom_url_rewrite_outbound(). + * + * This is for Drupal 6.x support and any Drupal 7.x modules that may use it + * (eg. GlobalRedirect). + */ +function custom_url_rewrite_outbound(&$path, $options, $original_path) { + // If Clean URLs and Trailing Slashes are enabled and not external, front + // page, or empty path, add a trailing slash. + if (!empty($GLOBALS['conf']['clean_url']) && variable_get('trailing_slash', TRUE) && !$options['external'] && $path != '<front>' && !empty($path)) { + trailing_slash_add($path); + } +} + +/** + * Implements hook_form_FORM_ID_alter(). + * + * Change GlobalRedirect settings form to allow enforcement of trailing slashes. + */ +function trailing_slash_form_globalredirect_settings_alter(&$form, &$form_state, $form_id) { + if (variable_get('trailing_slash', TRUE)) { + $form['settings']['deslash'] = array_merge($form['settings']['deslash'], array( + '#title' => t('Enforce trailing slash'), + '#description' => t('If enabled, this option will enforce the trailing slash in requests. This stops requests such as example.com/node/1/ and example.com/node/1 causing duplicate content. On the other hand, if you require certain requests to not have a trailing slash, this feature can cause problems so may need to be disabled.'), + )); + } +}