diff --git a/legal.admin.inc b/legal.admin.inc index f4d82d1..bd2286f 100644 --- a/legal.admin.inc +++ b/legal.admin.inc @@ -11,7 +11,7 @@ * Module settings form. */ function legal_administration($form_state) { - $form = array(); + $form = array(); $conditions = legal_get_conditions(); if (module_exists('locale')) { @@ -36,9 +36,9 @@ function legal_administration($form_state) { '#description' => t('Your Terms & Conditions'), '#required' => TRUE, ); - - // Set this here or array will flatten out and override real values. - $form['legal']['#tree'] = TRUE; + + // Set this here or array will flatten out and override real values. + $form['legal']['#tree'] = TRUE; // Overide accept checbox requirement on preview. $form['legal']['legal_accept']['#required'] = FALSE; @@ -77,12 +77,12 @@ function legal_administration($form_state) { Language specific: only new users, and users who accepted the T&C in the same language as this new revision will be asked to re-accept.'), '#options' => $version_options, '#default_value' => $version_handling, - ); + ); } else { $form['language']['language'] = array('#type' => 'value', '#value' => $language); $form['language']['version_handling'] = array('#type' => 'value', '#value' => $version_handling); - + } // Additional checkboxes. @@ -198,7 +198,7 @@ function legal_preview($form, $form_values) { function theme_legal_administration($variables) { - $form = $variables['form']; + $form = $variables['form']; $language = ''; if (empty($form['current_id']['#value'])) { @@ -206,9 +206,9 @@ function theme_legal_administration($variables) { } else { if (module_exists('locale')) { - $languages = locale_language_list(); - $language = $form['language_value']['#value']; - $language = check_plain($languages[$language]); + $languages = locale_language_list(); + $language = $form['language_value']['#value']; + $language = check_plain($languages[$language]); } $output = '

'. t('Most Recent Version/Revision') .'

'; @@ -303,7 +303,7 @@ function legal_conditions_updated($new) { * if it's a revision return the ID of the current version increment revision ID by 1. */ function legal_version($version_handling, $language) { - + $version = (int) db_select('legal_conditions', 'lc') ->fields('lc', array('version')) ->orderBy('version', 'desc') @@ -316,19 +316,19 @@ function legal_version($version_handling, $language) { $versioning['version'] = empty($version) ? 1 : $version + 1; $versioning['revision'] = 1; } - + // make new revision if ($version_handling == 'revision') { $revision = db_select('legal_conditions', 'lc') - ->fields('lc', array('revision')) + ->fields('lc', array('revision')) ->condition('version', $version) ->condition('language', $language) ->orderBy('revision', 'DESC') ->execute() ->fetchField(); - $versioning['version'] = $version; + $versioning['version'] = $version; $versioning['revision'] = empty($revision) ? 1 : $revision + 1; } @@ -343,13 +343,13 @@ function legal_languages() { $latest_header = array(t('Language'), t('Version'), t('Revision')); $latest_rows = legal_versions_latest_get(); $rows = array(); - + foreach ($latest_rows as $language_name => $language) { $row = array(); $row[] = check_plain($language_name); $row[] = empty($language['version']) ? '-' : $language['version']; - $row[] = empty($language['revision']) ? '-' : $language['revision']; - $rows[] = $row; + $row[] = empty($language['revision']) ? '-' : $language['revision']; + $rows[] = $row; } $form['latest'] = array( @@ -357,7 +357,7 @@ function legal_languages() { '#title' => t('Latest Version'), ); - $form['latest']['#value'] = theme('table', array('header' => $latest_header, 'rows' => $rows)); + $form['latest']['#value'] = theme('table', array('header' => $latest_header, 'rows' => $rows)); return $form; } @@ -366,56 +366,56 @@ function legal_languages() { * Get latest version for each language. */ function legal_versions_latest_get($language = NULL) { - $conditions = array(); - $current_version = db_select('legal_conditions', 'lc') - ->fields('lc', array('version')) - ->orderBy('version', 'DESC') - ->range(0, 1) - ->execute() - ->fetchField(); - - // get latest version for each language - if (empty($language)) { - $languages = locale_language_list(); - - foreach ($languages as $language_id => $language_name) { - $result = db_select('legal_conditions', 'lc') - ->fields('lc') - ->condition('version', $current_version) - ->condition('language', $language_id) - ->orderBy('revision', 'DESC') - ->range(0, 1) - ->execute() - ->fetchAllAssoc('tc_id'); - $row = count($result) ? (object) array_shift($result) : FALSE; - - $conditions[$language_name] = legal_versions_latest_get_data($row); - } - - } // get latest version for specific language - else { - $result = db_select('legal_conditions', 'lc') - ->fields('lc') - ->condition('language', $language) - ->groupBy('language') - ->orderBy('version', 'DESC') - ->range(0, 1) - ->execute() - ->fetchAllAssoc('tc_id'); - $row = count($result) ? (object) array_shift($result) : FALSE; - - $conditions[$language] = legal_versions_latest_get_data($row); - } - - return $conditions; + $conditions = array(); + $current_version = db_select('legal_conditions', 'lc') + ->fields('lc', array('version')) + ->orderBy('version', 'DESC') + ->range(0, 1) + ->execute() + ->fetchField(); + + // get latest version for each language + if (empty($language)) { + $languages = locale_language_list(); + + foreach ($languages as $language_id => $language_name) { + $result = db_select('legal_conditions', 'lc') + ->fields('lc') + ->condition('version', $current_version) + ->condition('language', $language_id) + ->orderBy('revision', 'DESC') + ->range(0, 1) + ->execute() + ->fetchAllAssoc('tc_id'); + $row = count($result) ? (object) array_shift($result) : FALSE; + + $conditions[$language_name] = legal_versions_latest_get_data($row); + } + + } // get latest version for specific language + else { + $result = db_select('legal_conditions', 'lc') + ->fields('lc') + ->condition('language', $language) + ->groupBy('language') + ->orderBy('version', 'DESC') + ->range(0, 1) + ->execute() + ->fetchAllAssoc('tc_id'); + $row = count($result) ? (object) array_shift($result) : FALSE; + + $conditions[$language] = legal_versions_latest_get_data($row); + } + + return $conditions; } function legal_versions_latest_get_data($data) { - $row['revision'] = isset($data->revision) ? $data->revision : ''; - $row['language'] = isset($data->language) ? $data->language : ''; - $row['conditions'] = isset($data->conditions) ? $data->conditions : ''; - $row['date'] = isset($data->date) ? $data->date : ''; - $row['extras'] = isset($data->extras) ? $data->extras : ''; + $row['revision'] = isset($data->revision) ? $data->revision : ''; + $row['language'] = isset($data->language) ? $data->language : ''; + $row['conditions'] = isset($data->conditions) ? $data->conditions : ''; + $row['date'] = isset($data->date) ? $data->date : ''; + $row['extras'] = isset($data->extras) ? $data->extras : ''; $row['changes'] = isset($data->changes) ? $data->changes : ''; return $row; } diff --git a/legal.module b/legal.module index 4707331..f573907 100644 --- a/legal.module +++ b/legal.module @@ -205,7 +205,7 @@ function theme_legal_display($variables) { } } - return $form; + return $form; } function theme_legal_page($variables) { @@ -246,7 +246,7 @@ function legal_form_user_register_form_alter(&$form, &$form_state) { $form['legal'][$key]['#attributes'] = array('disabled' => 'disabled'); $form['legal'][$key]['#required'] = FALSE; } - } + } } } @@ -264,92 +264,92 @@ function legal_form_user_profile_form_alter(&$form, $form_state) { return; } - $account = $form['#user']; - - // Get last accepted version for this account. - $legal_account = legal_get_accept($account->uid); - - // If no version has been accepted yet, get version with current language revision. - if (empty($legal_account['version'])) { - $conditions = legal_get_conditions($language->language); - // No conditions set yet. - if (empty($conditions['conditions'])) return; - } - // Get version / revision of last accepted language. - else { - - $conditions = legal_get_conditions($legal_account['language']); - // No conditions set yet. - if (empty($conditions['conditions'])) return; - - // Check latest version of T&C has been accepted. - $accepted = legal_version_check($account->uid, $conditions['version'], $conditions['revision'], $legal_account); - - // Enable language switching if version accepted and revision up to date. - if ($accepted && $legal_account['language'] != $language->language) { - $conditions = legal_get_conditions($language->language); - } - } - - $form = array_merge($form, legal_display_fields($conditions)); - - if ($accepted === TRUE) { - $form['legal']['legal_accept']['#value'] = 1; - if (!empty($conditions['extras'])) { - foreach ($conditions['extras'] as $key => $label) { - if (!empty($label)) { - $form['legal'][$key]['#value'] = 1; - } - } - } - } - - // Disable checkbox if: - // - user is not account owner; - // - latest T&C has already been accepted. - if ($account->uid != $user->uid || $accepted == TRUE) { - $form['legal']['legal_accept']['#attributes'] = array('disabled' => 'disabled'); - if (!empty($conditions['extras'])) { - reset($conditions['extras']); - foreach ($conditions['extras'] as $key => $label) { - if (!empty($label)) { - $form['legal'][$key]['#attributes'] = array('disabled' => 'disabled'); - } - } - } - } - - // Not required if user is not account owner. - if ($account->uid != $user->uid) { - $form['legal']['legal_accept']['#required'] = FALSE; - if (!empty($conditions['extras'])) { - reset($conditions['extras']); - foreach ($conditions['extras'] as $key => $label) { - if (!empty($label)) { - $form['legal'][$key]['#required'] = FALSE; - } - } - } - } - - // Enable account owner to accept. - if ($account->uid == $user->uid && $accepted != TRUE) { - $form['legal']['legal_accept']['#default_value'] = isset($edit['legal_accept']) ? $edit['legal_accept'] : ''; - $form['legal']['legal_accept']['#required'] = TRUE; - - if (!empty($conditions['extras'])) { - reset($conditions['extras']); - - foreach ($conditions['extras'] as $key => $label) { - if (!empty($label)) { - $form['legal'][$key]['#default_value'] = isset($edit[$key]) ? $edit[$key] : ''; - $form['legal'][$key]['#required'] = TRUE; - } - } - } - } - - return theme('legal_display', array('form' => $form)); + $account = $form['#user']; + + // Get last accepted version for this account. + $legal_account = legal_get_accept($account->uid); + + // If no version has been accepted yet, get version with current language revision. + if (empty($legal_account['version'])) { + $conditions = legal_get_conditions($language->language); + // No conditions set yet. + if (empty($conditions['conditions'])) return; + } + // Get version / revision of last accepted language. + else { + + $conditions = legal_get_conditions($legal_account['language']); + // No conditions set yet. + if (empty($conditions['conditions'])) return; + + // Check latest version of T&C has been accepted. + $accepted = legal_version_check($account->uid, $conditions['version'], $conditions['revision'], $legal_account); + + // Enable language switching if version accepted and revision up to date. + if ($accepted && $legal_account['language'] != $language->language) { + $conditions = legal_get_conditions($language->language); + } + } + + $form = array_merge($form, legal_display_fields($conditions)); + + if ($accepted === TRUE) { + $form['legal']['legal_accept']['#value'] = 1; + if (!empty($conditions['extras'])) { + foreach ($conditions['extras'] as $key => $label) { + if (!empty($label)) { + $form['legal'][$key]['#value'] = 1; + } + } + } + } + + // Disable checkbox if: + // - user is not account owner; + // - latest T&C has already been accepted. + if ($account->uid != $user->uid || $accepted == TRUE) { + $form['legal']['legal_accept']['#attributes'] = array('disabled' => 'disabled'); + if (!empty($conditions['extras'])) { + reset($conditions['extras']); + foreach ($conditions['extras'] as $key => $label) { + if (!empty($label)) { + $form['legal'][$key]['#attributes'] = array('disabled' => 'disabled'); + } + } + } + } + + // Not required if user is not account owner. + if ($account->uid != $user->uid) { + $form['legal']['legal_accept']['#required'] = FALSE; + if (!empty($conditions['extras'])) { + reset($conditions['extras']); + foreach ($conditions['extras'] as $key => $label) { + if (!empty($label)) { + $form['legal'][$key]['#required'] = FALSE; + } + } + } + } + + // Enable account owner to accept. + if ($account->uid == $user->uid && $accepted != TRUE) { + $form['legal']['legal_accept']['#default_value'] = isset($edit['legal_accept']) ? $edit['legal_accept'] : ''; + $form['legal']['legal_accept']['#required'] = TRUE; + + if (!empty($conditions['extras'])) { + reset($conditions['extras']); + + foreach ($conditions['extras'] as $key => $label) { + if (!empty($label)) { + $form['legal'][$key]['#default_value'] = isset($edit[$key]) ? $edit[$key] : ''; + $form['legal'][$key]['#required'] = TRUE; + } + } + } + } + + return theme('legal_display', array('form' => $form)); } /** @@ -366,35 +366,35 @@ function legal_user_login(&$edit, $account) { // Get last accepted version for this account $legal_account = legal_get_accept($user->uid); - // If no version has been accepted yet, get version with current language revision. - if (empty($legal_account['version'])) { - $conditions = legal_get_conditions($language->language); - // No conditions set yet. - if (empty($conditions['conditions'])) { - return; - } - } - // Get version / revision of last accepted language. - else { - $conditions = legal_get_conditions($legal_account['language']); - // No conditions set yet. - if (empty($conditions['conditions'])) { - return; - } - - // Check latest version of T&C has been accepted. - $accepted = legal_version_check($user->uid, $conditions['version'], $conditions['revision'], $legal_account); + // If no version has been accepted yet, get version with current language revision. + if (empty($legal_account['version'])) { + $conditions = legal_get_conditions($language->language); + // No conditions set yet. + if (empty($conditions['conditions'])) { + return; + } + } + // Get version / revision of last accepted language. + else { + $conditions = legal_get_conditions($legal_account['language']); + // No conditions set yet. + if (empty($conditions['conditions'])) { + return; + } + + // Check latest version of T&C has been accepted. + $accepted = legal_version_check($user->uid, $conditions['version'], $conditions['revision'], $legal_account); if ($accepted) { return; } } - - $uid = $user->uid; - // Destroy the current session. - module_invoke_all('user_logout', $user); - session_destroy(); + $uid = $user->uid; + + // Destroy the current session. + module_invoke_all('user_logout', $user); + session_destroy(); // We have to use $GLOBALS to unset a global variable. $user = drupal_anonymous_user(); @@ -404,7 +404,7 @@ function legal_user_login(&$edit, $account) { if (arg(0) == 'user' && arg(1) == 'reset') { $query = array('destination' => "user/$uid/edit"); } - + if (!empty($_REQUEST['destination'])) { $query = array('destination' => $_REQUEST['destination']); } @@ -489,7 +489,7 @@ function legal_user_update(&$edit, $account, $category) { if ($accepted) { legal_save_accept($conditions['version'], $conditions['revision'], $conditions['language'], $account->uid); } -} +} /** * Require registered users to accept new T&C. @@ -504,12 +504,12 @@ function legal_login($form, $constructor, $uid, $id_hash = NULL) { if (empty($legal_account['version'])) { $conditions = legal_get_conditions($language->language); // no conditions set yet - if (empty($conditions['conditions'])) return; + if (empty($conditions['conditions'])) return; } else { // get version / revision of last accepted language $conditions = legal_get_conditions($legal_account['language']); - // no conditions set yet + // no conditions set yet if (empty($conditions['conditions'])) return; // Check latest version of T&C has been accepted. @@ -584,11 +584,11 @@ function legal_login_submit($form, &$form_state) { $values = $form_state['values']; $user = user_load($values['uid']); - $redirect = 'user/'. $user->uid; + $redirect = 'user/'. $user->uid; - if (!empty($_GET['destination'])) { - $redirect = $_GET['destination']; - } + if (!empty($_GET['destination'])) { + $redirect = $_GET['destination']; + } $form_state['redirect'] = $redirect; @@ -633,7 +633,7 @@ function theme_legal_login($variables) { } function legal_get_accept($uid) { - $keys = array('legal_id', 'version', 'revision', 'language', 'uid', 'accepted'); + $keys = array('legal_id', 'version', 'revision', 'language', 'uid', 'accepted'); $result = db_select('legal_accepted', 'la') ->fields('la') ->condition('uid', $uid) @@ -649,7 +649,7 @@ function legal_get_accept($uid) { if (isset($result->$key)) { $accept[$key] = $result->$key; } - } + } return $accept; } @@ -734,9 +734,9 @@ function legal_display_changes($form, $uid) { if (!empty($changes)) { $bullet_points = array_merge($bullet_points, explode("\r\n", $changes)); - } + } } - + if (empty($bullet_points)) { return $form; } diff --git a/views/legal.views.inc b/views/legal.views.inc index 908d439..0735a39 100644 --- a/views/legal.views.inc +++ b/views/legal.views.inc @@ -46,22 +46,22 @@ function legal_views_data() { ); $data['legal_accepted']['version'] = array( - 'title' => t('Version'), - 'help' => t('Version ID accepted.'), - 'field' => array( - 'handler' => 'views_handler_field', - 'click sortable' => TRUE, - ), - 'filter' => array( - 'handler' => 'views_handler_filter_numeric', - 'allow empty' => TRUE, - ), - 'argument' => array( - 'handler' => 'views_handler_argument_numeric', - ), - 'sort' => array( - 'handler' => 'views_handler_sort', - ), + 'title' => t('Version'), + 'help' => t('Version ID accepted.'), + 'field' => array( + 'handler' => 'views_handler_field', + 'click sortable' => TRUE, + ), + 'filter' => array( + 'handler' => 'views_handler_filter_numeric', + 'allow empty' => TRUE, + ), + 'argument' => array( + 'handler' => 'views_handler_argument_numeric', + ), + 'sort' => array( + 'handler' => 'views_handler_sort', + ), ); $data['legal_accepted']['revision'] = array( @@ -83,26 +83,26 @@ function legal_views_data() { ), ); - if (module_exists('locale')) { - $data['legal_accepted']['language'] = array( - 'title' => t('Language'), - 'help' => t('Language of T&C accepted by user.'), - 'field' => array( - 'handler' => 'views_handler_field_locale_language', - 'click sortable' => TRUE, - ), - 'filter' => array( - 'handler' => 'views_handler_filter_locale_language', - 'allow empty' => TRUE, - ), - 'argument' => array( - 'handler' => 'views_handler_argument_locale_language', - ), - 'sort' => array( - 'handler' => 'views_handler_sort', - ), - ); - } + if (module_exists('locale')) { + $data['legal_accepted']['language'] = array( + 'title' => t('Language'), + 'help' => t('Language of T&C accepted by user.'), + 'field' => array( + 'handler' => 'views_handler_field_locale_language', + 'click sortable' => TRUE, + ), + 'filter' => array( + 'handler' => 'views_handler_filter_locale_language', + 'allow empty' => TRUE, + ), + 'argument' => array( + 'handler' => 'views_handler_argument_locale_language', + ), + 'sort' => array( + 'handler' => 'views_handler_sort', + ), + ); + } $data['legal_accepted']['uid'] = array( 'title' => t('User ID'), @@ -263,27 +263,27 @@ function legal_views_data() { ), ); - if (module_exists('locale')) { + if (module_exists('locale')) { - $data['legal_conditions']['language'] = array( - 'title' => t('Language'), - 'help' => t('Language of T&Cs.'), - 'field' => array( - 'handler' => 'views_handler_field_locale_language', - 'click sortable' => TRUE, - ), - 'filter' => array( - 'handler' => 'views_handler_filter_locale_language', - 'allow empty' => TRUE, - ), - 'argument' => array( - 'handler' => 'views_handler_argument_locale_language', - ), - 'sort' => array( - 'handler' => 'views_handler_sort', - ), - ); - } + $data['legal_conditions']['language'] = array( + 'title' => t('Language'), + 'help' => t('Language of T&Cs.'), + 'field' => array( + 'handler' => 'views_handler_field_locale_language', + 'click sortable' => TRUE, + ), + 'filter' => array( + 'handler' => 'views_handler_filter_locale_language', + 'allow empty' => TRUE, + ), + 'argument' => array( + 'handler' => 'views_handler_argument_locale_language', + ), + 'sort' => array( + 'handler' => 'views_handler_sort', + ), + ); + } return $data; }