diff --git a/cookiecontrol.admin.inc b/cookiecontrol.admin.inc old mode 100644 new mode 100755 index 931f3ae..b49eb47 --- a/cookiecontrol.admin.inc +++ b/cookiecontrol.admin.inc @@ -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 @@ function cookiecontrol_admin_settings() { $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 @@ function cookiecontrol_admin_settings() { ) ); - $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 @@ function cookiecontrol_admin_settings() { ) ); - $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 @@ function cookiecontrol_admin_settings() { ) ); - $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 @@ function cookiecontrol_admin_settings() { '#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 @@ function cookiecontrol_admin_settings() { * @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 @@ function cookiecontrol_admin_settings_validate($form, &$form_state) { } // 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 --git a/cookiecontrol.info b/cookiecontrol.info old mode 100644 new mode 100755 index 45df369..69461f0 --- a/cookiecontrol.info +++ b/cookiecontrol.info @@ -6,4 +6,4 @@ core = 7.x configure = admin/config/people/cookiecontrol -scripts[] = js/cookieControl-4.1.min.js \ No newline at end of file +scripts[] = js/cookieControl-5.0.min.js \ No newline at end of file diff --git a/cookiecontrol.module b/cookiecontrol.module old mode 100644 new mode 100755 index 994eb1b..67fa089 --- a/cookiecontrol.module +++ b/cookiecontrol.module @@ -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. @@ -71,8 +71,9 @@ function cookiecontrol_preprocess_html(&$variables) { // Escape anything that might cause a JavaScript error $cookiecontrol_text = str_replace(array("\r\n", "\n", "\r", ' '), '', $cookiecontrol_text); $cookiecontrol_fulltext = str_replace(array("\r\n", "\n", "\r", ' '), '', $cookiecontrol_fulltext); - + $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'; @@ -80,6 +81,7 @@ function cookiecontrol_preprocess_html(&$variables) { $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($) { @@ -91,6 +93,8 @@ function cookiecontrol_preprocess_html(&$variables) { 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)}, @@ -103,6 +107,12 @@ function cookiecontrol_preprocess_html(&$variables) { }); }); "; + + /* + 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 --git a/js/cookieControl-4.1.min.js b/js/cookieControl-4.1.min.js deleted file mode 100644 index 4cd66b7..0000000 --- a/js/cookieControl-4.1.min.js +++ /dev/null @@ -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('