From 9777b4c1ba840b6fa838e27e0d8e7da240276d4e Mon Sep 17 00:00:00 2001 From: Manuel Cillero Date: Thu, 5 Oct 2017 19:38:44 +0200 Subject: [PATCH] Added info about cookies --- config/CHANGELOG.md | 2 + config/default/default.settings.php | 3 + modules/eu-cookie-compliance/LICENSE.txt | 339 ------------------ modules/eu-cookie-compliance/README.txt | 52 --- .../css/eu_cookie_compliance.css | 8 +- .../eu_cookie_compliance.info | 2 +- .../eu_cookie_compliance.module | 24 +- modules/storm/storm.admin.inc | 42 +++ modules/storm/storm.module | 32 +- 9 files changed, 87 insertions(+), 417 deletions(-) delete mode 100755 modules/eu-cookie-compliance/LICENSE.txt delete mode 100644 modules/eu-cookie-compliance/README.txt diff --git a/config/CHANGELOG.md b/config/CHANGELOG.md index 6c4a7b1..33ce19c 100644 --- a/config/CHANGELOG.md +++ b/config/CHANGELOG.md @@ -14,6 +14,7 @@ Initial release based on Drupal 6.38 (2016-02-24) with modules: + Computed Field 6.x-1.0 + Content Taxonomy 6.x-1.0-rc2 + FileField 6.x-3.14 + + Imagefield 6.x-3.11 + Link 6.x-2.11 + Viewfield 6.x-2.0 @@ -27,6 +28,7 @@ Initial release based on Drupal 6.38 (2016-02-24) with modules: + Custom Error 6.x-1.4 + Diff 6.x-2.3 + Extended Path Aliases 6.x-1.3 + + EU Cookie Compliance 6.x-1-10 + Frequently Asked Questions 6.x-1.13 + Lexicon 6.x-1.4 + Link checker 6.x-2.9 diff --git a/config/default/default.settings.php b/config/default/default.settings.php index 942cd15..33fcd73 100644 --- a/config/default/default.settings.php +++ b/config/default/default.settings.php @@ -75,6 +75,9 @@ $conf = array( # 'reverse_proxy' => TRUE, # 'reverse_proxy_addresses' => array('a.b.c.d', ...), +// EU Cookie Compliance (uncomment to activate popup): +# 'eu_cookie_compliance' => 1, + // Secure Pages (uncomment to deactivate secure pages SSL module): # 'securepages_enable' => 0, diff --git a/modules/eu-cookie-compliance/LICENSE.txt b/modules/eu-cookie-compliance/LICENSE.txt deleted file mode 100755 index d159169..0000000 --- a/modules/eu-cookie-compliance/LICENSE.txt +++ /dev/null @@ -1,339 +0,0 @@ - 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/modules/eu-cookie-compliance/README.txt b/modules/eu-cookie-compliance/README.txt deleted file mode 100644 index 38c7b34..0000000 --- a/modules/eu-cookie-compliance/README.txt +++ /dev/null @@ -1,52 +0,0 @@ -EU Cookie Compliance 6.x - 1.x -============================== - -This module intends to deal with the EU Directive on Privacy and Electronic -Communications that comes into effect on 26th May 2012. -From that date, if you are not compliant or visibly working towards compliance, -you run the risk of enforcement action, which can include a fine of up to -half a million pounds for a serious breach. - -How it works. -============= - -The module displays a pup-up at the bottom or at the top of website to make -users aware of the fact that cookies are being set. The user may then give -his/her consent or move to a page that provides more details. Consent is given -by user pressing the agree buttons or by continuing browsing the website. Once -consent is given another pop-up appears with a thank you message. - -The module provides a settings page where the pop-up can be customised. There -are also template files for the pop-ups that can be overridden by your theme. - -Installation. -============= - -1. Unzip the files to the "sites/all/modules" directory and enable the module. - -2. If desired, give the administer EU Cookie Compliance popup permissions that -allow users of certain roles access the administration page. You can do so on -the admin/user/permissions page. - - - there is also a 'see EU Cookie Compliance popup' permission that helps - you show the popup to the roles you desire - -3. You may want to create a page that would explain how your site uses cookies. -Alternatively, if you have a privacy policy, you can link the pop-up to that -page (see next step). - -4. Go to the admin/settings/eu-cookie-compliance page to configure and enable -the pop-up - -5. If you want to theme your pop-up override the themes in the template file. - -NOTICE: The module does not audit your cookies nor does it prevent cookies -from being set. - -For developers. -=============== - -If you want to conditionally set cookies in your module, there is a javascript -function provided that returns TRUE if the current user has given his consent: - -Drupal.eu_cookie_compliance.hasAgreed() diff --git a/modules/eu-cookie-compliance/css/eu_cookie_compliance.css b/modules/eu-cookie-compliance/css/eu_cookie_compliance.css index 78acd50..13df99d 100644 --- a/modules/eu-cookie-compliance/css/eu_cookie_compliance.css +++ b/modules/eu-cookie-compliance/css/eu_cookie_compliance.css @@ -23,7 +23,8 @@ display: inline-block; margin: 0 auto; padding: 0; - width: 1076px; + width: 100%; + max-width: 999px; } #sliding-popup .popup-content #popup-buttons { @@ -75,9 +76,10 @@ color: #fff; float: left; font-weight: bold; - margin: 5px 0 5px 50px; + margin: 5px 0 5px 34px; + padding-right: 34px; text-align: left; - width: 600px; + max-width: 600px; } #sliding-popup .popup-content #popup-text h2, diff --git a/modules/eu-cookie-compliance/eu_cookie_compliance.info b/modules/eu-cookie-compliance/eu_cookie_compliance.info index f8955f5..ca3a93a 100644 --- a/modules/eu-cookie-compliance/eu_cookie_compliance.info +++ b/modules/eu-cookie-compliance/eu_cookie_compliance.info @@ -1,5 +1,6 @@ name = EU Cookie Compliance description = This module aims at making the website compliant with the new EU cookie regulation +package = Core - extended core = 6.x ; Information added by Drupal.org packaging script on 2014-05-19 @@ -7,4 +8,3 @@ version = "6.x-1.10" core = "6.x" project = "eu-cookie-compliance" datestamp = "1400501930" - diff --git a/modules/eu-cookie-compliance/eu_cookie_compliance.module b/modules/eu-cookie-compliance/eu_cookie_compliance.module index 2e04f0a..ac2b02e 100644 --- a/modules/eu-cookie-compliance/eu_cookie_compliance.module +++ b/modules/eu-cookie-compliance/eu_cookie_compliance.module @@ -11,6 +11,7 @@ * Implements hook_menu(). */ function eu_cookie_compliance_menu() { + $items = array(); $items['admin/settings/eu-cookie-compliance'] = array( 'title' => 'EU Cookie Compliance', 'description' => 'Make your website compliant with the EU Directive on Privacy and Electronic Communications.', @@ -27,8 +28,7 @@ function eu_cookie_compliance_menu() { * Implements hook_init(). */ function eu_cookie_compliance_init() { - $enabled = eu_cookie_compliance_get_settings('popup_enabled'); - if ($enabled && user_access( 'see EU Cookie Compliance popup' ) ) { + if (eu_cookie_compliance_enabled()) { $path = drupal_get_path('module', 'eu_cookie_compliance'); drupal_add_css($path . '/css/eu_cookie_compliance.css'); drupal_add_js($path . '/js/eu_cookie_compliance.js', 'module', 'footer'); @@ -38,11 +38,10 @@ function eu_cookie_compliance_init() { /** * Implements hook_footer(). */ - function eu_cookie_compliance_footer() { - $popup_settings = eu_cookie_compliance_get_settings(); - if (!empty($popup_settings['popup_enabled']) && user_access( 'see EU Cookie Compliance popup' )) { + if (eu_cookie_compliance_enabled()) { global $language; + $popup_settings = eu_cookie_compliance_get_settings(); $popup_text_info = str_replace(array("\r", "\n"), '', $popup_settings['popup_info']['value']); $popup_text_agreed = str_replace(array("\r", "\n"), '', $popup_settings['popup_agreed']['value']); $html_info = theme('eu_cookie_compliance_popup_info', check_markup($popup_text_info, $popup_settings['popup_info']['format'], FALSE),$popup_settings['popup_agree_button_message'],$popup_settings['popup_disagree_button_message']); @@ -95,6 +94,21 @@ function eu_cookie_compliance_theme() { ); } +/** + * Return true if EU Cookie compliance is enabled; false in other case. + */ +function eu_cookie_compliance_enabled() { + global $conf; + if (!empty($conf['eu_cookie_compliance']) && $conf['eu_cookie_compliance']) { + if (eu_cookie_compliance_get_settings('popup_enabled')) { + if (user_access('see EU Cookie Compliance popup')) { + return true; + } + } + } + return false; +} + /** * * Retrieves settings from the database for a current language. diff --git a/modules/storm/storm.admin.inc b/modules/storm/storm.admin.inc index b4b21d3..802163c 100644 --- a/modules/storm/storm.admin.inc +++ b/modules/storm/storm.admin.inc @@ -554,3 +554,45 @@ function _storm_attribute_domain_autocomplete($string = '') { drupal_json($matches); } + +function storm_cookies_page() { + $breadcrumb = array(); + drupal_set_breadcrumb($breadcrumb); + drupal_set_title(t('About Cookies')); + $output = '

' . + t("This website uses cookies to differentiate between distinct users who access it. A cookie is a small alpha-numeric archive which is stored on the hard drive or in the browser of a computer, tablet, smartphone or similar device when it browses the internet. Cookies allow us to offer relevant information on our products and services and to provide you with a good experience when you browse the website.") . + '

' . + t("None of our cookies store any personal information such as your name or address. Please be aware that restricting cookies may impact on the functionality of this site.") . + '

'; + $output .= '

' . + t("TYPES OF COOKIES") . + '

' . + t("According to the type of organisation which administers them") . + '

' . + '' . t("First party cookies") . ': ' . t("installed by this website.") . + '

' . + '' . t("Third party cookies") . ': ' . t("installed by other websites, or links which users can use to share content. A user accessing such content from this website may have cookies added from these third parties. It's not posible to control these third party cookies and so the user must review the cookie policies of these other websites for further information.") . + '

' . + t("According to the length of time they remain active in the user’s system") . + '

' . + '' . t("Session cookies") . ': ' . t("collect and store data only whilst the user is visiting the website.") . + '

' . + '' . t("Persistent cookies") . ': ' . t("remain stored in a computer and may be accessed and managed by the organisation responsible for the cookie for a specific length of time, or until the user deletes it.") . + '

' . + t("According to the purpose for which data are collected through the cookies") . + '

' . + '' . t("Technical cookies") . ': ' . t("allow the user to make use of the different options they facilitate: for example controlling data traffic and communication, identifying a session, accessing restricted areas, carrying out a purchase, requesting a subscription or participating in an event etc.") . + '

' . + '' . t("Personalisation cookies") . ': ' . t("allow the user to access services with certain personalised characteristics such as language, browser type, configuration for the region from which the user accesses services etc") . + '

' . + '' . t("Analytical cookies") . ': ' . t("allow website managers to follow and analyse the behaviour of users on a website so that they can make improvements informed by data analysis on the use of the website by users of its services.") . + '

' . + '' . t("Advertising cookies") . ': ' . t("help with the management of advertising spaces which a web editor has included on a website where services are offered, based on criteria such as the type of content or the frequency with which the content is shown.") . + '

'; + $output .= '

' . + t("TURNING OFF COOKIES") . + '

' . + t("You can block cookies by activating the setting on your browser that allows you to refuse the setting of all or some cookies. However, if you use your browser settings to block all cookies (including essential cookies) you may not be able to access all or parts of our site or any other websites that you visit.") . + '

'; + return $output; +} diff --git a/modules/storm/storm.module b/modules/storm/storm.module index 6b05300..3271779 100644 --- a/modules/storm/storm.module +++ b/modules/storm/storm.module @@ -508,7 +508,7 @@ function storm_init() { function storm_menu() { $items = array(); - // Redirect to SuiteCRM: + // Redirect to SuiteCRM. $items['suitecrm'] = array( 'title' => 'SuiteCRM', 'page callback' => 'storm_suitecrm_callback', @@ -516,6 +516,7 @@ function storm_menu() { 'type' => MENU_CALLBACK, ); + // SuiteDesk options. $dashboard_types = module_invoke_all('storm_dashboard_types'); foreach ($dashboard_types as $type => $type_info) { if (isset($type_info['url'])) { @@ -568,6 +569,7 @@ function storm_menu() { 'type' => MENU_CALLBACK, ); + // Admin options. $items['admin/settings/suitedesk'] = array( 'title' => 'SuiteDesk', 'description' => 'SuiteDesk administration page', @@ -576,7 +578,6 @@ function storm_menu() { 'access arguments' => array('Storm: access administration pages'), 'type' => MENU_NORMAL_ITEM, ); - $items['admin/settings/suitedesk/suitedesk'] = array( 'title' => 'SuiteDesk', 'description' => 'SuiteDesk administration page', @@ -584,7 +585,6 @@ function storm_menu() { 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -100, ); - $items['admin/settings/suitedesk/notify'] = array( 'title' => 'Notification settings', 'description' => 'Adjust settings for new SuiteDesk content notifications sent by e-mail.', @@ -594,7 +594,6 @@ function storm_menu() { 'access arguments' => array('Storm: administer notify'), 'type' => MENU_NORMAL_ITEM, ); - $items['admin/user/user/notify'] = array( 'title' => 'SuiteDesk notifications', 'page callback' => 'drupal_get_form', @@ -603,15 +602,8 @@ function storm_menu() { 'access arguments' => array('create users'), 'type' => MENU_LOCAL_TASK, ); -/* - $items['admin/settings/chamilo'] = array( - 'title' => 'Chamilo', - 'description' => 'Configure integration settings with Chamilo.', - 'page callback' => '_storm_chamilo_settings', - 'access callback' => 'user_access', - 'access arguments' => array('administer chamilo'), - ); -*/ + + // Attributes management. $items['attributes'] = array( 'title' => 'Attributes', 'description' => 'SuiteDesk attributes', @@ -621,7 +613,6 @@ function storm_menu() { 'type' => MENU_NORMAL_ITEM, 'weight' => 11, ); - $items['attributes/add'] = array( 'title' => 'Add a new attribute', 'description' => 'SuiteDesk attributes', @@ -631,7 +622,6 @@ function storm_menu() { 'file' => 'storm.admin.inc', 'type' => MENU_CALLBACK, ); - $items['attributes/edit/%'] = array( 'title' => 'Edit an attribute', 'description' => 'SuiteDesk attributes', @@ -641,7 +631,6 @@ function storm_menu() { 'file' => 'storm.admin.inc', 'type' => MENU_CALLBACK, ); - $items['attributes/delete/%'] = array( 'title' => 'Delete an attribute', 'description' => 'SuiteDesk attributes', @@ -651,7 +640,6 @@ function storm_menu() { 'file' => 'storm.admin.inc', 'type' => MENU_CALLBACK, ); - $items['storm/attributes/domain/autocomplete'] = array( 'title' => 'List of attributes', 'description' => 'SuiteDesk attributes', @@ -662,6 +650,7 @@ function storm_menu() { 'type' => MENU_CALLBACK, ); + // User notifications. $items['user/%user/notify'] = array( 'title' => 'Notifications', 'page callback' => 'drupal_get_form', @@ -670,6 +659,15 @@ function storm_menu() { 'type' => MENU_LOCAL_TASK, ); + // Info about cookies: + $items['about/cookies'] = array( + 'title' => 'About Cookies', + 'page callback' => 'storm_cookies_page', + 'access callback' => TRUE, + 'file' => 'storm.admin.inc', + 'type' => MENU_CALLBACK, + ); + return $items; }