Commit 85ea88ac authored by git's avatar git Committed by Gaurav Kapoor
Browse files

Issue #3146926 by Project Update Bot, gaurav.kapoor: Automated Drupal 9 compatibility fixes

parent 17ea8ab1
Loading
Loading
Loading
Loading
+1 −1
Changes for counter.info.yml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
name: Counter
type: module
description: This module used for displaying a Site Counter, Node Count, Unique Visitor and Client IP.
core: 8.x
core_version_requirement: ^8.8 || ^9
package: Statistics
configure: counter.settings
+98 −101
Changes for counter.install: 98 added lines, 101 removed lines.
Original line number Diff line number Diff line
@@ -9,106 +9,6 @@
 * Implements hook_install().
 */
function counter_install() {
  counter_update_7102();
}

/**
 * Implements hook_schema().
 */
function counter_schema() {
  $schema['counter'] = array(
    'fields' => array(
      'counter_id' => array(
        'type' => 'serial',
        'unsigned' => TRUE,
        'not null' => TRUE,
      ),
      'ip' => array(
        'type' => 'varchar',
        'length' => 32,
        'not null' => TRUE,
        'default' => '',
      ),
      'created' => array(
        'type' => 'int',
        'not null' => TRUE,
        'default' => 0,
      ),
      'url' => array(
        'type' => 'varchar',
        'length' => 255,
        'not null' => TRUE,
        'default' => '',
      ),
      'uid' => array(
        'type' => 'int',
        'not null' => TRUE,
        'default' => 0,
      ),
      'nid' => array(
        'type' => 'int',
        'not null' => TRUE,
        'default' => 0,
      ),
      'type' => array(
        'type' => 'varchar',
        'length' => 255,
        'not null' => TRUE,
        'default' => '',
      ),
      'browser_name' => array(
        'type' => 'varchar',
        'length' => 64,
        'not null' => TRUE,
        'default' => '',
      ),
      'browser_version' => array(
        'type' => 'varchar',
        'length' => 64,
        'not null' => TRUE,
        'default' => '',
      ),
      'platform' => array(
        'type' => 'varchar',
        'length' => 64,
        'not null' => TRUE,
        'default' => '',
      ),
    ),
    'indexes' => array(
      'uid' => array('uid'),
      'nid' => array('nid'),
      'ip' => array('ip'),
      'created' => array('created'),
    ),
    'primary key' => array('counter_id'),
  );

  $schema['counter_data'] = array(
    'fields' => array(
      'counter_name'  => array(
        'type' => 'varchar',
        'length' => 100,
        'not null' => TRUE,
        'default' => 0,
      ),
      'counter_value' => array(
        'type' => 'varchar',
        'length' => 255,
        'not null' => TRUE,
        'default' => 0,
      ),
    ),
    'primary key' => array('counter_name'),
  );
  return $schema;
}

/**
 * Update: Updating Counter Data table.
 */
function counter_update_7102() {
  $ret = array();

  // site_counter.
  $sql = " SELECT count(*) as total FROM {counter} c ";
@@ -121,6 +21,7 @@ function counter_update_7102() {
    $sql = " INSERT INTO {counter_data} (counter_name, counter_value) VALUES ('site_counter', '$counter_total')";
    \Drupal::database()->query($sql);
  }

  // unique_visitor.
  $sql = " SELECT count(*) as total FROM (SELECT ip FROM {counter} GROUP BY ip) c";
  $counter_total = \Drupal::database()->query($sql)->fetchField();
@@ -132,6 +33,7 @@ function counter_update_7102() {
    $sql = " INSERT INTO {counter_data} (counter_name,counter_value) VALUES ('unique_visitor','$counter_total')";
    \Drupal::database()->query($sql);
  }

  // registered_user.
  $sql = " SELECT count(*) as total FROM {users_field_data} WHERE access<>0 and uid<>0";
  $counter_total = \Drupal::database()->query($sql)->fetchField();
@@ -143,6 +45,7 @@ function counter_update_7102() {
    $sql = " INSERT INTO {counter_data} (counter_name,counter_value) VALUES ('registered_user', '$counter_total')";
    \Drupal::database()->query($sql);
  }

  // unregistered_user.
  $sql = " SELECT count(*) as total FROM {users_field_data} WHERE access=0 and uid<>0";
  $counter_total = \Drupal::database()->query($sql)->fetchField();
@@ -154,6 +57,7 @@ function counter_update_7102() {
    $sql = " INSERT INTO {counter_data} (counter_name,counter_value) VALUES ('unregistered_user', '$counter_total')";
    \Drupal::database()->query($sql);
  }

  // published_node.
  $sql = " SELECT count(*) as total FROM {node_field_data} WHERE status=1";
  $counter_total = \Drupal::database()->query($sql)->fetchField();
@@ -165,6 +69,7 @@ function counter_update_7102() {
    $sql = " INSERT INTO {counter_data} (counter_name,counter_value) VALUES ('published_node', '$counter_total')";
    \Drupal::database()->query($sql);
  }

  // unpublished_node.
  $sql = " SELECT count(*) as total FROM {node_field_data} WHERE status=0";
  $counter_total = \Drupal::database()->query($sql)->fetchField();
@@ -188,5 +93,97 @@ function counter_update_7102() {
    $sql = " INSERT INTO {counter_data} (counter_name,counter_value) VALUES ('blocked_user','$counter_total')";
    \Drupal::database()->query($sql);
  }
  return $ret;

}

