diff -Nurd cookiecontrol.orig/cookiecontrol.admin.inc cookiecontrol/cookiecontrol.admin.inc --- cookiecontrol.orig/cookiecontrol.admin.inc 2012-10-04 15:42:06.000000000 +0200 +++ cookiecontrol/cookiecontrol.admin.inc 2012-10-05 17:33:56.000000000 +0200 @@ -16,11 +16,31 @@ function cookiecontrol_admin_settings() { $form = array(); $path = drupal_get_path('module', 'cookiecontrol'); + + $form['model'] = array( + '#type' => 'fieldset', + '#title' => t('Consent Model'), + '#collapsible' => true, + ); + + $form['model']['cookiecontrol_model'] = array( + '#type' => 'radios', + '#title' => t('Model'), + '#description' => t("Choose the cookie consent model you want to use."), + '#default_value' => variable_get('cookiecontrol_model', 'explicit'), + '#options' => array( + 'information' => t('Information Only'), + 'implicit' => t('Implicit'), + 'explicit' => t('Explicit'), + ) + ); $form['interface'] = array( '#type' => 'fieldset', '#title' => t('User Interface'), + '#collapsible' => true, ); + $form['interface']['cookiecontrol_text'] = array( '#type' => 'textarea', '#title' => t('Introduction Text'), @@ -51,7 +71,13 @@ $form['interface']['cookiecontrol_privacynode']['#field_suffix'] = l(t('View existing privacy policy page'), 'node/' . $cookiecontrol_privacynode, array('attributes' => array('target' => 'new'))); } - $form['interface']['cookiecontrol_shape'] = array( + $form['interface']['icon'] = array( + '#type' => 'fieldset', + '#title' => t('Icon'), + '#collapsible' => true, + ); + + $form['interface']['icon']['cookiecontrol_shape'] = array( '#type' => 'radios', '#title' => t('Icon Shape'), '#description' => t("The icon will be anchored to the corner of the viewport and won't scroll with your web page."), @@ -62,7 +88,7 @@ ) ); - $form['interface']['cookiecontrol_position'] = array( + $form['interface']['icon']['cookiecontrol_position'] = array( '#type' => 'radios', '#title' => t('Icon Position'), '#description' => t("Choose whether you'd like your icon to appear on the bottom left or botom right of the browser window."), @@ -73,7 +99,7 @@ ) ); - $form['interface']['cookiecontrol_theme'] = array( + $form['interface']['icon']['cookiecontrol_theme'] = array( '#type' => 'radios', '#title' => t('Colour theme'), '#description' => t("Choose the colour set used on the widget. Selecting a contrast to your theme will help visitors see the pop-up."), @@ -84,17 +110,20 @@ ) ); - $form['visibility'] = array( + $form['interface']['visibility'] = array( '#type' => 'fieldset', '#title' => t('Visibility'), + '#collapsible' => true, ); - $form['visibility']['cookiecontrol_startopen'] = array( + + $form['interface']['visibility']['cookiecontrol_startopen'] = array( '#type' => 'checkbox', '#title' => t('Open the cookie information on page load.'), '#default_value' => variable_get('cookiecontrol_startopen', TRUE), '#description' => t('Visitors to the site will see the pop-up at the bottom of their browser on every page load until they acknowledge the pop-up.') ); - $form['visibility']['cookiecontrol_timeout'] = array( + + $form['interface']['visibility']['cookiecontrol_timeout'] = array( '#type' => 'textfield', '#size' => 5, '#title' => t('Automatic Hide Timeout'), @@ -103,13 +132,15 @@ '#description' => t("How long to keep the information pop-up displayed before it is automatically hidden. Once hidden the information can be accessed by clicking on the icon in the corner."), '#required' => FALSE, ); - $form['visibility']['cookiecontrol_hideonaccept'] = array( + + $form['interface']['visibility']['cookiecontrol_hideonaccept'] = array( '#type' => 'checkbox', '#title' => t('Hide cookie control icon after accepted'), '#default_value' => variable_get('cookiecontrol_hideonaccept', FALSE), '#description' => t('Visitors who have given consent will not see the icon in the corner of their browser. This works by setting an additional cookie to keep the icon hidden. Changing this option later on will not affect existing visitors who have hidden their icon.') ); - $form['visibility']['cookiecontrol_countries'] = array( + + $form['interface']['visibility']['cookiecontrol_countries'] = array( '#type' => 'textfield', '#title' => t('Country Restriction'), '#default_value' => variable_get('cookiecontrol_countries', ''), @@ -143,6 +174,7 @@ * @return void */ function cookiecontrol_admin_settings_validate($form, &$form_state) { + // Attempt to load in a specified privacy policy node id if ($form_state['values']['cookiecontrol_privacynode'] > 0) { $node = node_load($form_state['values']['cookiecontrol_privacynode']); @@ -154,6 +186,11 @@ } // If the intro text is left blank we revert it to the default + if ($form_state['values']['cookiecontrol_model'] == '') { + form_set_value($form['type']['cookiecontrol_model'], 'explicit', $form_state); + } + + // If the intro text is left blank we revert it to the default if ($form_state['values']['cookiecontrol_text'] == '') { form_set_value($form['interface']['cookiecontrol_text'], COOKIECONTROL_TEXT, $form_state); } diff -Nurd cookiecontrol.orig/cookiecontrol.info cookiecontrol/cookiecontrol.info --- cookiecontrol.orig/cookiecontrol.info 2012-10-04 15:42:06.000000000 +0200 +++ cookiecontrol/cookiecontrol.info 2012-10-05 17:34:40.000000000 +0200 @@ -6,7 +6,7 @@ configure = admin/config/people/cookiecontrol -scripts[] = js/cookieControl-4.1.min.js +scripts[] = js/cookieControl-5.1.min.js ; Information added by drupal.org packaging script on 2012-05-25 version = "7.x-1.5" core = "7.x" diff -Nurd cookiecontrol.orig/cookiecontrol.info.orig cookiecontrol/cookiecontrol.info.orig --- cookiecontrol.orig/cookiecontrol.info.orig 1970-01-01 01:00:00.000000000 +0100 +++ cookiecontrol/cookiecontrol.info.orig 2012-10-05 17:26:56.000000000 +0200 @@ -0,0 +1,15 @@ +; $Id$ +name = "Cookie Control" +description = "Enables you to comply with UK and EU law on cookies" + +core = 7.x + +configure = admin/config/people/cookiecontrol + +scripts[] = js/cookieControl-4.1.min.js +; Information added by drupal.org packaging script on 2012-05-25 +version = "7.x-1.5" +core = "7.x" +project = "cookiecontrol" +datestamp = "1337978455" + diff -Nurd cookiecontrol.orig/cookiecontrol.module cookiecontrol/cookiecontrol.module --- cookiecontrol.orig/cookiecontrol.module 2012-10-04 15:42:06.000000000 +0200 +++ cookiecontrol/cookiecontrol.module 2012-10-05 17:33:56.000000000 +0200 @@ -9,8 +9,8 @@ * @author: Mike Carter */ -define('COOKIECONTROL_TEXT', '

' . t('This site uses cookies to store information on your computer.') . '

'); -define('COOKIECONTROL_FULLTEXT', '

' . t("Some cookies on this site are essential, and the site won't work as expected without them. These cookies are set when you submit a form, login or interact with the site by doing something that goes beyond clicking on simple links.") . '

' . t("We also use some non-essential cookies to anonymously track visitors or enhance your experience of the site. If you're not happy with this, we won't set these cookies but some nice features of the site may be unavailable.") . '

'); +define('COOKIECONTROL_TEXT', t('This site uses cookies to store information on your computer.') ); +define('COOKIECONTROL_FULLTEXT', t("Some cookies on this site are essential, and the site won't work as expected without them. These cookies are set when you submit a form, login or interact with the site by doing something that goes beyond clicking on simple links.") . '

' . t("We also use some non-essential cookies to anonymously track visitors or enhance your experience of the site. If you're not happy with this, we won't set these cookies but some nice features of the site may be unavailable.") ); /** * cookiecontrol_menu function. @@ -76,6 +76,7 @@ $cookiecontrol_countries = variable_get('cookiecontrol_countries', ''); $cookiecontrol_theme = variable_get('cookiecontrol_theme', 'dark'); $cookiecontrol_cookiename = cookiecontrol_generatesitecookie(); + $cookiecontrol_model = variable_get('cookiecontrol_model', 'explicit'); $cookiecontrol_settings = " jQuery(document).ready(function($) { @@ -87,6 +88,8 @@ shape: '{$cookiecontrol_shape}', startOpen: {$cookiecontrol_startopen}, autoHide: {$cookiecontrol_timeout}, + protectedCookies: [], + consentModel: '{$cookiecontrol_model}', onAccept: function(cc){cookiecontrol_accepted(cc)}, onReady: function(){}, onCookiesAllowed: function(cc){cookiecontrol_cookiesallowed(cc)}, @@ -99,6 +102,12 @@ }); }); "; + + /* + Need to add : + protectedCookies: [], //list the cookies you do not want deleted ['analytics', 'twitter'] + */ + // If country restrictions are specified include the required plugin if ($cookiecontrol_countries) { diff -Nurd cookiecontrol.orig/cookiecontrol.module.orig cookiecontrol/cookiecontrol.module.orig --- cookiecontrol.orig/cookiecontrol.module.orig 1970-01-01 01:00:00.000000000 +0100 +++ cookiecontrol/cookiecontrol.module.orig 2012-10-04 15:42:06.000000000 +0200 @@ -0,0 +1,240 @@ + + */ + +define('COOKIECONTROL_TEXT', '

' . t('This site uses cookies to store information on your computer.') . '

'); +define('COOKIECONTROL_FULLTEXT', '

' . t("Some cookies on this site are essential, and the site won't work as expected without them. These cookies are set when you submit a form, login or interact with the site by doing something that goes beyond clicking on simple links.") . '

' . t("We also use some non-essential cookies to anonymously track visitors or enhance your experience of the site. If you're not happy with this, we won't set these cookies but some nice features of the site may be unavailable.") . '

'); + +/** + * cookiecontrol_menu function. + * + * @access public + * @return void + */ +function cookiecontrol_menu() { + $items['admin/config/people/cookiecontrol'] = array( + 'title' => 'Cookie Control', + 'description' => 'Configure cookie notification pop-up.', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('cookiecontrol_admin_settings'), + 'access arguments' => array('administer users'), + 'file' => 'cookiecontrol.admin.inc', + 'weight' => 0, + ); + + return $items; +} + +function cookiecontrol_theme($existing, $type, $theme, $path) { + return array( + 'cookiecontrol' => array( + 'template' => 'cookiecontrol', + 'path' => drupal_get_path('module', 'cookiecontrol') . '/theme', + ), + ); +} + +/** + * cookiecontrol_generatesitecookie function + * Generates a clean string used for the sites cookie name + */ +function cookiecontrol_generatesitecookie() { + return drupal_clean_css_identifier(drupal_strtolower(variable_get('site_name', t('Drupal')))) . '_cookiecontrol'; +} + +/** + * cookiecontrol_preprocess_html function. + * + * @access public + * @param mixed &$variables + * @return void + */ +function cookiecontrol_preprocess_html(&$variables) { + // don't render on admin pages + if (strpos(current_path(), 'admin') === FALSE) { + + $cookiecontrol_text = addslashes(t(variable_get('cookiecontrol_text', COOKIECONTROL_TEXT))); + $cookiecontrol_fulltext = addslashes(t(variable_get('cookiecontrol_fulltext', COOKIECONTROL_FULLTEXT))); + + // Append the privacy policy link if available + if ($nid = variable_get('cookiecontrol_privacynode', '')) { + $cookiecontrol_fulltext .= t('

By using our site you accept the terms of our !privacynode.', array('!privacynode' => l('Privacy Policy', 'node/' . $nid))); + } + + $cookiecontrol_html = str_replace(array("\r\n", "\n", "\r", ' '), '', theme('cookiecontrol')); + $cookiecontrol_position = variable_get('cookiecontrol_position', 'left'); + $cookiecontrol_shape = variable_get('cookiecontrol_shape', 'triangle'); + $cookiecontrol_startopen = variable_get('cookiecontrol_startopen', TRUE) ? 'true' : 'false'; + $cookiecontrol_timeout = variable_get('cookiecontrol_timeout', '60') * 1000; // Convert seconds to microseconds + $cookiecontrol_countries = variable_get('cookiecontrol_countries', ''); + $cookiecontrol_theme = variable_get('cookiecontrol_theme', 'dark'); + $cookiecontrol_cookiename = cookiecontrol_generatesitecookie(); + + $cookiecontrol_settings = " + jQuery(document).ready(function($) { + cookieControl({ + introText: '{$cookiecontrol_text}', + fullText: '{$cookiecontrol_fulltext}', + theme: '{$cookiecontrol_theme}', + position: '{$cookiecontrol_position}', + shape: '{$cookiecontrol_shape}', + startOpen: {$cookiecontrol_startopen}, + autoHide: {$cookiecontrol_timeout}, + onAccept: function(cc){cookiecontrol_accepted(cc)}, + onReady: function(){}, + onCookiesAllowed: function(cc){cookiecontrol_cookiesallowed(cc)}, + onCookiesNotAllowed: function(cc){cookiecontrol_cookiesnotallowed(cc)}, + countries: '{$cookiecontrol_countries}', + subdomains: true, + html: '{$cookiecontrol_html}', + cookieName: '{$cookiecontrol_cookiename}', + iconStatusCookieName: 'ccShowCookieIcon' + }); + }); + "; + + // If country restrictions are specified include the required plugin + if ($cookiecontrol_countries) { + drupal_add_js('https://ssl.geoplugin.net/javascript.gp', array('type' => 'external')); + } + + drupal_add_js($cookiecontrol_settings, array( + 'type' => 'inline', + 'preprocess' => TRUE, + 'scope' => 'footer', + 'group' => JS_DEFAULT, + 'every_page' => TRUE, + 'cache' => TRUE, + )); + + // Set-up all the callback functions + cookiecontrol_onacceptance(); + cookiecontrol_cookiesallowed(); + cookiecontrol_cookiesnotallowed(); + } +} + +/** + * Build up a list of functions to call when a user accepts cookies for the first time + */ +function cookiecontrol_onacceptance() { + $callbacks = array(); + + // Include any callback javascript specified in the admin settings UI + if ($callbacklist = variable_get('cookiecontrol_onaccept', '')) { + $callbacks = array($callbacklist); + } + + // Hide the Cookie Control icon after acceptance + if (variable_get('cookiecontrol_hideonaccept', FALSE)) { + $callbacks[] = "cc.setCookie('ccShowCookieIcon', 'no');jQuery('#ccc-icon').hide();"; + } + + // Allow other modules to add their acceptance callback functions in + drupal_alter('cookieaccept', $callbacks); + + $cookiecontrol_acceptancecallback = "function cookiecontrol_accepted(cc) {\n" . implode("\n", $callbacks) . "\n}"; + + drupal_add_js($cookiecontrol_acceptancecallback, array( + 'type' => 'inline', + 'preprocess' => TRUE, + 'scope' => 'footer', + 'group' => JS_DEFAULT, + 'every_page' => TRUE, + 'cache' => TRUE, + )); +} + +/** + * Execute a series of callbacks if cookie consent has previously been granted by the visitor + */ +function cookiecontrol_cookiesallowed() { + $callbacks = array(); + + // Allow other modules to add their cookies allowed callback functions in + drupal_alter('cookiesallowed', $callbacks); + + $cookiecontrol_cookiesallowedcallback = "function cookiecontrol_cookiesallowed(cc) {\n" . implode("\n", $callbacks) . "\n}"; + + drupal_add_js($cookiecontrol_cookiesallowedcallback, array( + 'type' => 'inline', + 'preprocess' => TRUE, + 'scope' => 'footer', + 'group' => JS_DEFAULT, + 'every_page' => TRUE, + 'cache' => TRUE, + )); +} + +/** + * Execute a series of callbacks if cookie consent has previously been granted by the visitor + */ +function cookiecontrol_cookiesnotallowed() { + $callbacks = array(); + + // Allow other modules to add their no cookies allowed callback functions in + drupal_alter('cookiesnotallowed', $callbacks); + + $cookiecontrol_cookiesnotallowedcallback = "function cookiecontrol_cookiesnotallowed(cc) {\n" . implode("\n", $callbacks) . "\n}"; + + drupal_add_js($cookiecontrol_cookiesnotallowedcallback, array( + 'type' => 'inline', + 'preprocess' => TRUE, + 'scope' => 'footer', + 'group' => JS_DEFAULT, + 'every_page' => TRUE, + 'cache' => TRUE, + )); +} + +/** + * If cookie consent has not yet been given add a validation callback to tell the user and disable any submission callbacks + */ +function cookiecontrol_form_user_login_block_alter(&$form, &$form_state, $form_id) { + if ($s = cookiecontrol_userinrestrictedcountry()) { + if (!isset($_COOKIE[cookiecontrol_generatesitecookie()]) || $_COOKIE[cookiecontrol_generatesitecookie()] != 'yes') { + // Repalce all validation callbacks with just one telling the visitor they cannot log in yet + $form['#validate'] = array('cookiecontrol_user_login_ban'); + + // Remove any existing submit handlers to prevent any authentication taking place + unset($form['#submit']); + } + } +} + +/** + * Let the visitor know why they cannot currently log in. + */ +function cookiecontrol_user_login_ban() { + drupal_set_message(t('You cannot log in until you have allowed cookies to be used.'), 'warning'); +} + +/** + * Check if the visitors country is in the restricted list where cookie control is enforced + */ +function cookiecontrol_userinrestrictedcountry() { + $cookiecontrol_countries = variable_get('cookiecontrol_countries', ''); + + // If no cuontries are listed then enforce on every visitor + if ($cookiecontrol_countries == '') { + return TRUE; + } + + $request = drupal_http_request('http://www.geoplugin.net/php.gp?ip=' . ip_address()); + + // Ensure a valid response was received + if ($request->code == 200) { + $geo_info = unserialize($request->data); + return stripos($cookiecontrol_countries, $geo_info['geoplugin_countryName']) !== FALSE ? TRUE : FALSE; + } else { + watchdog('Cookie Control', 'A visitors IP address could not be matched to a location so they were not blocked from logging in. Geoplugin returned the error [@code] @message', array('@code' => $request->code, '@message' => $request->status_message), WATCHDOG_ERROR); + return TRUE; + } +} \ No newline at end of file diff -Nurd cookiecontrol.orig/js/cookieControl-4.1.min.js cookiecontrol/js/cookieControl-4.1.min.js --- cookiecontrol.orig/js/cookieControl-4.1.min.js 2012-10-04 15:42:06.000000000 +0200 +++ cookiecontrol/js/cookieControl-4.1.min.js 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -function cookieControl(a){if(typeof(a)=="undefined"){a={pollPeriod:25,pollIncrement:1.25}}a.pollPeriod=a.pollPeriod||25;a.pollIncrement=a.pollIncrement||1.25;a.jQueryUrl=a.jQueryUrl||"http://ajax.googleapis.com/ajax/libs/jquery/1.7/jquery.min.js";if(typeof(jQuery)=="undefined"||parseInt(jQuery.fn.jquery.replace(/\./g,""))<144){document.write('