From 265670ec89a619be7156f3921f47acbb9e7be2d0 Mon Sep 17 00:00:00 2001 From: Bachir Soussi Chiadmi Date: Thu, 26 Apr 2018 00:51:03 +0200 Subject: [PATCH] added mobile_js_redirect --- .../dev/mobile_js_redirect/LICENSE.txt | 339 ++++++++++++++++++ .../contrib/dev/mobile_js_redirect/README.txt | 14 + .../cia_report_mstr_persona_trn.csv_.gztmp | 0 .../js/mobile_js_redirect.js | 46 +++ .../mobile_js_redirect.info.yml | 11 + .../mobile_js_redirect.libraries.yml | 7 + .../mobile_js_redirect.links.menu.yml | 6 + .../mobile_js_redirect.module | 90 +++++ .../mobile_js_redirect.routing.yml | 7 + .../src/Form/MobileJsRedirectAdminForm.php | 87 +++++ .../src/Tests/MobileJsRedirectTests.php | 89 +++++ sites/default/config/sync/core.extension.yml | 1 + .../sync/mobile_js_redirect.settings.yml | 2 + 13 files changed, 699 insertions(+) create mode 100644 sites/all/modules/contrib/dev/mobile_js_redirect/LICENSE.txt create mode 100644 sites/all/modules/contrib/dev/mobile_js_redirect/README.txt create mode 100644 sites/all/modules/contrib/dev/mobile_js_redirect/cia_report_mstr_persona_trn.csv_.gztmp create mode 100644 sites/all/modules/contrib/dev/mobile_js_redirect/js/mobile_js_redirect.js create mode 100644 sites/all/modules/contrib/dev/mobile_js_redirect/mobile_js_redirect.info.yml create mode 100644 sites/all/modules/contrib/dev/mobile_js_redirect/mobile_js_redirect.libraries.yml create mode 100755 sites/all/modules/contrib/dev/mobile_js_redirect/mobile_js_redirect.links.menu.yml create mode 100755 sites/all/modules/contrib/dev/mobile_js_redirect/mobile_js_redirect.module create mode 100755 sites/all/modules/contrib/dev/mobile_js_redirect/mobile_js_redirect.routing.yml create mode 100755 sites/all/modules/contrib/dev/mobile_js_redirect/src/Form/MobileJsRedirectAdminForm.php create mode 100644 sites/all/modules/contrib/dev/mobile_js_redirect/src/Tests/MobileJsRedirectTests.php create mode 100644 sites/default/config/sync/mobile_js_redirect.settings.yml diff --git a/sites/all/modules/contrib/dev/mobile_js_redirect/LICENSE.txt b/sites/all/modules/contrib/dev/mobile_js_redirect/LICENSE.txt new file mode 100644 index 000000000..d159169d1 --- /dev/null +++ b/sites/all/modules/contrib/dev/mobile_js_redirect/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. + + + Copyright (C) + + 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. + + , 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/contrib/dev/mobile_js_redirect/README.txt b/sites/all/modules/contrib/dev/mobile_js_redirect/README.txt new file mode 100644 index 000000000..65243a7fc --- /dev/null +++ b/sites/all/modules/contrib/dev/mobile_js_redirect/README.txt @@ -0,0 +1,14 @@ +This is a simple module that adds a JS in the HTML head to perform a redirect +from a desktop site URL to a mobile one or the other way around. This is +useful when Varnish or any other reverse proxy cache is being used to cache +your site and keep a mobile vs desktop redirect working. + +Install this module like any other module and set the "Desktop site URL" and +"Mobile site URL" for this to work. + +To be able to access the administrative area or avoid redirection at any point, +use the query string below: + +?stopredirect=true + +URL settings - /admin/config/system/mobile_js_redirect diff --git a/sites/all/modules/contrib/dev/mobile_js_redirect/cia_report_mstr_persona_trn.csv_.gztmp b/sites/all/modules/contrib/dev/mobile_js_redirect/cia_report_mstr_persona_trn.csv_.gztmp new file mode 100644 index 000000000..e69de29bb diff --git a/sites/all/modules/contrib/dev/mobile_js_redirect/js/mobile_js_redirect.js b/sites/all/modules/contrib/dev/mobile_js_redirect/js/mobile_js_redirect.js new file mode 100644 index 000000000..7afe89c0c --- /dev/null +++ b/sites/all/modules/contrib/dev/mobile_js_redirect/js/mobile_js_redirect.js @@ -0,0 +1,46 @@ +/** + * @file + * Client-side Javascript routine for Mobile JS Redirect module. + */ + +var mobile_pattern = new RegExp(mobile_js_redirect_devices_regexp, 'i'); +var mobile = (mobile_pattern.test(navigator.userAgent.toLowerCase())); + +// Both of these variables have to be set for this mechanism to work. +// If this plugin is being used by a Drupal Gardens site, we can simply +// set these variables manually and upload this file to the site. +var target_url = mobile_js_redirect_target_url; +var mobile_url = mobile_js_redirect_mobile_url; +var desktop_url = mobile_js_redirect_desktop_url; + +// Check whether the noRedirect flag is set. +var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&'); +var no_redirect = false; +var secure = (window.location.protocol == "https:") ? true : false; +for (var i = 0; i < hashes.length; i++) { + var hash = hashes[i].split('='); + if (hash[0] != null && hash[0] == 'stopredirect' && hash[1] != null && hash[1] == 'true') { + no_redirect = true; + // Add session cookie to stop future redirect. + jQuery.cookie('mobile_js_redirect.stopredirect', 1, { path: '/', secure: secure }); + break; + } + else if (jQuery.cookie('mobile_js_redirect.stopredirect') == 1) { + no_redirect = true; + } +} + +if (mobile_url != null && desktop_url != null && !no_redirect) { + // Remove protocol and path. + var regex = /[\/:?#]/; + var url_parts = target_url.replace('http://', '').replace('https://', '').split(regex); + + if (mobile && window.location.hostname == url_parts[0]) { + // The device is mobile but the URL is desktop, so redirect. + document.location = mobile_url; + } + else if (!mobile && window.location.hostname == url_parts[0]) { + // The device is desktop but the URL is mobile, so redirect. + document.location = desktop_url; + } +} diff --git a/sites/all/modules/contrib/dev/mobile_js_redirect/mobile_js_redirect.info.yml b/sites/all/modules/contrib/dev/mobile_js_redirect/mobile_js_redirect.info.yml new file mode 100644 index 000000000..32ae77f5c --- /dev/null +++ b/sites/all/modules/contrib/dev/mobile_js_redirect/mobile_js_redirect.info.yml @@ -0,0 +1,11 @@ +name: 'Mobile JS Redirect' +type: module +description: 'Client-side redirect based on the user-agent string.' +# core: 8.x +configure: 'admin/config/system/mobile_js_redirect' + +# Information added by Drupal.org packaging script on 2016-11-30 +version: '8.x-1.0-beta1' +core: '8.x' +project: 'mobile_js_redirect' +datestamp: 1480536188 diff --git a/sites/all/modules/contrib/dev/mobile_js_redirect/mobile_js_redirect.libraries.yml b/sites/all/modules/contrib/dev/mobile_js_redirect/mobile_js_redirect.libraries.yml new file mode 100644 index 000000000..c64108260 --- /dev/null +++ b/sites/all/modules/contrib/dev/mobile_js_redirect/mobile_js_redirect.libraries.yml @@ -0,0 +1,7 @@ +mobile-js-redirect-js: + version: 1.x + js: + js/mobile_js_redirect.js: {} + dependencies: + - core/jquery + - core/jquery.cookie diff --git a/sites/all/modules/contrib/dev/mobile_js_redirect/mobile_js_redirect.links.menu.yml b/sites/all/modules/contrib/dev/mobile_js_redirect/mobile_js_redirect.links.menu.yml new file mode 100755 index 000000000..e89ed648b --- /dev/null +++ b/sites/all/modules/contrib/dev/mobile_js_redirect/mobile_js_redirect.links.menu.yml @@ -0,0 +1,6 @@ +system.mobile_js_redirect_admin: + title: 'Mobile JS Redirect' + parent: system.admin_config_system + description: 'Manage the Mobile JS Redirect Settings.' + route_name: mobile_js_redirect.admin_form + weight: 30 diff --git a/sites/all/modules/contrib/dev/mobile_js_redirect/mobile_js_redirect.module b/sites/all/modules/contrib/dev/mobile_js_redirect/mobile_js_redirect.module new file mode 100755 index 000000000..d9873f11c --- /dev/null +++ b/sites/all/modules/contrib/dev/mobile_js_redirect/mobile_js_redirect.module @@ -0,0 +1,90 @@ + 'html_tag', + '#tag' => 'script', + '#value' => mobile_js_get_urls(), + ], + 'mobile-js-redirect-js', + ]; +} + +/** + * Get URLs for use on JS file. + */ +function mobile_js_get_urls() { + + global $base_root; + $urls = \Drupal::config('mobile_js_redirect.settings')->get('mobile_js_redirect_urls'); + $current_url = $base_root . \Drupal::request()->getRequestUri(); + $current_devices_list = (!empty(\Drupal::config('mobile_js_redirect.settings')->get('mobile_js_redirect_regexp_devices_list'))) ? \Drupal::config('mobile_js_redirect.settings')->get('mobile_js_redirect_regexp_devices_list') : MOBILE_JS_REDIRECT_REGEXP_DEVICES_LIST; + $devices_list = Html::escape($current_devices_list); + + // Set default values. + $javascript = "var mobile_js_redirect_target_url = '';"; + $javascript .= "var mobile_js_redirect_desktop_url = '';"; + $javascript .= "var mobile_js_redirect_mobile_url = '';"; + + $urls_arr = explode(PHP_EOL, $urls); + + foreach ($urls_arr as $value) { + + $url_line = explode('|', $value); + $last_char = substr($url_line[0], -1); + + if ($last_char == '*') { + $trated_url = substr($url_line[0], 0, -1); + if (strpos($current_url, $trated_url) !== FALSE) { + $javascript = mobile_js_update_urls($url_line); + break; + } + } + + if ($url_line[0] == $current_url || $url_line[0] . '/' == $current_url) { + $javascript = mobile_js_update_urls($url_line); + break; + } + } + $javascript .= "var mobile_js_redirect_devices_regexp = '$devices_list';"; + + return $javascript; +} + +/** + * Update URL values. + */ +function mobile_js_update_urls($url_array) { + $target_url = (!empty($url_array[0])) ? $url_array[0] : ''; + $last_char = substr($url_array[0], -1); + + if ($last_char == '*') { + $target_url = substr($url_array[0], 0, -1); + } + + $url_desktop = (!empty($url_array[1])) ? $url_array[1] : ''; + $url_mobile = (!empty($url_array[2])) ? $url_array[2] : ''; + + $javascript = "var mobile_js_redirect_target_url = '$target_url';"; + $javascript .= "var mobile_js_redirect_desktop_url = '$url_desktop';"; + $javascript .= "var mobile_js_redirect_mobile_url = '$url_mobile';"; + + return $javascript; +} diff --git a/sites/all/modules/contrib/dev/mobile_js_redirect/mobile_js_redirect.routing.yml b/sites/all/modules/contrib/dev/mobile_js_redirect/mobile_js_redirect.routing.yml new file mode 100755 index 000000000..2ce385634 --- /dev/null +++ b/sites/all/modules/contrib/dev/mobile_js_redirect/mobile_js_redirect.routing.yml @@ -0,0 +1,7 @@ +mobile_js_redirect.admin_form: + path: '/admin/config/system/mobile_js_redirect' + defaults: + _title: 'Mobile JS Redirect Settings' + _form: '\Drupal\mobile_js_redirect\Form\MobileJsRedirectAdminForm' + requirements: + _permission: 'administer site configuration' diff --git a/sites/all/modules/contrib/dev/mobile_js_redirect/src/Form/MobileJsRedirectAdminForm.php b/sites/all/modules/contrib/dev/mobile_js_redirect/src/Form/MobileJsRedirectAdminForm.php new file mode 100755 index 000000000..82f28c5bf --- /dev/null +++ b/sites/all/modules/contrib/dev/mobile_js_redirect/src/Form/MobileJsRedirectAdminForm.php @@ -0,0 +1,87 @@ +config('mobile_js_redirect.settings'); + $form['site_urls'] = array( + '#type' => 'fieldset', + '#title' => t('Site URLs'), + '#description' => t('Mobile and Desktop sites URLs - Please read the instructions below the textarea.'), + ); + + $form['site_urls']['mobile_js_redirect_urls'] = array( + '#type' => 'textarea', + '#description' => t('- Put each group of urls on a line separated by | character (pipe) without spaces like: TARGET URL|DESKTOP URL|MOBILE URL.
- You can use the * character (asterisk) as a wildcard on target url.
- If you wont redirect one of these (desktop or mobile) leave blank.
- The redirect occurrs on the first "true" match.'), + '#default_value' => $config->get('mobile_js_redirect_urls'), + '#attributes' => array('placeholder' => array('Target URL|Desktop URL|Mobile URL')), + '#size' => 10, + '#resizable' => FALSE, + ); + + $form['devices_list'] = array( + '#type' => 'fieldset', + '#title' => t('Devices List'), + '#description' => t('Enter list of User Agent device names which should be recognized as mobile devices.
The default list Devices List is: iphone|ipad|ipod|android|blackberry|mini|windowssce|iemobile|palm'), + ); + + $form['devices_list']['mobile_js_redirect_regexp_devices_list'] = array( + '#type' => 'textfield', + '#description' => t('Use | for separation.'), + '#default_value' => (!empty($config->get('mobile_js_redirect_regexp_devices_list'))) ? $config->get('mobile_js_redirect_regexp_devices_list') : MOBILE_JS_REDIRECT_REGEXP_DEVICES_LIST, + ); + + return parent::buildForm($form, $form_state); + } + + /** + * {@inheritdoc} + */ + public function validateForm(array &$form, FormStateInterface $form_state) { + if (empty($form_state->getValue('mobile_js_redirect_regexp_devices_list'))) { + $form_state->setErrorByName('mobile_js_redirect_regexp_devices_list', $this->t('The device list is empty. Please fill the Device list to continue.')); + } + } + + /** + * {@inheritdoc} + */ + public function submitForm(array &$form, FormStateInterface $form_state) { + $config = $this->config('mobile_js_redirect.settings'); + foreach ($form_state->getValues() as $key => $value) { + if (strpos($key, 'mobile_js_redirect_') !== FALSE) { + $config->set($key, $value); + } + } + + $config->save(); + + drupal_set_message($this->t('Mobile Js Redirect configuration has been saved.')); + } + +} diff --git a/sites/all/modules/contrib/dev/mobile_js_redirect/src/Tests/MobileJsRedirectTests.php b/sites/all/modules/contrib/dev/mobile_js_redirect/src/Tests/MobileJsRedirectTests.php new file mode 100644 index 000000000..8082d0eaa --- /dev/null +++ b/sites/all/modules/contrib/dev/mobile_js_redirect/src/Tests/MobileJsRedirectTests.php @@ -0,0 +1,89 @@ +user = $this->DrupalCreateUser(array( + 'administer site configuration', + )); + } + + /** + * {@inheritdoc} + */ + public function testMobileJsRedirectPageExists() { + + $this->drupalLogin($this->user); + + // Generator test: + $this->drupalGet('admin/config/system/mobile_js_redirect'); + $this->assertResponse(200); + } + + /** + * {@inheritdoc} + */ + public function testConfigForm() { + + // Test form structure. + $this->drupalLogin($this->user); + $this->drupalGet('admin/config/system/mobile_js_redirect'); + $this->assertResponse(200); + $config = $this->config('mobile_js_redirect.settings'); + $this->assertFieldByName( + 'mobile_js_redirect_urls', + $config->get('mobile_js_redirect_urls'), + 'Page title field has the default value' + ); + $this->assertFieldByName( + 'mobile_js_redirect_regexp_devices_list', + $config->get('mobile_js_redirect_regexp_devices_list'), + 'Page title field has the default value' + ); + + $this->drupalPostForm(NULL, array( + 'mobile_js_redirect_urls' => 'targetexample|desktopredirect|mobileredirect', + 'mobile_js_redirect_regexp_devices_list' => 'iphone|ipad|ipod|android|blackberry|mini|windowssce|iemobile|palm', + ), t('Save configuration')); + + $this->drupalGet('admin/config/system/mobile_js_redirect'); + $this->assertResponse(200); + $this->assertFieldByName( + 'mobile_js_redirect_urls', + 'targetexample|desktopredirect|mobileredirect', + 'URLs text is OK.' + ); + $this->assertFieldByName( + 'mobile_js_redirect_regexp_devices_list', + 'iphone|ipad|ipod|android|blackberry|mini|windowssce|iemobile|palm', + 'Devices List text is OK.' + ); + } + +} diff --git a/sites/default/config/sync/core.extension.yml b/sites/default/config/sync/core.extension.yml index b20c93e64..35a5df4be 100644 --- a/sites/default/config/sync/core.extension.yml +++ b/sites/default/config/sync/core.extension.yml @@ -67,6 +67,7 @@ module: migrate_drupal: 0 migrate_plus: 0 migrate_tools: 0 + mobile_js_redirect: 0 module_missing_message_fixer: 0 node: 0 options: 0 diff --git a/sites/default/config/sync/mobile_js_redirect.settings.yml b/sites/default/config/sync/mobile_js_redirect.settings.yml new file mode 100644 index 000000000..527986535 --- /dev/null +++ b/sites/default/config/sync/mobile_js_redirect.settings.yml @@ -0,0 +1,2 @@ +mobile_js_redirect_urls: "*|https://encyclopediedelaparole.org|https://m.encyclopediedelaparole.org\r\n*|https://edlp.figli.org|https://m.edlp.figli.org\r\n*|https://dev.encyclopediedelaparole.org|https://dev.m.encyclopediedelaparole.org" +mobile_js_redirect_regexp_devices_list: iphone|ipad|ipod|android|blackberry|mini|windowssce|iemobile|palm