Skip to content

Commit

Permalink
code cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@keiserjb
keiserjb committed Dec 24, 2021
1 parent feb1dc9 commit 60eb411
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 80 deletions.
56 changes: 19 additions & 37 deletions read_time.install
View file
@@ -1,4 +1,5 @@
<?php
<?php

/**
* @file
* Install, update and uninstall functions for the Read Time module.
Expand All @@ -7,7 +8,8 @@
/**
* Implements read_time_schema().
*/
function read_time_schema() {
function read_time_schema()
{
return array(
'read_time' => array(
'description' => 'The calculated read times of nodes.',
Expand All @@ -32,9 +34,11 @@ function read_time_schema() {
}

/**
* Implements hook_uninstall().().
* Implements hook_uninstall().
().
*/
function read_time_uninstall() {
function read_time_uninstall()
{
foreach (node_type_get_names() as $bundle => $label) {
config_clear('read_time.settings', 'read_time_fields_' . $bundle);
config_clear('read_time.settings', 'read_time_wpm_' . $bundle);
Expand All @@ -46,40 +50,18 @@ function read_time_uninstall() {
/**
* Migrate read_time variables to config.
*/
function read_time_update_1000() {
function read_time_update_1000()
{
$config = config('read_time.settings');
$config->set('read_time_fields_typetype', update_variable_get('read_time_fields_typetype', 'dynamic variable in file /read_time/read_time.module line 34'));
$config->set('read_time_wpm_typetype', update_variable_get('read_time_wpm_typetype', 'dynamic variable in file /read_time/read_time.module line 43'));
$config->set('read_time_format_typetype', update_variable_get('read_time_format_typetype', 'dynamic variable in file /read_time/read_time.module line 55'));
$config->set('read_time_display_typetype', update_variable_get('read_time_display_typetype', 'dynamic variable in file /read_time/read_time.module line 61'));
$config->set('read_time_wpm_nodetype', update_variable_get('read_time_wpm_nodetype', 'dynamic variable in file /read_time/read_time.module line 196'));
$config->set('read_time_format_nodetype', update_variable_get('read_time_format_nodetype', 'dynamic variable in file /read_time/read_time.module line 197'));
$config->set('read_time_display_nodetype', update_variable_get('read_time_display_nodetype', 'dynamic variable in file /read_time/read_time.module line 198'));
$config->set('read_time_fields_nodetype', update_variable_get('read_time_fields_nodetype', 'dynamic variable in file /read_time/read_time.module line 244'));
$config->set('read_time_fields_', update_variable_get('read_time_fields_',));
$config->set('read_time_wpm_', update_variable_get('read_time_wpm_',));
$config->set('read_time_format_', update_variable_get('read_time_format_',));
$config->set('read_time_display_', update_variable_get('read_time_display_',));

$config->save();

update_variable_del('read_time_fields_typetype');
update_variable_del('read_time_wpm_typetype');
update_variable_del('read_time_format_typetype');
update_variable_del('read_time_display_typetype');
update_variable_del('read_time_wpm_nodetype');
update_variable_del('read_time_format_nodetype');
update_variable_del('read_time_display_nodetype');
update_variable_del('read_time_fields_nodetype');
update_variable_del('read_time_fields_');
update_variable_del('read_time_wpm_');
update_variable_del('read_time_format_');
update_variable_del('read_time_display_');
}

/**
* Implements hook_install().
*/
function read_time_install() {
// Dynamically generated variable data was detected.
// /read_time/read_time.module line 34
// /read_time/read_time.module line 43
// /read_time/read_time.module line 55
// /read_time/read_time.module line 61
// /read_time/read_time.module line 196
// /read_time/read_time.module line 197
// /read_time/read_time.module line 198
// /read_time/read_time.module line 244
}

54 changes: 11 additions & 43 deletions read_time.module
View file
Expand Up @@ -19,13 +19,11 @@ function read_time_config_info()

/**
* Implements hook_form_FORM_ID_alter() for node_type_form.
().
*/
function read_time_form_node_type_form_alter(&$form, &$form_state, $form_id)
{
$config = config('read_time.settings');
$type = $form['#node_type'];
$defaults = read_time_defaults();

// Get text fields in this bundle.
$field_instances = field_info_instances('node', $type->type);
Expand All @@ -46,7 +44,7 @@ function read_time_form_node_type_form_alter(&$form, &$form_state, $form_id)
'#title' => t('Fields'),
'#description' => t('Calculate the combined read time of these fields.'),
'#options' => $fields,
'#multiple' => TRUE,
'#multiple' => true,
'#default_value' => $config->get('read_time_fields_' . $type->type),
);
$form['read_time']['read_time_wpm'] = array(
Expand Down Expand Up @@ -78,28 +76,20 @@ function read_time_form_node_type_form_alter(&$form, &$form_state, $form_id)
);
$form['#submit'][] = 'read_time_form_node_type_form_submit';
}

function read_time_form_node_type_form_submit($form, &$form_state)
{
if (isset($form_state['values']['read_time_fields'])) {
config_set('read_time.settings', 'read_time_fields_' . $form_state['values']['type'], (array)
$form_state['values']['read_time_fields']);
}
if (isset($form_state['values']['read_time_wpm'])) {
config_set('read_time.settings', 'read_time_wpm_' . $form_state['values']['type'], (string)
$form_state['values']['read_time_wpm']);
}
if (isset($form_state['values']['read_time_format'])) {
config_set('read_time.settings', 'read_time_format_' . $form_state['values']['type'], (string)
$form_state['values']['read_time_format']);
}
if (isset($form_state['values']['read_time_display'])) {
config_set('read_time.settings', 'read_time_display_' . $form_state['values']['type'], (string)
$form_state['values']['read_time_display']);
}
$values = $form_state['values'];
$config = config('read_time.settings');
$config->set('read_time_fields_' . $values['type'], (array) $values['read_time_fields']);
$config->set('read_time_wpm_' . $values['type'], (string) $values['read_time_wpm']);
$config->set('read_time_format_' . $values['type'], (string) $values['read_time_format']);
$config->set('read_time_display_' . $values['type'], (string) $values['read_time_display']);
$config->save();
}

/**
* Implements hook_field_extra_fields().
().
*/
function read_time_field_extra_fields()
{
Expand All @@ -118,7 +108,6 @@ function read_time_field_extra_fields()

/**
* Implements hook_token_info().
().
*/
function read_time_token_info()
{
Expand All @@ -135,7 +124,6 @@ function read_time_token_info()

/**
* Implements hook_tokens().
().
*/
function read_time_tokens($type, $tokens, array $data = array(), array $options = array())
{
Expand All @@ -161,7 +149,6 @@ function read_time_tokens($type, $tokens, array $data = array(), array $options

/**
* Implements hook_node_insert().
().
*/
function read_time_node_insert($node)
{
Expand All @@ -177,7 +164,6 @@ function read_time_node_insert($node)

/**
* Implements hook_node_update().
().
*/
function read_time_node_update($node)
{
Expand All @@ -195,7 +181,6 @@ function read_time_node_update($node)

/**
* Implements hook_node_view().
().
*/
function read_time_node_view($node, $view_mode, $langcode)
{
Expand All @@ -216,7 +201,6 @@ function read_time_node_view($node, $view_mode, $langcode)

/**
* Implements hook_node_delete().
().
*/
function read_time_node_delete($node)
{
Expand All @@ -227,7 +211,6 @@ function read_time_node_delete($node)

/**
* Implements hook_node_type_delete().
().
*/
function read_time_node_type_delete($info)
{
Expand All @@ -243,7 +226,6 @@ function read_time_node_type_delete($info)
function read_time_calculate($node)
{
$config = config('read_time.settings');
$defaults = read_time_defaults();

// Get read time bundle settings.
$wpm = $config->get('read_time_wpm_' . $node->type);
Expand Down Expand Up @@ -291,7 +273,6 @@ function read_time_calculate($node)
function read_time_node_get_word_count($node)
{
// Get fields to calculate read time of.
$defaults = read_time_defaults();
$fields = config_get('read_time.settings', 'read_time_fields_' . $node->type);

$field_words = '';
Expand All @@ -308,7 +289,7 @@ function read_time_node_get_word_count($node)
/**
* Fetch the read time for a node. Recalculate if needed.
*
* @param stdClass $node.
* @param stdClass $node .
* The node object.
*
* @return string
Expand Down Expand Up @@ -337,16 +318,3 @@ function read_time_node_get_read_time($node)

return $read_time;
}

/**
* Store default settings.
*/
function read_time_defaults()
{
return array(
'fields' => array('body'),
'wpm' => '225',
'format' => 'hour_short',
'display' => t('Read time: %read_time'),
);
}

0 comments on commit 60eb411

Please sign in to comment.