/**
 * Implements hook_schema().
 */
function counter_schema() {
  $schema['counter'] = [
    'fields' => [
      'counter_id' => [
        'type' => 'serial',
        'unsigned' => TRUE,
        'not null' => TRUE,
      ],
      'ip' => [
        'type' => 'varchar',
        'length' => 32,
        'not null' => TRUE,
        'default' => '',
      ],
      'created' => [
        'type' => 'int',
        'not null' => TRUE,
        'default' => 0,
      ],
      'url' => [
        'type' => 'varchar',
        'length' => 255,
        'not null' => TRUE,
        'default' => '',
      ],
      'uid' => [
        'type' => 'int',
        'not null' => TRUE,
        'default' => 0,
      ],
      'nid' => [
        'type' => 'int',
        'not null' => TRUE,
        'default' => 0,
      ],
      'type' => [
        'type' => 'varchar',
        'length' => 255,
        'not null' => TRUE,
        'default' => '',
      ],
      'browser_name' => [
        'type' => 'varchar',
        'length' => 64,
        'not null' => TRUE,
        'default' => '',
      ],
      'browser_version' => [
        'type' => 'varchar',
        'length' => 64,
        'not null' => TRUE,
        'default' => '',
      ],
      'platform' => [
        'type' => 'varchar',
        'length' => 64,
        'not null' => TRUE,
        'default' => '',
      ],
    ],
    'indexes' => [
      'uid' => ['uid'],
      'nid' => ['nid'],
      'ip' => ['ip'],
      'created' => ['created'],
    ],
    'primary key' => ['counter_id'],
  ];

  $schema['counter_data'] = [
    'fields' => [
      'counter_name'  => [
        'type' => 'varchar',
        'length' => 100,
        'not null' => TRUE,
        'default' => 0,
      ],
      'counter_value' => [
        'type' => 'varchar',
        'length' => 255,
        'not null' => TRUE,
        'default' => 0,
      ],
    ],
    'primary key' => ['counter_name'],
  ];
  return $schema;
}
+3 −3
Changes for counter.lib.inc: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ function counter_get_browser() {
  }

  // Finally get the correct browser_version number.
  $known = array('browser_version', $ub, 'other');
  $known = ['browser_version', $ub, 'other'];
  $pattern = '#(?<browser>' . implode('|', $known) .
  ')[/ ]+(?<browser_version>[0-9.|a-zA-Z.]*)#';
  if (!preg_match_all($pattern, $user_agent, $matches)) {
@@ -81,10 +81,10 @@ function counter_get_browser() {
    $browser_version = "?";
  }

  return array(
  return [
    'browser_name'    => $browser_name,
    'browser_version' => $browser_version,
    'platform'        => $platform,
    'pattern'         => $pattern,
  );
  ];
}
+0 −9
Changes for counter.module: 0 added lines, 9 removed lines.
Original line number Diff line number Diff line
@@ -19,12 +19,3 @@ function counter_help($route_name, RouteMatchInterface $route_match) {
      return $output;
  }
}

/**
 * Implements hook_views_api().
 */
function counter_views_api() {
  return array(
    'api' => views_api_version(),
  );
}
Loading