Changeset 2947915

intelligence/trunk/admin/class-intel-admin.php

-                      r1827302
+                      r2947915
+        }
+  }
     public function site_menu() {
+    }
+    public function site_menu($network_site_menu = FALSE) {
         global $wp_version;
+        $capability = ($network_site_menu) ? 'manage_network_options' : 'manage_options';
+        // if network framework mode, hide admin menu for subsites
+        if (intel()->is_network_framework_mode && !$network_site_menu) {
+            return;
+        }
         if ( current_user_can( 'manage_options' ) ) {
+            add_menu_page( esc_html__( "Intelligence", 'intel' ), esc_html__( "Intelligence", 'intel' ), 'manage_options', 'intel_admin', array( $this, 'menu_router' ), 'dashicons-analytics');
+            add_submenu_page( 'intel_admin', esc_html__( "Dashboard", 'intel' ), esc_html__( "Dashboard", 'intel' ), 'manage_options', 'intel_admin', array( $this, 'menu_router' ) );
+            add_submenu_page( 'intel_admin', esc_html__( "Reports", 'intel' ), esc_html__( "Reports", 'intel' ), 'manage_options', 'intel_reports', array( $this, 'menu_router' ) );
+            add_submenu_page( 'intel_admin', esc_html__( "Contacts", 'intel' ), esc_html__( "Contacts", 'intel' ), 'manage_options', 'intel_visitor', array( $this, 'menu_router' ) );
+            add_submenu_page( 'intel_admin', esc_html__( "Settings", 'intel' ), esc_html__( "Settings", 'intel' ), 'manage_options', 'intel_config', array( $this, 'menu_router' ) );
+            add_submenu_page( 'intel_admin', esc_html__( "Utilities", 'intel' ), esc_html__( "Utilities", 'intel' ), 'manage_options', 'intel_util', array( $this, 'menu_router' ) );
+            add_submenu_page( 'intel_admin', esc_html__( "Help", 'intel' ), esc_html__( "Help", 'intel' ), 'manage_options', 'intel_help', array( $this, 'menu_router' ) );
+    }
+    }
+            if (0 && intel_is_framework_only()) {
+              add_menu_page( esc_html__( "Intelligence", 'intel' ), esc_html__( "Intelligence", 'intel' ), $capability, 'intel_config', array( $this, 'menu_router' ), 'dashicons-analytics');
+            }
+            else {
+              add_menu_page( esc_html__( "Intelligence", 'intel' ), esc_html__( "Intelligence", 'intel' ), $capability, 'intel_admin', array( $this, 'menu_router' ), 'dashicons-analytics');
+              add_submenu_page( 'intel_admin', esc_html__( "Dashboard", 'intel' ), esc_html__( "Dashboard", 'intel' ), $capability, 'intel_admin', array( $this, 'menu_router' ) );
+              add_submenu_page( 'intel_admin', esc_html__( "Reports", 'intel' ), esc_html__( "Reports", 'intel' ), $capability, 'intel_reports', array( $this, 'menu_router' ) );
+              add_submenu_page( 'intel_admin', esc_html__( "Annotations", 'intel' ), esc_html__( "Annotations", 'intel' ), $capability, 'intel_annotation', array( $this, 'menu_router' ) );
+              add_submenu_page( 'intel_admin', esc_html__( "Contacts", 'intel' ), esc_html__( "Contacts", 'intel' ), $capability, 'intel_visitor', array( $this, 'menu_router' ) );
+              add_submenu_page( 'intel_admin', esc_html__( "Settings", 'intel' ), esc_html__( "Settings", 'intel' ), $capability, 'intel_config', array( $this, 'menu_router' ) );
+              add_submenu_page( 'intel_admin', esc_html__( "Utilities", 'intel' ), esc_html__( "Utilities", 'intel' ), $capability, 'intel_util', array( $this, 'menu_router' ) );
+              add_submenu_page( 'intel_admin', esc_html__( "Help", 'intel' ), esc_html__( "Help", 'intel' ), $capability, 'intel_help', array( $this, 'menu_router' ) );
+            }
+        }
+    }
+    public function network_site_menu() {
+        $this->site_menu(TRUE);
+    }
     // for return_type json, page needs to be called earlier than standard menu routing
 …
         $q = '';
         if ($_GET['page'] == 'intel_admin') {
             $q = 'admin/reports/intel';
             //$navbar_exclude[$q] = 1;
             $breadcrumbs[] = array(
                 'text' => esc_html__('Reports', 'intel'),
                 'path' => Intel_Df::url($q),
             );
             $navbar_base_q = $navbar_base_qt = $q;
       if (!$install_levels['ga_data']) {
                 $install_access_error = intel_get_install_access_error_message(array('level' => 'ga_data'));
+            }
+          $q = 'admin/reports/intel';
+          //$navbar_exclude[$q] = 1;
+          $breadcrumbs[] = array(
+            'text' => esc_html__('Reports', 'intel'),
+            'path' => Intel_Df::url($q),
+          );
+          $navbar_base_q = $navbar_base_qt = $q;
+          if (!$install_levels['ga_data']) {
+            $install_access_error = intel_get_install_access_error_message(array('level' => 'ga_data'));
+          }
+        }
         if ($_GET['page'] == 'intel_reports') {
 …
             );
+        }
+        if ($_GET['page'] == 'intel_annotation') {
+            $q = 'admin/annotations';
+            $breadcrumbs[] = array(
+                'text' => esc_html__('Annotations', 'intel'),
+                'path' => Intel_Df::url($q),
+            );
+        }
+        if (intel_is_framework_only()) {
+          $q = 'admin/config/intel/settings/framework';
+        }
         if (isset($_GET['q'])) {
             $q = $_GET['q'];
 …
             'submission',
             'visitor',
+            'annotation',
         );
         $this->args = $path_args = explode('/', $q);
 …
+                    }
+                }
+                else if (!empty($path_args[1]) && $path_args[1] == 'util') {
+                  if (!empty($path_args[2]) && $path_args[2] == 'log') {
+                    $bc_title = Intel_Df::t('Log');
+                  }
+                  if (!empty($bc_title)) {
+                    $a = array_slice($path_args, 0, 4);
+                    $breadcrumbs[] = array(
+                      'text' => $bc_title,
+                      'path' => Intel_Df::url(implode('/', $a)),
+                    );
+                  }
+                }
+            }
             else {
 …
                             );
+                        }
+                        if ($path_args[0] == 'annotation') {
+                            $breadcrumbs[] = array(
+                                'text' => $entity->label(),
+                                'path' => Intel_Df::url($entity->uri()),
+                            );
+                        }
+                    }
+                }
 …
                     $load_type = '';
                     $load_title = '';
+                    $entity_title = '';
                     if ($path_args[1] == 'config') {
+                        if ($path_args[4] == 'intel_event') {
+                            $load_index = 5;
+                            $load_type = 'intel_intel_event';
+                            $load_title = Intel_Df::t('Intel Event');
+                            $bc_title = Intel_Df::t('Event');
+                        }
+                        elseif ($path_args[4] == 'goal') {
+                            $load_index = 5;
+                            $load_type = 'intel_goal';
+                            $bc_title = $load_title = Intel_Df::t('Goal');
+                        }
+                        elseif ($path_args[4] == 'taxonomy') {
+                            $load_index = 5;
+                            $load_type = 'intel_taxonomy';
+                            $bc_title = $load_title = Intel_Df::t('Taxonomy');
+                        }
+                        if ($load_index) {
+                            $func = $load_type . '_load';
+                            $path_args_t[$load_index] = $func($path_args[$load_index]);
+                            $entity = $path_args_t[$load_index];
+                          if(empty($entity)) {
+                                $vars = array(
+                                    'title' => esc_html__('404 Error', 'intel'),
+                                    'markup' => Intel_Df::t('@load_title not found', array(
+                                        '@load_title' => $load_title,
+                                    )),
+                                    //'markup' => esc_html__('@load_title not found', 'intel'),
+                                    'messages' => Intel_Df::drupal_get_messages(),
+                                );
+                                print Intel_Df::theme('intel_page', $vars);
+                                return;
+                            }
+                            $a = $path_args;
+                            $a[$load_index] = '%' . $load_type;
+                            $qt = implode('/', $a);
+                            if (!empty($menu_info[$qt])) {
+                                $info = $menu_info[$qt];
+                            }
+                            $a = array_slice($path_args, 0, 5);
+                            $breadcrumbs[] = array(
+                                'text' => $bc_title,
+                                'path' => Intel_Df::url(implode('/', $a)),
+                            );
+                            $a = array_slice($path_args, 0, 6);
+                            $breadcrumbs[] = array(
+                                'text' => $entity['title'],
+                                //'path' => Intel_Df::url(implode('/', $a)),
+                            );
+                        }
+                    }
+                      if ($path_args[4] == 'intel_event') {
+                        $load_index = 5;
+                        $load_type = 'intel_intel_event';
+                        $load_title = Intel_Df::t('Intel Event');
+                        $bc_title = Intel_Df::t('Event');
+                      }
+                      elseif ($path_args[4] == 'goal') {
+                        $load_index = 5;
+                        $load_type = 'intel_goal';
+                        $bc_title = $load_title = Intel_Df::t('Goal');
+                      }
+                      elseif ($path_args[4] == 'taxonomy') {
+                        $load_index = 5;
+                        $load_type = 'intel_taxonomy';
+                        $bc_title = $load_title = Intel_Df::t('Taxonomy');
+                      }
+                    }
+                    else if ($path_args[1] == 'util') {
+                      if ($path_args[2] == 'log' && !empty($path_args[3])) {
+                        $load_index = 3;
+                        $load_type = 'intel_log';
+                        $load_title = Intel_Df::t('Intel Log');
+                        $bc_title = Intel_Df::t('Log');
+                      }
+                    }
+                    if ($load_index) {
+                        $func = $load_type . '_load';
+                        $path_args_t[$load_index] = $func($path_args[$load_index]);
+                        $entity = $path_args_t[$load_index];
+                        if(empty($entity)) {
+                            $vars = array(
+                                'title' => esc_html__('404 Error', 'intel'),
+                                'markup' => Intel_Df::t('@load_title not found', array(
+                                    '@load_title' => $load_title,
+                                )),
+                                //'markup' => esc_html__('@load_title not found', 'intel'),
+                                'messages' => Intel_Df::drupal_get_messages(),
+                            );
+                            print Intel_Df::theme('intel_page', $vars);
+                            return;
+                        }
+                        $a = $path_args;
+                        $a[$load_index] = '%' . $load_type;
+                        $qt = implode('/', $a);
+                        if (!empty($menu_info[$qt])) {
+                            $info = $menu_info[$qt];
+                        }
+                        $a = array_slice($path_args, 0, $load_index);
+                        $breadcrumbs[] = array(
+                            'text' => $bc_title,
+                            'path' => Intel_Df::url(implode('/', $a)),
+                        );
+                        $a = array_slice($path_args, 0, $load_index + 1);
+                        $breadcrumbs[] = array(
+                            'text' => ($entity instanceof IntelEntity) ? $entity->label() : $entity['title'],
+                            //'path' => Intel_Df::url(implode('/', $a)),
+                        );
+                    }
+                }
+            }
 …
         // Don't show the connect notice anywhere but the plugins.php after activating
         $current = get_current_screen();
         if (!intel_is_installed('min') && 'plugins' === $current->parent_base  ) {
+        if (!intel_is_installed('min') && !intel_is_framework() && 'plugins' === $current->parent_base  ) {
             $l_options = Intel_Df::l_options_add_class('btn btn-info');
             $output .= '  <div class="panel panel-info m-t-1">';

intelligence/trunk/admin/intel.admin_config.php

-                      r2018028
+                      r2947915
   //global $base_url;
+  include_once INTEL_DIR . 'includes/intel.ga.php';
+  //include_once INTEL_DIR . 'includes/intel.ga.php';
+  intel_load_include('includes/intel.ga');
   // check dependencies
 …
+  }
+  include_once INTEL_DIR . 'includes/intel.imapi.php';
+  //include_once INTEL_DIR . 'includes/intel.imapi.php';
+  intel_load_include('includes/intel.imapi');
   $ga_data_source = intel_ga_data_source();
 …
   // check if imapi_property needs to be fetched
   $imapi_property = get_option('intel_imapi_property', array());
+  if (empty($imapi_property) || empty($op_meta['imapi_property_updated']) || (time() - $op_meta['imapi_property_updated'] < 86400) || !empty($_GET['refresh'])) {
+  if (
+    empty($imapi_property) || empty($imapi_property['intel_tid'])
+    || ($imapi_property['intel_tid'] != $ga_tid)
+    || empty($op_meta['imapi_property_updated'])
+    || (time() - $op_meta['imapi_property_updated'] < 86400)
+    || !empty($_GET['refresh'])
+  ) {
     if ($ga_tid && $apikey) {
       $options = array(
 …
         'apikey' => $apikey,
       );
       try {
         $imapi_property = intel_imapi_property_get($options);
         $op_meta['imapi_property_updated'] = time();
+      }
 …
         unset($op_meta['imapi_property_updated']);
+      }
       update_option('intel_imapi_property', $imapi_property);
       update_option('intel_option_meta', $op_meta);
 …
   $ga_viewid = get_option('intel_ga_view', '');
   $ga_profile_base = get_option('intel_ga_profile_base', array());
   if (!empty($imapi_property) && (empty($ga_profile) || empty($ga_viewid))) {
     $ga_profile = $imapi_property['ga_profile'];
 …
   /*
   $form['l10iapi']['intel_ga_tid'] = array(
 …
     '#field_suffix' => '/',
   );
   $options = array(
     '' => Intel_Df::t('Default'),
 …
 function intel_admin_settings_validate($form, &$form_state) {
   $values = $form_state['values'];
   // convert string to array
   parse_str($form_state['values']['intel_l10iapi_custom_params'], $params);
 …
     || ($values['intel_ga_tid'] != $imapi_property->intel_tid)
   ) {
+    $values['intel_imapi_url'] = trim($values['intel_imapi_url']);
     $options = array(
       'tid' => $values['intel_ga_tid'],
+      'apikey' => $values['intel_apikey']
+    );
+      'apikey' => $values['intel_apikey'],
+      'api_url' => !empty($values['intel_imapi_url']) ? $values['intel_imapi_url'] : INTEL_IMAPI_URL,
+    );
     try {
       $form_state['intel_imapi_property'] = $imapi_property = intel_imapi_property_get($options);
 …
 function intel_admin_goal_list_page() {
+  require_once INTEL_DIR . "includes/intel.ga.php";
+  //require_once INTEL_DIR . "includes/intel.ga.php";
+  intel_load_include('includes/intel.ga');
 …
     intel_sync_goals_ga_goals();
     Intel_Df::drupal_set_message(Intel_Df::t('Goal data has been resynced'));
     $l_option = Intel_Df::l_options_add_query(array());
+    $l_option = intel_l_options_add_query(array());
     Intel_Df::drupal_goto(Intel_Df::current_path(), $l_option);
+  }
 …
   if (isset($_GET['refresh'])) {
     Intel_Df::drupal_set_message(Intel_Df::t('Goal data has been refreshed'));
     $l_option = Intel_Df::l_options_add_query(array());
+    $l_option = intel_l_options_add_query(array());
     Intel_Df::drupal_goto(Intel_Df::current_path(), $l_option);
+  }
 …
+  }
   $form_state['event'] = $event;
+  $form['#intel_event'] = $form_state['intel_event'] = $event;
   $add = empty($event['key']);
   $custom = (!$event || !empty($event['custom'])) ? 1 : 0;
 …
       '#type' => (1 || $custom || !empty($overridable[$key])) ? 'textarea' : 'item',
       '#title' => Intel_Df::t('Page list'),
       '#default_value' => !empty($event[$key]) ? $event[$key] : 0,
+      '#default_value' => !empty($event[$key]) ? $event[$key] : '',
       '#disabled' => !($custom || !empty($overridable[$key])),
       '#description' => Intel_Df::t("Specify pages by using their paths. Enter one path per line. The '*' character is a wildcard. For example, if all blog pages are Example paths are blog for the blog page and blog/* for every personal blog. <home> is the front page."),
 …
 function intel_admin_intel_event_form_validate(&$form, &$form_state) {
   $values = $form_state['values'];
   $event = $form_state['event'];
+  $event = $form_state['intel_event'];
   $key = '';
   if (!empty($values['key'])) {
 …
 function intel_admin_intel_event_form_submit(&$form, &$form_state) {
   $values = $form_state['values'];
   $add = empty($form_state['event']['key']) ? 1 : 0;
+  $add = empty($form_state['intel_event']['key']) ? 1 : 0;
 …
+  }
   else {
     $key = $form_state['event']['key'];
+    $key = $form_state['intel_event']['key'];
+  }
 …
   if ($add) {
     $msg = Intel_Df::t('Intel event %title has been added.', array(
       '%title' => $event['title'],
+      '%title' => !empty($event['title']) ? $event['title'] : $form_state['intel_event']['title'],
     ));
+  }
   else {
     $msg = Intel_Df::t('Intel event %title has been updated.', array(
       '%title' => $event['title'],
+      '%title' => !empty($event['title']) ? $event['title'] : $form_state['intel_event']['title'],
     ));
+  }

intelligence/trunk/admin/intel.admin_setup.php

-                      r2018028
+                      r2947915
   $items = array();
+  $items[] = '<div class="alert alert-danger">';
+  $items[] = Intel_Df::t('This plugin was designed to work with Google Universal Analytics which has been discontinued by Google as of 7/1/2023.');
+  $items[] = Intel_Df::t('As such, the Intelligence API has been discontinued. This plugin should no longer be installed on new sites.');
+  $items[] = '</div>';
   $items[] = '<div class="text-center">';
   $items[] = '<h3>' . Intel_Df::t('Results oriented Google Analytics made easy.') . '</h3>';

intelligence/trunk/admin/intel.admin_util.php

-                      r2018028
+                      r2947915
 <?php
+use function d7\db_query;
 /**
  * @file
 …
  */
 function intel_util_temp() {
+  update_option('intel_ga_data_api', 'intel');
+  include_once INTEL_DIR . 'includes/intel.imapi.php';
+  $ga_access_token = intel_imapi_ga_access_token_get();
+  intel_d($ga_access_token);
+  update_option('intel_ga_access_token', $ga_access_token);
+  return 'OK';
+  return '';
+}
 …
+}
+function intel_util_log_page() {
+function intel_util_log_page($entity) {
+  $output = '';
+  if (intel_is_debug()) {
+    //intel_d($entity->variables);
+  }
+  $rows = array();
+  $rows[] = array(
+    Intel_Df::t('Type'),
+    $entity->type,
+  );
+  $rows[] = array(
+    Intel_Df::t('Date'),
+    Intel_Df::format_date($entity->timestamp, ''),
+  );
+  $rows[] = array(
+    Intel_Df::t('User'),
+    '',
+  );
+  $rows[] = array(
+    Intel_Df::t('Location'),
+    $entity->location,
+  );
+  $rows[] = array(
+    Intel_Df::t('Referrer'),
+    $entity->referrer,
+  );
+  intel_d($entity->variables);
+  $vars = (is_array($entity->variables)) ?$entity->variables : array();
+  $rows[] = array(
+    Intel_Df::t('Message'),
+    Intel_Df::t($entity->message, $vars),
+  );
+  /*
+  $rows[] = array(
+    Intel_Df::t('Variables'),
+    intel_d($entity->variables),
+  );
+  */
+  $rows[] = array(
+    Intel_Df::t('Severity'),
+    $entity->severity,
+  );
+  $rows[] = array(
+    Intel_Df::t('Hostname'),
+    $entity->hostname,
+  );
+  $rows[] = array(
+    Intel_Df::t('Operations'),
+    '' , //$entity->hostname,
+  );
+  $vars = array(
+    'header' => array(),
+    'rows' => $rows,
+  );
+  $output .= Intel_Df::theme('table', $vars);
+  // TODO
+  return $output;
+}
+function intel_util_log_list_page() {
   $output = '';
 …
   $output .= Intel_Df::render($form);
+  $variables = array(
+    '%foo' => 'Foo',
+  );
+  //Intel_Df::watchdog('test', 'foo: %foo', $variables, Intel_Df::WATCHDOG_INFO);
+  $watchdog_mode = Intel_Df::watchdog_mode();
+  if ($watchdog_mode != 'db') {
+    return $output;
+  }
+  $row_limit = 100;
+  $header = array(
+    Intel_Df::t('Type'),
+    Intel_Df::t('Date'),
+    Intel_Df::t('Message'),
+    Intel_Df::t('User'),
+    Intel_Df::t('Ops'),
+  );
+  $filter = array();
+  $options = array();
+  $options['order_by'] = 'timestamp DESC';
+  $entities = intel()->get_entity_controller('intel_log')->loadByFilter($filter, $options, $header, $row_limit, 0);
+  $rows = array();
+  $options = array();
+  $custom_default_value = '';
+  $link_options = array(
+    'query' => Intel_Df::drupal_get_destination(),
+  );
+  $count = 0;
+  foreach ($entities as $entity) {
+    $row = array();
+    $row[] = $entity->type;
+    $row[] = Intel_Df::format_date($entity->timestamp, $format = '');
+    $row[] = Intel_df::l(substr($entity->message, 0, 64), 'admin/util/log/' . $entity->lid);
+    $row[] = '';
+    $row[] = '';
+    $rows[] = $row;
+  }
+  $vars = array(
+    'header' => $header,
+    'rows' => $rows,
+    'empty' => Intel_Df::t('No log entries found.'),
+  );
+  $output .= Intel_Df::theme('table', $vars);
   return $output;
+}
 …
 function intel_util_log_form($form, &$form_state) {
+  $watchdog_mode = get_option('intel_watchdog_mode', '');
+  $watchdog_mode = Intel_Df::watchdog_mode();
+  intel_d($watchdog_mode);
   $form['settings'] = array(
 …
   $options = array(
     '' => Intel_Df::t('None'),
     'log' => Intel_Df::t('Log'),
+    'error_log' => Intel_Df::t('Error log'),
     'db' => Intel_Df::t('Database'),
   );
 …
 function intel_util_log_form_submit($form, &$form_state) {
+  global $wpdb;
   //intel_d($form_state);
   $values = $form_state['values'];
 …
   if (!empty($form_state['input']['submit_settings'])) {
+    update_option('intel_watchdog_mode', $values['watchdog_mode']);
+    if (intel()->is_network_active) {
+      update_site_option('intel_watchdog_mode', $values['watchdog_mode']);
+    }
+    else {
+      update_option('intel_watchdog_mode', $values['watchdog_mode']);
+    }
+    if ($values['watchdog_mode'] == 'db') {
+      if (!intel_log_table_exists()) {
+        intel_log_table_create();
+        Intel_Df::drupal_set_message(Intel_Df::t('intel_log db table created.'));
+      }
+    }
+    else {
+      if (intel_log_table_exists()) {
+        intel_log_table_drop();
+        Intel_Df::drupal_set_message(Intel_Df::t('intel_log db table dropped.'));
+      }
+    }
     Intel_Df::drupal_set_message(Intel_Df::t('Settings have been updated.'));
+  }
   if (!empty($form_state['input']['submit_clear'])) {
+    $table_name = $wpdb->prefix . "intel_log";
+    $delete = $wpdb->query("TRUNCATE TABLE $table_name");
     Intel_Df::drupal_set_message(Intel_Df::t('Log has been cleared.'));
+  }
+}
+function intel_log_table_exists() {
+  global $wpdb;
+  $table_name = $wpdb->prefix . "intel_log";
+  if ( $wpdb->get_var( $wpdb->prepare( "SHOW TABLES LIKE %s", $table_name ) ) === $table_name ) {
+    return TRUE;
+  }
+  return FALSE;
+}
+function intel_log_table_create() {
+  global $wpdb;
+  require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+  $charset_collate = $wpdb->get_charset_collate();
+  $table_name = $wpdb->prefix . "intel_log";
+  $sql = "CREATE TABLE $table_name (
+    lid int(11) NOT NULL AUTO_INCREMENT,
+    uid int(11) NOT NULL DEFAULT '0',
+    type varchar(64) NOT NULL DEFAULT '',
+    message longtext NOT NULL,
+    variables longblob NOT NULL,
+    severity tinyint(3) UNSIGNED NOT NULL DEFAULT '0',
+    link varchar(255) DEFAULT '',
+    location text NOT NULL,
+    referer text,
+    hostname varchar(128) NOT NULL DEFAULT '',
+    timestamp int(11) NOT NULL DEFAULT '0',
+    PRIMARY KEY (lid),
+    KEY type (type),
+    KEY uid (uid),
+    KEY severity (severity)
+  ) $charset_collate;";
+  dbDelta( $sql );
+}
+function  intel_log_table_drop() {
+  global $wpdb;
+  require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+  $charset_collate = $wpdb->get_charset_collate();
+  $table_name = $wpdb->prefix . "intel_log";
+  $sql = "DROP TABLE IF EXISTS $table_name;";
+  $wpdb->query($sql);
+}
 …
   $account = wp_get_current_user();
+  $form_id = $form_state['build_info']['form_id'];
+  $form_def = array(
+    'formType' => 'intel_form',
+    'formId' => $form_id,
+    'formTitle' => ucwords(str_replace('_', ' ', $form_id)),
+    'selector' => "form#{$form_id}",
+    'trackView' => 1,
+  );
+  intel_add_page_intel_push(array('formtracker:trackForm', $form_def));
   $form['data.givenName'] = array(

intelligence/trunk/admin/intel.admin_visitor.php

-                      r1904936
+                      r2947915
+    }
+  }
   dsm($prop_options);
+  //dsm($prop_options);
   $tax_options = array(
 …
   // Retrieve all profile fields and attach to $entity->content.
   Intel_Visitor::build_content($entity);
+  IntelVisitor::build_content($entity);
   $build = $entity->content;

intelligence/trunk/includes/class-intel-activator.php

-                      r1827302
+                      r2947915
         dbDelta( $sql );
+        $table_name = $wpdb->prefix . "intel_annotation";
+        $sql = "CREATE TABLE $table_name (
+    aid int(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+    uid int(11) NOT NULL DEFAULT '0',
+    created int(10) UNSIGNED NOT NULL DEFAULT 0,
+    updated int(10) UNSIGNED NOT NULL DEFAULT 0,
+    started int(10) UNSIGNED NOT NULL DEFAULT 0,
+    transient_period int(10) UNSIGNED NOT NULL DEFAULT 0,
+    ended int(10) UNSIGNED NOT NULL DEFAULT 0,
+    analytics_period int(10) UNSIGNED NOT NULL DEFAULT 0,
+    type varchar(128) NOT NULL DEFAULT '',
+    message longtext NOT NULL,
+    variables longtext NOT NULL,
+    data longtext NOT NULL,
+    PRIMARY KEY (aid),
+    KEY started (started),
+    KEY analytics_period (analytics_period),
+    KEY type (type(14))
+    ) $charset_collate;";
+        dbDelta( $sql );
+    }

intelligence/trunk/includes/class-intel-df.php

-                      r2018028
+                      r2947915
     const MENU_CONTEXT_INLINE = 0x0002;
+    const WATCHDOG_NOTICE = 5;
+    const WATCHDOG_ERROR = 3;
+  /**
+   * Watchdog status flags
+   */
+  const WATCHDOG_EMERGENCY = 0;
+  const WATCHDOG_ALERT = 1;
+  const WATCHDOG_CRITICAL = 2;
+  const WATCHDOG_ERROR = 3;
+  const WATCHDOG_WARNING = 4;
+  const WATCHDOG_NOTICE = 5;
+  const WATCHDOG_INFO = 6;
+  const WATCHDOG_DEBUG = 7;
     private function __construct() {
 …
         Intel_Df::watchdog('$request_uri', $request_uri);
         Intel_Df::watchdog('current_url', $current_url);
+        Intel_Df::watchdog('$request_uri', $request_uri);//
+        Intel_Df::watchdog('current_url', $current_url);//
         $site_url = get_site_url();
         Intel_Df::watchdog('get_site_url', $site_url);
         $path = str_replace($site_url, '', $current_url);
         Intel_Df::watchdog('path', $path);
+        Intel_Df::watchdog('get_site_url', $site_url);//
+        $path = str_replace($site_url, '', $current_url);//
+        Intel_Df::watchdog('path', $path);//
         return $path;
+    }
 …
+        }
+    }
+  /**
+   * Adds a JavaScript file, setting, or inline code to the page.
+   *
+   * The behavior of this function depends on the parameters it is called with.
+   * Generally, it handles the addition of JavaScript to the page, either as
+   * reference to an existing file or as inline code. The following actions can be
+   * performed using this function:
+   * - Add a file ('file'): Adds a reference to a JavaScript file to the page.
+   * - Add inline JavaScript code ('inline'): Executes a piece of JavaScript code
+   *   on the current page by placing the code directly in the page (for example,
+   *   to tell the user that a new message arrived, by opening a pop up, alert
+   *   box, etc.). This should only be used for JavaScript that cannot be executed
+   *   from a file. When adding inline code, make sure that you are not relying on
+   *   $() being the jQuery function. Wrap your code in
+   *   @code (function ($) {... })(jQuery); @endcode
+   *   or use jQuery() instead of $().
+   * - Add external JavaScript ('external'): Allows the inclusion of external
+   *   JavaScript files that are not hosted on the local server. Note that these
+   *   external JavaScript references do not get aggregated when preprocessing is
+   *   on.
+   * - Add settings ('setting'): Adds settings to Drupal's global storage of
+   *   JavaScript settings. Per-page settings are required by some modules to
+   *   function properly. All settings will be accessible at Drupal.settings.
+   *
+   * Examples:
+   * @code
+   *   drupal_add_js('misc/collapse.js');
+   *   drupal_add_js('misc/collapse.js', 'file');
+   *   drupal_add_js('jQuery(document).ready(function () { alert("Hello!"); });', 'inline');
+   *   drupal_add_js('jQuery(document).ready(function () { alert("Hello!"); });',
+   *     array('type' => 'inline', 'scope' => 'footer', 'weight' => 5)
+   *   );
+   *   drupal_add_js('http://example.com/example.js', 'external');
+   *   drupal_add_js(array('myModule' => array('key' => 'value')), 'setting');
+   * @endcode
+   *
+   * Calling drupal_static_reset('drupal_add_js') will clear all JavaScript added
+   * so far.
+   *
+   * If JavaScript aggregation is enabled, all JavaScript files added with
+   * $options['preprocess'] set to TRUE will be merged into one aggregate file.
+   * Preprocessed inline JavaScript will not be aggregated into this single file.
+   * Externally hosted JavaScripts are never aggregated.
+   *
+   * The reason for aggregating the files is outlined quite thoroughly here:
+   * http://www.die.net/musings/page_load_time/ "Load fewer external objects. Due
+   * to request overhead, one bigger file just loads faster than two smaller ones
+   * half its size."
+   *
+   * $options['preprocess'] should be only set to TRUE when a file is required for
+   * all typical visitors and most pages of a site. It is critical that all
+   * preprocessed files are added unconditionally on every page, even if the
+   * files are not needed on a page. This is normally done by calling
+   * drupal_add_js() in a hook_init() implementation.
+   *
+   * Non-preprocessed files should only be added to the page when they are
+   * actually needed.
+   *
+   * @param $data
+   *   (optional) If given, the value depends on the $options parameter, or
+   *   $options['type'] if $options is passed as an associative array:
+   *   - 'file': Path to the file relative to base_path().
+   *   - 'inline': The JavaScript code that should be placed in the given scope.
+   *   - 'external': The absolute path to an external JavaScript file that is not
+   *     hosted on the local server. These files will not be aggregated if
+   *     JavaScript aggregation is enabled.
+   *   - 'setting': An associative array with configuration options. The array is
+   *     merged directly into Drupal.settings. All modules should wrap their
+   *     actual configuration settings in another variable to prevent conflicts in
+   *     the Drupal.settings namespace. Items added with a string key will replace
+   *     existing settings with that key; items with numeric array keys will be
+   *     added to the existing settings array.
+   * @param $options
+   *   (optional) A string defining the type of JavaScript that is being added in
+   *   the $data parameter ('file'/'setting'/'inline'/'external'), or an
+   *   associative array. JavaScript settings should always pass the string
+   *   'setting' only. Other types can have the following elements in the array:
+   *   - type: The type of JavaScript that is to be added to the page. Allowed
+   *     values are 'file', 'inline', 'external' or 'setting'. Defaults
+   *     to 'file'.
+   *   - scope: The location in which you want to place the script. Possible
+   *     values are 'header' or 'footer'. If your theme implements different
+   *     regions, you can also use these. Defaults to 'header'.
+   *   - group: A number identifying the group in which to add the JavaScript.
+   *     Available constants are:
+   *     - JS_LIBRARY: Any libraries, settings, or jQuery plugins.
+   *     - JS_DEFAULT: Any module-layer JavaScript.
+   *     - JS_THEME: Any theme-layer JavaScript.
+   *     The group number serves as a weight: JavaScript within a lower weight
+   *     group is presented on the page before JavaScript within a higher weight
+   *     group.
+   *   - every_page: For optimal front-end performance when aggregation is
+   *     enabled, this should be set to TRUE if the JavaScript is present on every
+   *     page of the website for users for whom it is present at all. This
+   *     defaults to FALSE. It is set to TRUE for JavaScript files that are added
+   *     via module and theme .info files. Modules that add JavaScript within
+   *     hook_init() implementations, or from other code that ensures that the
+   *     JavaScript is added to all website pages, should also set this flag to
+   *     TRUE. All JavaScript files within the same group and that have the
+   *     'every_page' flag set to TRUE and do not have 'preprocess' set to FALSE
+   *     are aggregated together into a single aggregate file, and that aggregate
+   *     file can be reused across a user's entire site visit, leading to faster
+   *     navigation between pages. However, JavaScript that is only needed on
+   *     pages less frequently visited, can be added by code that only runs for
+   *     those particular pages, and that code should not set the 'every_page'
+   *     flag. This minimizes the size of the aggregate file that the user needs
+   *     to download when first visiting the website. JavaScript without the
+   *     'every_page' flag is aggregated into a separate aggregate file. This
+   *     other aggregate file is likely to change from page to page, and each new
+   *     aggregate file needs to be downloaded when first encountered, so it
+   *     should be kept relatively small by ensuring that most commonly needed
+   *     JavaScript is added to every page.
+   *   - weight: A number defining the order in which the JavaScript is added to
+   *     the page relative to other JavaScript with the same 'scope', 'group',
+   *     and 'every_page' value. In some cases, the order in which the JavaScript
+   *     is presented on the page is very important. jQuery, for example, must be
+   *     added to the page before any jQuery code is run, so jquery.js uses the
+   *     JS_LIBRARY group and a weight of -20, jquery.once.js (a library drupal.js
+   *     depends on) uses the JS_LIBRARY group and a weight of -19, drupal.js uses
+   *     the JS_LIBRARY group and a weight of -1, other libraries use the
+   *     JS_LIBRARY group and a weight of 0 or higher, and all other scripts use
+   *     one of the other group constants. The exact ordering of JavaScript is as
+   *     follows:
+   *     - First by scope, with 'header' first, 'footer' last, and any other
+   *       scopes provided by a custom theme coming in between, as determined by
+   *       the theme.
+   *     - Then by group.
+   *     - Then by the 'every_page' flag, with TRUE coming before FALSE.
+   *     - Then by weight.
+   *     - Then by the order in which the JavaScript was added. For example, all
+   *       else being the same, JavaScript added by a call to drupal_add_js() that
+   *       happened later in the page request gets added to the page after one for
+   *       which drupal_add_js() happened earlier in the page request.
+   *   - requires_jquery: Set this to FALSE if the JavaScript you are adding does
+   *     not have a dependency on jQuery. Defaults to TRUE, except for JavaScript
+   *     settings where it defaults to FALSE. This is used on sites that have the
+   *     'javascript_always_use_jquery' variable set to FALSE; on those sites, if
+   *     all the JavaScript added to the page by drupal_add_js() does not have a
+   *     dependency on jQuery, then for improved front-end performance Drupal
+   *     will not add jQuery and related libraries and settings to the page.
+   *   - defer: If set to TRUE, the defer attribute is set on the <script>
+   *     tag. Defaults to FALSE.
+   *   - cache: If set to FALSE, the JavaScript file is loaded anew on every page
+   *     call; in other words, it is not cached. Used only when 'type' references
+   *     a JavaScript file. Defaults to TRUE.
+   *   - preprocess: If TRUE and JavaScript aggregation is enabled, the script
+   *     file will be aggregated. Defaults to TRUE.
+   *
+   * @return
+   *   The current array of JavaScript files, settings, and in-line code,
+   *   including Drupal defaults, anything previously added with calls to
+   *   drupal_add_js(), and this function call's additions.
+   *
+   * @see drupal_get_js()
+   */
+  public static function drupal_add_js($data = NULL, $options = NULL) {
+    intel()->add_js($data, $options);
+  }
     /**
 …
         // The 'Location' HTTP header must be absolute.
         $options['absolute'] = TRUE;
         $url = self::url($path, $options);
 …
+    }
+  public static function entity_get_controller($entity_type) {
+    return intel()->get_entity_controller($entity_type);
+  }
+  public static function entity_get_info($entity_type = NULL) {
+    return intel()->entity_info($entity_type);
+  }
     public static function format_date($time, $format = '') {
 …
         if ($options['external'] && strpos($path, '//') == FALSE) {
             $hook_data = apply_filters('intel_url_urn_resolver', $hook_data);
             // check if path returned from resover is external
+            // check if path returned from resolver is external
             $options['external'] = self::url_is_external($path);
+        }
 …
+            }
+            if (isset($options['https']) && variable_get('https', FALSE)) {
+      //if (isset($options['https']) && variable_get('https', FALSE)) {
+      if (isset($options['https'])) {
                 if ($options['https'] === TRUE) {
                     $path = str_replace('http://', 'https://', $path);
 …
         // The base_url might be rewritten from the language rewrite in domain mode.
         if (!isset($options['base_url'])) {
             if (isset($options['https']) && variable_get('https', FALSE)) {
+            if (isset($options['https']) && get_option('https', FALSE)) {
                 if ($options['https'] === TRUE) {
                     $options['base_url'] = $base_secure_url;
 …
                     $admin_page = 'intel_visitor';
+                }
+                elseif ($path_args[1] == 'annotations') {
+                    $admin_page = 'intel_annotation';
+                }
+            }
+        }
 …
         elseif($path_args[0] == 'submission') {
             $admin_page = 'intel_admin';
+        }
+        elseif($path_args[0] == 'annotation') {
+            $admin_page = 'intel_annotation';
+        }
 …
             $is_admin_path = 1;
+        }
         // if path uses /wp-admin/ or /subdir/wp-admin/ format, strip off base_path_admin
 …
         if ($is_admin_path) {
             $base = $options['absolute'] ? $options['base_url'] . $intel->base_path_admin : $intel->base_path_admin;
+            // check if current context is network admin and add correct url to stay on network admin
+            if ($intel->is_network_admin) {
+              $base .= 'network/';
+      }
             $prefix = empty($path) ? rtrim($options['prefix'], '/') : $options['prefix'];
+        }
 …
             $search = '';
             if (strpos($string, $k) !== FALSE) {
+              if (!is_string($v)) {
+          continue;
+        }
                 if (substr($k, 1, 0) == '@' ) {
                     $v = self::check_plain($v);
 …
         // if template file, process variables via template file
         if (!empty($info['template'])) {
+            $file = INTEL_DIR . 'templates/' . $info['template'] . '.tpl.php';
+      if (!empty($info['path'])) {
+        $file = $info['path'] . $info['template'] . '.tpl.php';
+      }
+      else {
+        $file = INTEL_DIR . 'templates/' . $info['template'] . '.tpl.php';
+      }
             if (file_exists($file)) {
                 $output = self::process_template($file, $variables);
 …
     public static function theme_table($variables) {
         $defs = array(
+          'header' => array(),
             'rows' => array(),
             'attributes' => array(),
 …
                 // Build colgroup
                 if (is_array($cols) && count($cols)) {
                     $output .= ' <colgroup' . Intl_Df::drupal_attributes($attributes) . '>';
+                    $output .= ' <colgroup' . Intel_Df::drupal_attributes($attributes) . '>';
                     $i = 0;
                     foreach ($cols as $col) {
                         $output .= ' <col' . Intl_Df::drupal_attributes($col) . ' />';
+                        $output .= ' <col' . Intel_Df::drupal_attributes($col) . ' />';
+                    }
                     $output .= " </colgroup>\n";
+                }
                 else {
                     $output .= ' <colgroup' . Intl_Df::drupal_attributes($attributes) . " />\n";
+                    $output .= ' <colgroup' . Intel_Df::drupal_attributes($attributes) . " />\n";
+                }
+            }
 …
     public static function watchdog($type, $message = '', $variables = array(), $severity = Intel_Df::WATCHDOG_NOTICE, $link = NULL) {
         //$option_log = get_option('intel_debug_log', '');
+        $msg = __('WATCHDOG', 'intel') . ': ' . $type . ":\n" . $message;
+        //self::drupal_set_message($msg);
+        error_log(self::t($msg, $variables));
+        //$option_log .= $msg . "\n";
+        //update_option('intel_debug_log', $option_log);
+    }
+    static $in_error_state = FALSE;
+    // It is possible that the error handling will itself trigger an error. In that case, we could
+    // end up in an infinite loop. To avoid that, we implement a simple static semaphore.
+    if (!$in_error_state && function_exists('apply_filters')) {
+      $in_error_state = TRUE;
+      // The user object may not exist in all conditions, so 0 is substituted if needed.
+      $user_uid = get_current_user_id();
+      // Prepare the fields to be logged
+      $log_entry = [
+        'type' => $type,
+        'message' => $message,
+        'variables' => $variables,
+        'severity' => $severity,
+        'link' => $link,
+        //'user' => $user,
+        'uid' => $user_uid,
+        'request_uri' => self::request_uri(), //$base_root . request_uri(),
+        'referer' => isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '',
+        //'ip' => ip_address(),
+        // Request time isn't accurate for long processes, use time() instead.
+        'timestamp' => time(),
+      ];
+      $log_entry = apply_filters('intel_watchdog', $log_entry);
+      $mode = self::watchdog_mode();
+      if ($mode == 'db') {
+        $intel_log = intel_log_create($log_entry);
+        intel_log_save($intel_log);
+      }
+      else if ($mode == 'error_log') {
+        $msg = __('WATCHDOG', 'intel') . ': ' . $type . ":\n" . $message;
+        //self::drupal_set_message($msg);
+        error_log(self::t($log_entry['message'], $log_entry['variables'], ['html' => 1]));
+      }
+      // It is critical that the semaphore is only cleared here, in the parent
+      // watchdog() call (not outside the loop), to prevent recursive execution.
+      $in_error_state = FALSE;
+    }
+    }
+    public static function watchdog_mode() {
+      if (isset($intel_wp_config_options['intel_watchdog_mode'])) {
+      return $intel_wp_config_options['intel_watchdog_mode'];
+    }
+    if (intel()->is_network_active) {
+      return get_site_option('intel_watchdog_mode', '');
+    }
+    return get_option('intel_watchdog_mode', '');
+  }
+}

intelligence/trunk/includes/class-intel-form.php

r2018028	r2947915
1198	1198	// An unchecked checkbox has a #value of integer 0, different than string
1199	1199	// '0', which could be a valid value.
1200		$is_empty_multiple = (!count($elements['#value']));
	1200	$is_empty_multiple = (is_array($elements['#value']) && !count($elements['#value']));
1201	1201	$is_empty_string = (is_string($elements['#value']) && strlen(trim($elements['#value'])) == 0);
1202	1202	$is_empty_value = ($elements['#value'] === 0);

intelligence/trunk/includes/class-intel-tracker.php

-                      r1814908
+                      r2947915
     protected $pushes;
     public $settings_placement = 'head';
     public $pageview_placement = 'head';
+    public $settings_placement = 'footer';
+    public $pageview_placement = 'footer';
     /**
 …
     public function enqueue_intel_scripts() {
+        // add intel_scripts
+        // don't add scripts if in framework mode
+    if (intel_is_framework()) {
+      return;
+    }
+    // add intel_scripts
         $scripts = intel()->intel_script_info();
         $enabled = get_option('intel_intel_scripts_enabled', array());
 …
      */
     public function tracking_head($is_admin = 0) {
+        if (!intel_is_installed('min')) {
+            return '';
+        }
+    $is_framework = intel_is_framework();
+    if (!intel_is_installed('min') && !$is_framework) {
+      return '';
+    }
         $io_name = 'io';
 …
+        }
+        if ($this->pageview_placement == 'head') {
+            $script .= "\n" . "io('pageview');";
+        }
+    if (!$is_framework) {
+      if ($this->pageview_placement == 'head') {
+        $script .= "\n" . "io('pageview');";
+      }
+    }
         print '<script>' . $script . '</script>';
 …
     public function tracking_footer($is_admin = 0) {
+        if (!intel_is_installed('min')) {
+    $is_framework = intel_is_framework();
+        if (!intel_is_installed('min') && !$is_framework) {
             return '';
+        }
 …
+        }
+        intel_page_footer_alter();
+        if ($this->pageview_placement != 'head') {
+            $script .= "\n" . "io('pageview');";
+        }
+    //intel_page_footer_alter();
+        if (!$is_framework) {
+      if ($this->pageview_placement != 'head') {
+        $script .= "\n" . "io('pageview');";
+      }
+    }
         //$script .= "$io_name('set', intel_settings.intel.pushes.set);\n";
         //if (!empty($js_settings['intel']['pushes']['events'])) {
 …
         $io_name = 'io';
+    $is_framework = intel_is_framework();
         $page = array();
         intel_page_alter($page);
 …
         $script .= "var wp_intel = wp_intel || { 'settings': {}, 'behaviors': {}, 'locale': {} };\n";
         $script .= "jQuery.extend(wp_intel.settings, " . json_encode($js_settings) . ");\n";
+        $script .= "$io_name('setConfig', wp_intel.settings.intel.config);\n";
+        if (isset($js_settings['intel']['pushes']) && is_array($js_settings['intel']['pushes'])) {
+            foreach ($js_settings['intel']['pushes'] as $cm => $push) {
+                if (0 && $cm == 'setUserId') {
+                    $script .= $io_name . '("' . $cm . '","' . $push[0][0];
+                    if (!empty($push[0][1])) {
+                        $script .= '","' . $push[0][1];
+                    }
+                    $script .= '");' . "\n";
+                } else {
+                    $script .= "$io_name('$cm', wp_intel.settings.intel.pushes['$cm']);\n";
+                }
+            }
+        }
+        if (!$is_framework) {
+      $script .= "$io_name('setConfig', wp_intel.settings.intel.config);\n";
+      if (isset($js_settings['intel']['pushes']) && is_array($js_settings['intel']['pushes'])) {
+        foreach ($js_settings['intel']['pushes'] as $cm => $push) {
+          if (0 && $cm == 'setUserId') {
+            $script .= $io_name . '("' . $cm . '","' . $push[0][0];
+            if (!empty($push[0][1])) {
+              $script .= '","' . $push[0][1];
+            }
+            $script .= '");' . "\n";
+          } else {
+            $script .= "$io_name('$cm', wp_intel.settings.intel.pushes['$cm']);\n";
+          }
+        }
+      }
+    }
         //$script .= "$io_name('pageview');\n";

intelligence/trunk/includes/class-intel-visitor-page.php

r1653685	r2947915
60	60
61	61	// Retrieve all profile fields and attach to $entity->content.
62		Intel_Visitor::build_content($entity);
	62	IntelVisitor::build_content($entity);
63	63
64	64	$build = $entity->content;

intelligence/trunk/includes/class-intel.php

-                      r1904936
+                      r2947915
     public $time_delta;
+    public $is_network_active;
+  public $is_network_framework_mode;
     protected $js_inline = array();
 …
     public $admin_dir;
+  public $is_network_admin;
     public $vtk;
 …
         $this->admin_url = admin_url();
         $this->admin_dir = ABSPATH . 'wp-admin/';
+    if ( ! function_exists( 'is_plugin_active_for_network' ) ) {
+      require_once( ABSPATH . '/wp-admin/includes/plugin.php' );
+    }
+    $this->is_network_admin = 0;
+    $this->is_network_active = is_plugin_active_for_network('intelligence/intel.php' );
+    $this->is_network_framework_mode = FALSE;
+    if ($this->is_network_active) {
+      $this->is_network_framework_mode = get_site_option('intel_framework_mode', FALSE);
+      $this->is_network_admin = is_network_admin();
+    }
         // determine admin paths
 …
          * Crud super class
          */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-intel-entity-controller.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-intel-entity.php';
+        //require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-intel-entity-controller.php';
+        //require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-intel-entity.php';
+    require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/intel.IntelEntityController.php';
+    require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/intel.IntelEntity.php';
         $this->loader = new Intel_Loader();
 …
         // site menu
         $this->loader->add_action( 'admin_menu', $plugin_admin, 'site_menu' );
+        $this->is_network_active;
+        if ($this->is_network_active) {
+      $this->loader->add_action( 'network_admin_menu', $plugin_admin, 'network_site_menu' );
+    }
         // column headers
 …
             'intel_reports' => 1,
             'intel_visitor' => 1,
+            'intel_annotation' => 1,
             'intel_config' => 1,
             'intel_util' => 1,
 …
     public function quick_session_init($options = array()) {
         include_once INTEL_DIR . 'includes/class-intel-visitor.php';
+        include_once INTEL_DIR . 'includes/intel.IntelVisitor.php';
         $_SESSION['intel'] = !empty($_SESSION['intel']) ? $_SESSION['intel'] : array();
         $this->vtk = Intel_Visitor::extractVtk();
         $this->gacid = Intel_Visitor::extractCid();
+        $this->vtk = IntelVisitor::extractVtk();
+        $this->gacid = IntelVisitor::extractCid();
         $this->session_hash = !empty($this->vtk) ? $this->vtk : $this->gacid;
 …
         $cache = isset($_SESSION['intel_quick_cache']) ? $_SESSION['intel_quick_cache'] : array();
         if (!empty($_SESSION['intel']) && is_array($_SESSION['intel'])) {
+        if (!empty($_SESSION['intel_pushes']) && is_array($_SESSION['intel_pushes'])) {
             if (!empty($cache)) {
                 $cache = Intel_Df::drupal_array_merge_deep($cache, $_SESSION['intel']);
+                $cache = Intel_Df::drupal_array_merge_deep($cache, $_SESSION['intel_pushes']);
+            }
             else {
                 $cache = $_SESSION['intel'];
+                $cache = $_SESSION['intel_pushes'];
+            }
+        }

intelligence/trunk/includes/intel.demo.php

-                      r2018028
+                      r2947915
   $account = wp_get_current_user();
+  $form_id = $form_state['build_info']['form_id'];
+  $form_def = array(
+    'formType' => 'intel_form',
+    'formId' => $form_id,
+    'formTitle' => ucwords(str_replace('_', ' ', $form_id)),
+    'selector' => "form#{$form_id}",
+    'trackView' => 1,
+  );
+  intel_add_page_intel_push(array('formtracker:trackForm', $form_def));
   $form['givenName'] = array(

intelligence/trunk/includes/intel.ga.php

-                      r2018028
+                      r2947915
  */
+/*******************************************************************************
+ * Goal functions
+ */
+/**
+ * Constructs a new goal initializing properties.
+ *
+ * @param $goal
+ * @param array $ga_goal
+ *
+ * @return array|bool
+ */
+function intel_goal_const($goal, $ga_goal = array()) {
+  if (!empty($ga_goal)) {
+    if (!isset($goal['title']) && isset($ga_goal['name'])) {
+      $goal['title'] = $ga_goal['name'];
+    }
+    if (!isset($goal['ga_id']) && isset($ga_goal['id'])) {
+      $goal['ga_id'] = $ga_goal['id'];
+    }
+    if (!isset($goal['type']) && isset($ga_goal['type'])) {
+      $goal['type'] = !intel_is_intl_goal($ga_goal) ? $ga_goal['type'] : 'INTL';
+    }
+    if (!isset($goal['value']) && isset($ga_goal['value'])) {
+      $goal['value'] = $ga_goal['value'];
+    }
+  }
+  if (empty($goal['title'])) {
+    return FALSE;
+  }
+  // if not ga_id set, find first available id
+  if (empty($goal['ga_id'])) {
+    $ga_goals = intel_ga_goal_load();
+    for ($i = 1; $i <= 20; $i++) {
+      if (!isset($ga_goals["$i"])) {
+        $goal['ga_id'] = "$i";
+        break;
+      }
+    }
+  }
+  if (empty($goal['ga_id'])) {
+    return FALSE;
+  }
+  $defaults = array(
+    'ga_id' => $goal['ga_id'],
+    'name' => intel_format_un($goal['title']),
+    'un' => intel_format_un($goal['title']),
+    'title' => $goal['title'],
+    'description' => '',
+    'type' => 'INTEL',
+    'value' => 100,
+    'context' => array(
+      'general' => 1,
+      'submission' => 1,
+      'phonecall' => 1,
+    ),
+  );
+  // non intel goals should not have a context
+  if (!empty($goal['type']) && $goal['type'] != 'INTL' && $goal['type'] != 'INTEL') {
+    $defaults['context'] = array();
+  }
+  $goal = Intel_Df::drupal_array_merge_deep($defaults, $goal);
+  return $goal;
+}
+/**
+ * Saves an Intelligence goal and saves goal to GA if needed.
+ *
+ * For goals already in ga_goals, set the ga_id property.
+ * To create a new Intel goal, don't set ga_id and next ga id will be used.
+ *
+ *
+ * @param $goal
+ * @param array $options
+ * @return array|bool
+ */
+function intel_goal_save($goal, $options = array()) {
+  $goals = intel_goal_load(null, array('index_by' => 'ga_id', 'force_reload' => 1));
+  $ga_goals = intel_ga_goal_load();
+  // if goal already exists, merge in existing properties
+  if (isset($goal['ga_id']) && isset($goals[$goal['ga_id']])) {
+    $goal = Intel_Df::drupal_array_merge_deep($goals[$goal['ga_id']], $goal);
+  }
+  // if ga goal exists, set ga_goal and use it to set the type if not already
+  // set
+  if (!empty($goal['ga_id']) && !empty($ga_goals[$goal['ga_id']])) {
+    $ga_goal = $ga_goals[$goal['ga_id']];
+    if (empty($goal['type']) && !empty($ga_goal['type'])) {
+      if (intel_is_intl_goal($ga_goal)) {
+        $goal['type'] = 'INTEL';
+      }
+      else {
+        $goal['type'] = $ga_goal['type'];
+      }
+    }
+    if (!isset($goal['value']) && isset($ga_goal['value'])) {
+      $goal['value'] = $ga_goal['value'];
+    }
+  }
+  // fill in missing defaults
+  $goal = intel_goal_const($goal);
+  // goal is type intel, save to ga
+  if (!isset($goal['type']) || $goal['type'] == 'INTL' || $goal['type'] == 'INTEL' ) {
+    // if goal type is Intel goal, save to ga goal also
+    $ga_goal = array(
+      'id' => $goal['ga_id'],
+      'name' => $goal['title'],
+      'type' => $goal['type'],
+    );
+    $ga_goal = intel_ga_goal_save($ga_goal);
+  }
+  $goals[$goal['ga_id']] = $goal;
+  update_option('intel_goals', $goals);
+  return $goal;
+}
 /**
 …
+}
+function intel_goal_const($goal, $ga_goal = array()) {
+  if (!empty($ga_goal)) {
+    if (!isset($goal['title']) && isset($ga_goal['name'])) {
+      $goal['title'] = $ga_goal['name'];
+    }
+    if (!isset($goal['ga_id']) && isset($ga_goal['id'])) {
+      $goal['ga_id'] = $ga_goal['id'];
+    }
+    if (!isset($goal['type']) && isset($ga_goal['type'])) {
+      $goal['type'] = !intel_is_intl_goal($ga_goal) ? $ga_goal['type'] : 'INTL';
+    }
+    if (!isset($goal['value']) && isset($ga_goal['value'])) {
+      $goal['value'] = $ga_goal['value'];
+    }
+  }
+  if (empty($goal['title'])) {
+    return FALSE;
+  }
+  // if not ga_id set, find first available id
+  if (empty($goal['ga_id'])) {
+    $ga_goals = intel_ga_goal_load();
+    for ($i = 1; $i <= 20; $i++) {
+      if (!isset($ga_goals["$i"])) {
+        $goal['ga_id'] = "$i";
+        break;
+      }
+    }
+  }
+  if (empty($goal['ga_id'])) {
+    return FALSE;
+  }
+  $defaults = array(
+    'ga_id' => $goal['ga_id'],
+    'name' => intel_format_un($goal['title']),
+    'un' => intel_format_un($goal['title']),
+    'title' => $goal['title'],
+    'description' => '',
+    'type' => 'INTEL',
+    'value' => 100,
+    'context' => array(
+      'general' => 1,
+      'submission' => 1,
+      'phonecall' => 1,
+    ),
+  );
+  // non intel goals should not have a context
+  if (!empty($goal['type']) && $goal['type'] != 'INTL' && $goal['type'] != 'INTEL') {
+    $defaults['context'] = array();
+  }
+  $goal = Intel_Df::drupal_array_merge_deep($defaults, $goal);
+  return $goal;
+}
+/**
+ * Saves an Intelligence goal and saves goal to GA if needed.
+ *
+ * For goals already in ga_goals, set the ga_id property.
+ * To create a new Intel goal, don't set ga_id and next ga id will be used.
+ *
+ *
+ * @param $goal
+ * @param array $options
+ * @return array|bool
+ */
+function intel_goal_save($goal, $options = array()) {
+  $goals = intel_goal_load(null, array('index_by' => 'ga_id', 'force_reload' => 1));
+  $ga_goals = intel_ga_goal_load();
+  // if goal already exists, merge in existing properties
+  if (isset($goal['ga_id']) && isset($goals[$goal['ga_id']])) {
+    $goal = Intel_Df::drupal_array_merge_deep($goals[$goal['ga_id']], $goal);
+  }
+  // if ga goal exists, set ga_goal and use it to set the type if not already
+  // set
+  if (!empty($goal['ga_id']) && !empty($ga_goals[$goal['ga_id']])) {
+    $ga_goal = $ga_goals[$goal['ga_id']];
+    if (empty($goal['type']) && !empty($ga_goal['type'])) {
+      if (intel_is_intl_goal($ga_goal)) {
+        $goal['type'] = 'INTEL';
+      }
+      else {
+        $goal['type'] = $ga_goal['type'];
+      }
+    }
+    if (!isset($goal['value']) && isset($ga_goal['value'])) {
+      $goal['value'] = $ga_goal['value'];
+    }
+  }
+  // fill in missing defaults
+  $goal = intel_goal_const($goal);
+  // goal is type intel, save to ga
+  if (!isset($goal['type']) || $goal['type'] == 'INTL' || $goal['type'] == 'INTEL' ) {
+    // if goal type is Intel goal, save to ga goal also
+    $ga_goal = array(
+      'id' => $goal['ga_id'],
+      'name' => $goal['title'],
+      'type' => $goal['type'],
+    );
+    $ga_goal = intel_ga_goal_save($ga_goal);
+  }
+  $goals[$goal['ga_id']] = $goal;
+  update_option('intel_goals', $goals);
+  return $goal;
+}
+function intel_ga_goal_load($name = '', $options = array()) {
+  $op_meta = get_option('intel_option_meta', array());
+  $gapt = '';
+  if (!empty($options['ga_profile_type']) && $options['ga_profile_type'] == 'base') {
+    $gapt = '_base';
+  }
+  // refresh if goal have never been updated
+  if (empty($op_meta['ga_goals' . $gapt . '_updated'])) {
+    $options['refresh'] = 1;
+  }
+  // cache for one day unless requested
+  if (!isset($options['refresh'])) {
+    $options['refresh'] = 86400;
+  }
+  // load goals from ga
+  if (!empty($options['refresh'])) {
+    $time = is_numeric($options['refresh']) ? $options['refresh'] : 0;
+    $ga_goals_updated = !empty($op_meta['ga_goals' . $gapt . '_updated']) ? $op_meta['ga_goals' . $gapt . '_updated'] : 0;
+    if ((time() - $ga_goals_updated) > $time) {
+      include_once INTEL_DIR . 'includes/intel.imapi.php';
+      try {
+        $ga_goals = intel_imapi_ga_goal_get(0, $options);
+        update_option('intel_ga_goals' . $gapt, $ga_goals);
+        $op_meta['ga_goals' . $gapt . '_updated'] = time();
+        update_option('intel_option_meta', $op_meta);
+      }
+      catch (Exception $e) {
+        Intel_Df::drupal_set_message($e->getMessage(), 'error');
+        $ga_goals = array();
+      }
+    }
+  }
+  if (!isset($ga_goals)) {
+    $ga_goals = get_option('intel_ga_goals' . $gapt, array());
+  }
+  if (!empty($name)) {
+    return !empty($ga_goals[$name]) ? $ga_goals[$name] : 0;
+  }
+  return $ga_goals;
+}
 function intel_ga_goal_const($ga_goal) {
 …
   return $ga_goal;
+}
+function intel_ga_goal_load($name = '', $options = array()) {
+  $op_meta = get_option('intel_option_meta', array());
+  $gapt = '';
+  if (!empty($options['ga_profile_type']) && $options['ga_profile_type'] == 'base') {
+    $gapt = '_base';
+  }
+  // refresh if goal have never been updated
+  if (empty($op_meta['ga_goals' . $gapt . '_updated'])) {
+    $options['refresh'] = 1;
+  }
+  // cache for one day unless requested
+  if (!isset($options['refresh'])) {
+    $options['refresh'] = 86400;
+  }
+  // load goals from ga
+  if (!empty($options['refresh'])) {
+    $time = is_numeric($options['refresh']) ? $options['refresh'] : 0;
+    $ga_goals_updated = !empty($op_meta['ga_goals' . $gapt . '_updated']) ? $op_meta['ga_goals' . $gapt . '_updated'] : 0;
+    if ((time() - $ga_goals_updated) > $time) {
+      include_once INTEL_DIR . 'includes/intel.imapi.php';
+      try {
+        $ga_goals = intel_imapi_ga_goal_get(0, $options);
+        update_option('intel_ga_goals' . $gapt, $ga_goals);
+        $op_meta['ga_goals' . $gapt . '_updated'] = time();
+        update_option('intel_option_meta', $op_meta);
+      }
+      catch (Exception $e) {
+        Intel_Df::drupal_set_message($e->getMessage(), 'error');
+        $ga_goals = array();
+      }
+    }
+  }
+  if (!isset($ga_goals)) {
+    $ga_goals = get_option('intel_ga_goals' . $gapt, array());
+  }
+  if (!empty($name)) {
+    return !empty($ga_goals[$name]) ? $ga_goals[$name] : 0;
+  }
+  return $ga_goals;
+}
 …
+}
+/**
+ * alias of intel_is_intel_goal()
+ * @param $ga_goal
+ *
+ * @return bool
+ */
 function intel_is_intl_goal($ga_goal) {
+  return intel_is_intel_goal($ga_goal);
+}
+/**
+ * Tests if the goal is formated as a Intel goal
+ * @param $ga_goal
+ *
+ * @return bool
+ */
+function intel_is_intel_goal($ga_goal) {
   if (!empty($ga_goal['type']) && $ga_goal['type'] == 'EVENT') {
     if (!empty($ga_goal['details']['conditions'])) {
 …
+}
+add_filter('intel_link_type_info', 'intel_get_link_type_info_default');
+function intel_goal_type_titles() {
+  return array(
+    'INTL' => Intel_Df::t('Intelligence'),
+    'INTEL' => Intel_Df::t('Intelligence'),
+    'EVENT' => Intel_Df::t('Event'),
+    'VISIT_TIME_ON_SITE' => Intel_Df::t('Duration'),
+    'VISIT_NUM_PAGES' => Intel_Df::t('Pages/session'),
+    'URL_DESTINATION' => Intel_Df::t('Destination'),
+  );
+}
+function intel_get_intel_goals_default($info = array()) {
+  $title = Intel_Df::t('General');
+  $name = strtolower(Intel_Df::drupal_clean_machinename($title));
+  $info[$name] = array(
+    'title' => $title,
+    'name' => $name,
+    'description' => Intel_Df::t('General conversion. Use as a default goal.'),
+    'value' => 100,
+  );
+  $title = Intel_Df::t('Contact');
+  $name = strtolower(Intel_Df::drupal_clean_machinename($title));
+  $info[$name] = array(
+    'title' => $title,
+    'name' => $name,
+    'description' => Intel_Df::t('General contact. Use as a default goal that creates a contact.'),
+    'value' => 100,
+  );
+  $title = Intel_Df::t('Sales inquiry');
+  $name = strtolower(Intel_Df::drupal_clean_machinename($title));
+  $info[$name] = array(
+    'title' => $title,
+    'name' => $name,
+    'description' => Intel_Df::t('Request to initiate sales communication'),
+    'value' => 200,
+  );
+  $title = Intel_Df::t('Research request');
+  $name = strtolower(Intel_Df::drupal_clean_machinename($title));
+  $info[$name] = array(
+    'title' => $title,
+    'name' => $name,
+    'description' => Intel_Df::t('Request to receive top of the funnel education premium offer.'),
+    'value' => 100,
+  );
+  $title = Intel_Df::t('Research request');
+  $name = strtolower(Intel_Df::drupal_clean_machinename($title));
+  $info[$name] = array(
+    'title' => $title,
+    'name' => $name,
+    'description' => Intel_Df::t('Request to receive educational (ToFu) premium offer.'),
+    'value' => 50,
+  );
+  $title = Intel_Df::t('Consideration request');
+  $name = strtolower(Intel_Df::drupal_clean_machinename($title));
+  $info[$name] = array(
+    'title' => $title,
+    'name' => $name,
+    'description' => Intel_Df::t('Request to receive brand building (MoFu) premium offer.'),
+    'value' => 100,
+  );
+  $title = Intel_Df::t('Decision request');
+  $name = strtolower(Intel_Df::drupal_clean_machinename($title));
+  $info[$name] = array(
+    'title' => $title,
+    'name' => $name,
+    'description' => Intel_Df::t('Request to receive sales (BoFu) premium offer.'),
+    'value' => 200,
+  );
+  $title = Intel_Df::t('Subscribe');
+  $name = strtolower(Intel_Df::drupal_clean_machinename($title));
+  $info[$name] = array(
+    'title' => $title,
+    'name' => $name,
+    'description' => Intel_Df::t('Request to subscribe to newsletter style updates.'),
+    'value' => 100,
+  );
+  $title = Intel_Df::t('Job application');
+  $name = strtolower(Intel_Df::drupal_clean_machinename($title));
+  $info[$name] = array(
+    'title' => $title,
+    'name' => $name,
+    'description' => Intel_Df::t('Job posting submission.'),
+    'value' => 100,
+  );
+  return $info;
+}
+function intel_get_submission_goals_default() {
+  $defs = array();
+  $defs['tofu-conversion'] = array(
+    'title' => Intel_Df::t('ToFu conversion'),
+    'description' => Intel_Df::t('Top of the funnel conversion'),
+    'value' => 15,
+    'ga_id' => 1,
+  );
+  $defs['mofu-conversion'] = array(
+    'title' => Intel_Df::t('MoFu conversion'),
+    'description' => Intel_Df::t('Middle of the funnel conversion'),
+    'value' => 50,
+    'ga_id' => 2,
+  );
+  $defs['bofu-conversion'] = array(
+    'title' => Intel_Df::t('BoFu conversion'),
+    'description' => Intel_Df::t('Bottom of the funnel conversion'),
+    'value' => 100,
+    'ga_id' => 3,
+  );
+  $defs['subscribe-form'] = array(
+    'title' => Intel_Df::t('Subscribe form'),
+    'description' => Intel_Df::t('Subscribe to email updates form submission'),
+    'value' => 25,
+    'ga_id' => 4,
+  );
+  $defs['contact-form'] = array(
+    'title' => Intel_Df::t('Contact form'),
+    'description' => Intel_Df::t('Main contact form submission'),
+    'value' => 25,
+    'ga_id' => 5,
+  );
+  return $defs;
+}
+function intel_get_phonecall_goals_default() {
+  $defs = array();
+  $defs['contact-call'] = array(
+    'title' => Intel_Df::t('Contact call'),
+    'description' => Intel_Df::t('Main contact number called'),
+    'value' => 25,
+    'ga_id' => 6,
+  );
+  return $defs;
+}
+/*******************************************************************************
+ * Intel Event functions
+ */
+/**
+ * Returns intel_event info.
+ * @param null $name: if null returns all intel_events, or if name given returns
+ *   specific intel_event
+ * @param array $options
+ *
+ * @return array|bool|mixed|void
+ */
+function intel_get_intel_event_info($name = NULL, $options = array()) {
+  $events = &Intel_Df::drupal_static( __FUNCTION__ );
+  if (is_array($events) && count($events)) {
+    if (isset($name)) {
+      if (isset($events[$name])) {
+        return $events[$name];
+      }
+    }
+    else {
+      return $events;
+    }
+  }
+  //$events = intel_get_intel_event_info_default();
+  $events = array();
+  // get event info provided by hook_intel_intel_event_info;
+  $events = apply_filters('intel_intel_event_info', $events);
+  $events = array_merge($events, intel_get_event_goal_info());
+  $goal_info = get_option('intel_goals', array());
+  foreach ($events AS $k => $v) {
+    if (isset($v['static_options'])) {
+      $events[$k]['options'] = $v['static_options'];
+    }
+    if (!empty($v['valued_event']) && empty($v['ga_id'])) {
+      $events[$k]['mode'] = $v['mode'] = 'valued';
+    }
+    if (!empty($v['mode'])) {
+      if ($v['mode'] == 'valued') {
+        $events[$k]['valued_event'] = 1;
+      }
+    }
+    else {
+      $events[$k]['mode'] = '';
+    }
+    // construct eventCategory
+    if (empty($v['event_category'])) {
+      $events[$k]['event_category'] = intel_format_intel_event_eventcategory($v, $goal_info);
+    }
+    if (empty($events[$k]['plugin_un'])) {
+      $events[$k]['plugin_un'] = 'intel';
+    }
+    $events[$k]['key']  = $k;
+  }
+  $custom = get_option('intel_intel_events_custom', array());
+  foreach ($custom AS $k => $v) {
+    // check if custom attribute
+    if (isset($events[$k])) {
+      $events[$k] = Intel_Df::drupal_array_merge_deep($events[$k], $v);
+      // rebuild event_category incase changed by custom settings
+      unset($events[$k]['event_category']);
+      $events[$k]['event_category'] = intel_format_intel_event_eventcategory($events[$k], $goal_info);
+      $events[$k]['overridden'] = 1;
+      if (isset($events[$k]['partial'])) {
+        unset($events[$k]['partial']);
+      }
+    }
+    else {
+      // if settings are a partial event, i.e. overrides of a coded event,
+      // events[$k] should exists. If it doesn't, for example when the plugin
+      // providing the original event is disabled, skip adding it
+      if (!empty($v['partial'])) {
+        continue;
+      }
+      if (empty($custom[$k]['plugin_un'])) {
+        $custom[$k]['plugin_un'] = 'intel';
+      }
+      $custom[$k]['custom'] = 1;
+      $events[$k] = $custom[$k];
+      if (empty($v['event_category'])) {
+        $events[$k]['event_category'] = intel_format_intel_event_eventcategory($v, $goal_info);
+      }
+    }
+    if (!empty($custom[$k]['custom_options'])) {
+      //sdm($custom[$k]['custom_options']);
+      if (!isset($events[$k]['options'])) {
+        $events[$k]['options'] = $custom[$k]['custom_options'];
+      }
+      else {
+        $events[$k]['options'] += $custom[$k]['custom_options'];
+      }
+    }
+    $events[$k]['key']  = $k;
+  }
+  /* TODO WP
+  foreach (module_implements('intel_intel_event_info') AS $module) {
+    $function = $module . '_intel_intel_event_info';
+    $a = $function();
+    if (empty($a) || !is_array($a)) {
+      continue;
+    }
+    foreach ($a AS $k => $v) {
+      $v['module'] = $module;
+      $v['key']  = $k;
+      $events[$k] = $v;
+    }
+  }
+  drupal_alter('intel_intel_event_info', $events);
+  END TODO WP */
+  // allow plugins to alter events
+  $events = apply_filters('intel_intel_event_info_alter', $events);
+  uasort($events, '_intel_sort_by_eventcategory');
+  // allow plugins to alter theme_info
+  if (isset($name)) {
+    if (isset($events[$name])) {
+      return $events[$name];
+    }
+    else {
+      return FALSE;
+    }
+  }
+  else {
+    return $events;
+  }
+}
+/**
+ * Implements hook_intel_link_type_info()
+ */
+function intel_intel_link_type_info($info = array()) {
+  $info = intel_get_link_type_info_default($info);
+  return $info;
+}
+add_filter('intel_link_type_info', 'intel_intel_link_type_info');
 function intel_get_link_type_info_default($info = array()) {
   $info['mailto'] = array(
 …
     'title' => Intel_Df::t('Download link'),
     'track' => 1,
+    'track_file_extension' => intel_get_link_type_download_track_file_extensions_default(),
   );
   $info['external'] = array(
 …
+          }
+        }
+        if ($event['key'] == 'linktracker_download_click') {
+          $link_type[$k]['track_file_extension'] = !empty($event['track_file_extension']) ? $event['track_file_extension'] : intel_get_link_type_download_track_file_extensions_default();
+        }
+      }
+    }
 …
 /**
+ * Implements hook_intel_intel_event_info()
+ */
+function intel_intel_intel_event_info($event = array()) {
+  $info = intel_get_intel_event_info_default($event);
+  return $info;
+}
+add_filter('intel_intel_event_info', 'intel_intel_intel_event_info');
+/**
  * types = flag, list, scalar, vector
  */
 add_filter('intel_intel_event_info', 'intel_get_intel_event_info_default');
+//add_filter('intel_intel_event_info', 'intel_get_intel_event_info_default');
 function intel_get_intel_event_info_default($event = array()) {
   $scripts_enabled = get_option('intel_intel_scripts_enabled', array());
 …
+  }
+  if (intel_is_extended()) {
+    $event['landing_page_view'] = array(
+  if (intel_is_intel_script_enabled('lptracker')) {
+    $event['landing_page_view'] = [
       'title' => Intel_Df::t('Landing page view'),
       'description' => Intel_Df::t('Landing page pageview'),
       //'event' => 'pageshow',
     );
     $event['landing_page_conversion'] = array(
+    ];
+    $event['landing_page_conversion'] = [
       'title' => Intel_Df::t('Landing page conversion'),
       'description' => Intel_Df::t('Form submission from a landing page'),
       'valued_event' => 1,
       'value' => 0,
+    );
+    ];
+  }
+  if (intel_is_intel_script_enabled('ctatracker')) {
     $event['cta_view'] = array(
       'title' => Intel_Df::t('CTA view'),
       'description' => Intel_Df::t('Call to action impression'),
+      'title' => t('CTA view'),
+      'description' => t('Call to action impression'),
     );
     $event['cta_click'] = array(
 …
     );
+  }
-  /*
-  $event['cta_click'] = array(
-    'title' => Intel_Df::t('CTA click'),
-    'description' => Intel_Df::t('Call to action is clicked'),
-    'mode' => 'valued',
-    //'valued_event' => 1,
-    'value' => 0,
-    'selector' => '.track-cta-click',
-    'on_event' => 'click',
-    'enable_all_pages' => 1,
-    'js_settings' => 1,
-  );
-  */
   if (intel_is_intel_script_enabled('linktracker')) {
 …
+}
+function intel_get_intel_event_info($name = NULL, $options = array()) {
+  $events = &Intel_Df::drupal_static( __FUNCTION__ );
+  if (is_array($events) && count($events)) {
+    if (isset($name)) {
+      if (isset($events[$name])) {
+        return $events[$name];
+      }
+    }
+    else {
+      return $events;
+    }
+  }
+  //$events = intel_get_intel_event_info_default();
+  $events = array();
+  // get event info provided by hook_intel_intel_event_info;
+  $events = apply_filters('intel_intel_event_info', $events);
+  $events = array_merge($events, intel_get_event_goal_info());
+  $goal_info = get_option('intel_goals', array());
+  foreach ($events AS $k => $v) {
+    if (isset($v['static_options'])) {
+      $events[$k]['options'] = $v['static_options'];
+    }
+    if (!empty($v['valued_event']) && empty($v['ga_id'])) {
+      $events[$k]['mode'] = $v['mode'] = 'valued';
+    }
+    if (!empty($v['mode'])) {
+      if ($v['mode'] == 'valued') {
+        $events[$k]['valued_event'] = 1;
+      }
+    }
+    else {
+      $events[$k]['mode'] = '';
+    }
+    // construct eventCategory
+    if (empty($v['event_category'])) {
+      $events[$k]['event_category'] = intel_format_intel_event_eventcategory($v, $goal_info);
+    }
+    if (empty($events[$k]['plugin_un'])) {
+      $events[$k]['plugin_un'] = 'intel';
+    }
+    $events[$k]['key']  = $k;
+  }
+  $custom = get_option('intel_intel_events_custom', array());
+  foreach ($custom AS $k => $v) {
+    // check if custom attribute
+    if (isset($events[$k])) {
+      $events[$k] = Intel_Df::drupal_array_merge_deep($events[$k], $v);
+      // rebuild event_category incase changed by custom settings
+      unset($events[$k]['event_category']);
+      $events[$k]['event_category'] = intel_format_intel_event_eventcategory($events[$k], $goal_info);
+      $events[$k]['overridden'] = 1;
+      if (isset($events[$k]['partial'])) {
+        unset($events[$k]['partial']);
+      }
+    }
+    else {
+      // if settings are a partial event, i.e. overrides of a coded event,
+      // events[$k] should exists. If it doesn't, for example when the plugin
+      // providing the original event is disabled, skip adding it
+      if (!empty($v['partial'])) {
+        continue;
+      }
+      if (empty($custom[$k]['plugin_un'])) {
+        $custom[$k]['plugin_un'] = 'intel';
+      }
+      $custom[$k]['custom'] = 1;
+      $events[$k] = $custom[$k];
+      if (empty($v['event_category'])) {
+        $events[$k]['event_category'] = intel_format_intel_event_eventcategory($v, $goal_info);
+      }
+    }
+    if (!empty($custom[$k]['custom_options'])) {
+//sdm($custom[$k]['custom_options']);
+      if (!isset($events[$k]['options'])) {
+        $events[$k]['options'] = $custom[$k]['custom_options'];
+      }
+      else {
+        $events[$k]['options'] += $custom[$k]['custom_options'];
+      }
+    }
+    $events[$k]['key']  = $k;
+  }
+  /* TODO WP
+  foreach (module_implements('intel_intel_event_info') AS $module) {
+    $function = $module . '_intel_intel_event_info';
+    $a = $function();
+    if (empty($a) || !is_array($a)) {
+      continue;
+    }
+    foreach ($a AS $k => $v) {
+      $v['module'] = $module;
+      $v['key']  = $k;
+      $events[$k] = $v;
+    }
+  }
+  drupal_alter('intel_intel_event_info', $events);
+  END TODO WP */
+  // allow plugins to alter events
+  $events = apply_filters('intel_intel_event_info_alter', $events);
+  uasort($events, '_intel_sort_by_eventcategory');
+  // allow plugins to alter theme_info
+  if (isset($name)) {
+    if (isset($events[$name])) {
+      return $events[$name];
+    }
+    else {
+      return FALSE;
+    }
+  }
+  else {
+    return $events;
+  }
+}
 /**
 …
     $to_match[] = substr($alias, 0, -1);
+  }
+//Intel_df::watchdog('enabled_intel_events', 'to_match', $to_match);
   foreach ($e AS $key => $event) {
     if (!empty($event['enable_all_pages'])) {
 …
   return $events;
+}
+function intel_get_link_type_download_track_file_extensions_default() {
+  return "7z|aac|arc|arj|asf|asx|avi|bin|csv|doc(x|m)?|dot(x|m)?|exe|flv|gif|gz|gzip|hqx|jar|jpe?g|js|mp(2|3|4|e?g)|mov(ie)?|msi|msp|pdf|phps|png|ppt(x|m)?|pot(x|m)?|pps(x|m)?|ppam|sld(x|m)?|thmx|qtm?|ra(m|r)?|sea|sit|tar|tgz|torrent|txt|wav|wma|wmv|wpd|xls(x|m|b)?|xlt(x|m)|xlam|xml|z|zip";
+}
+function intel_form_intel_admin_intel_event_form_alter(&$form, &$form_state) {
+  $event = $form['#intel_event'];
+  // if linktracker_download_click add field to provide file extensions
+  if ($event['key'] == 'linktracker_download_click') {
+    $default = intel_get_link_type_download_track_file_extensions_default();
+    $key = 'track_file_extension';
+    $form['trigger'][$key] = array(
+      '#type' => 'textfield',
+      '#title' => Intel_Df::t('Track file extensions'),
+      '#default_value' => !empty($event[$key]) ? $event[$key] : $default,
+      '#description' => Intel_Df::t("A file extension list separated by the | character that will be tracked as download when clicked. Regular expressions are supported. For example: %default", array('%default' => $default)),
+      '#maxlength' => 500,
+    );
+    $form_state['intel_overridable'][$key] = 1;
+  }
+}
+add_filter('intel_form_intel_admin_intel_event_form_alter', 'intel_form_intel_admin_intel_event_form_alter', 10, 2);
+/*******************************************************************************
+ * Page and Visitor attribute functions
+ */
 /**
 …
+}
+function intel_get_intel_goals_default($info = array()) {
+  $title = Intel_Df::t('General');
+  $name = strtolower(Intel_Df::drupal_clean_machinename($title));
+  $info[$name] = array(
+    'title' => $title,
+    'name' => $name,
+    'description' => Intel_Df::t('General conversion. Use as a default goal.'),
+    'value' => 100,
+  );
+  $title = Intel_Df::t('Contact');
+  $name = strtolower(Intel_Df::drupal_clean_machinename($title));
+  $info[$name] = array(
+    'title' => $title,
+    'name' => $name,
+    'description' => Intel_Df::t('General contact. Use as a default goal that creates a contact.'),
+    'value' => 100,
+  );
+  $title = Intel_Df::t('Sales inquiry');
+  $name = strtolower(Intel_Df::drupal_clean_machinename($title));
+  $info[$name] = array(
+    'title' => $title,
+    'name' => $name,
+    'description' => Intel_Df::t('Request to initiate sales communication'),
+    'value' => 200,
+  );
+  $title = Intel_Df::t('Research request');
+  $name = strtolower(Intel_Df::drupal_clean_machinename($title));
+  $info[$name] = array(
+    'title' => $title,
+    'name' => $name,
+    'description' => Intel_Df::t('Request to receive top of the funnel education premium offer.'),
+    'value' => 100,
+  );
+  $title = Intel_Df::t('Research request');
+  $name = strtolower(Intel_Df::drupal_clean_machinename($title));
+  $info[$name] = array(
+    'title' => $title,
+    'name' => $name,
+    'description' => Intel_Df::t('Request to receive educational (ToFu) premium offer.'),
+    'value' => 50,
+  );
+  $title = Intel_Df::t('Consideration request');
+  $name = strtolower(Intel_Df::drupal_clean_machinename($title));
+  $info[$name] = array(
+    'title' => $title,
+    'name' => $name,
+    'description' => Intel_Df::t('Request to receive brand building (MoFu) premium offer.'),
+    'value' => 100,
+  );
+  $title = Intel_Df::t('Decision request');
+  $name = strtolower(Intel_Df::drupal_clean_machinename($title));
+  $info[$name] = array(
+    'title' => $title,
+    'name' => $name,
+    'description' => Intel_Df::t('Request to receive sales (BoFu) premium offer.'),
+    'value' => 200,
+  );
+  $title = Intel_Df::t('Subscribe');
+  $name = strtolower(Intel_Df::drupal_clean_machinename($title));
+  $info[$name] = array(
+    'title' => $title,
+    'name' => $name,
+    'description' => Intel_Df::t('Request to subscribe to newsletter style updates.'),
+    'value' => 100,
+  );
+  $title = Intel_Df::t('Job application');
+  $name = strtolower(Intel_Df::drupal_clean_machinename($title));
+  $info[$name] = array(
+    'title' => $title,
+    'name' => $name,
+    'description' => Intel_Df::t('Job posting submission.'),
+    'value' => 100,
+  );
+  return $info;
+}
+function intel_get_submission_goals_default() {
+  $defs = array();
+  $defs['tofu-conversion'] = array(
+    'title' => Intel_Df::t('ToFu conversion'),
+    'description' => Intel_Df::t('Top of the funnel conversion'),
+    'value' => 15,
+    'ga_id' => 1,
+  );
+  $defs['mofu-conversion'] = array(
+    'title' => Intel_Df::t('MoFu conversion'),
+    'description' => Intel_Df::t('Middle of the funnel conversion'),
+    'value' => 50,
+    'ga_id' => 2,
+  );
+  $defs['bofu-conversion'] = array(
+    'title' => Intel_Df::t('BoFu conversion'),
+    'description' => Intel_Df::t('Bottom of the funnel conversion'),
+    'value' => 100,
+    'ga_id' => 3,
+  );
+  $defs['subscribe-form'] = array(
+    'title' => Intel_Df::t('Subscribe form'),
+    'description' => Intel_Df::t('Subscribe to email updates form submission'),
+    'value' => 25,
+    'ga_id' => 4,
+  );
+  $defs['contact-form'] = array(
+    'title' => Intel_Df::t('Contact form'),
+    'description' => Intel_Df::t('Main contact form submission'),
+    'value' => 25,
+    'ga_id' => 5,
+  );
+  return $defs;
+}
+function intel_get_phonecall_goals_default() {
+  $defs = array();
+  $defs['contact-call'] = array(
+    'title' => Intel_Df::t('Contact call'),
+    'description' => Intel_Df::t('Main contact number called'),
+    'value' => 25,
+    'ga_id' => 6,
+  );
+  return $defs;
+}
 function intel_event_value_format($value, $options = array()) {
 …
       //continue;
+    }
     $scorings[$filter][$i] = isset($custom[$i]) ? $custom[$i] : $m['value'];
+    $scorings[$filter][$i] = (float) (isset($custom[$i]) ? $custom[$i] : $m['value']);
+  }
 …
+    }
+  }
-  //$goals = intel_goal_load();
-  //$goals = array_merge($goals, get_option('intel_submission_goals', intel_get_submission_goals_default()));
-  //$goals = array_merge($goals, get_option('intel_phonecall_goals', intel_get_phonecall_goals_default()));
   return $scorings[$filter];
 …
       'goals' => 0,
       'traffic' => 0,
+      'attraction' => 0,
+      'engagement' => 0,
+      'conversion' => 0,
     ),
     // stats for values generated directly by the item on non
 …
       'goals' => 0,
       'traffic' => 0,
+      'attraction' => 0,
+      'engagement' => 0,
+      'conversion' => 0,
     ),
     // stats for values generated during sessions where the item is the entrance
 …
       'goals' => 0,
       'traffic' => 0,
+      'attraction' => 0,
+      'engagement' => 0,
+      'conversion' => 0,
     ),
     // stats generated downstream from page hit
 …
       'goals' => 0,
       'traffic' => 0,
+      'attraction' => 0,
+      'engagement' => 0,
+      'conversion' => 0,
     ),
   );
 …
     // on this page or segement but not directly by the page
     $scores['entrance']['goals'] += $entrance['goalValueAll'];
+    $scores['entrance']['conversion'] += $entrance['goalValueAll'];
     // the value of any valued events generated on any page in sessions started
 …
     if (isset($entrance['events']['_totals'])) {
       $scores['entrance']['events'] += $entrance['events']['_totals']['value'];
+      $scores['entrance']['engagement'] += $entrance['events']['_totals']['value'];
+    }
     elseif (isset($entrance['events']['_all'])) {
       $scores['entrance']['events'] += $entrance['events']['_all']['value'];
+      $scores['entrance']['engagement'] += $entrance['events']['_all']['value'];
+    }
     // traffic scoring based on traffic generated by this page or segement
     $scores['entrance']['traffic'] += $entrance['entrances'] * $scoring['entrance'];
+    $scores['entrance']['attraction'] += $entrance['entrances'] * $scoring['entrance'];
     //$scores['_all']['traffic'] += $entrance['entrances'] * $scoring['entrance'];
     if (!empty($entrance['sticks'])) {
       $scores['entrance']['traffic'] += $entrance['sticks'] * $scoring['stick'];
+      $scores['entrance']['engagement'] += $entrance['sticks'] * $scoring['stick'];
       // when using Session stick events, stick numbers should be removed from events
       //$scores['entrance']['events'] -= $entrance['sticks'] * $scoring['stick'];
 …
     if ($entrance['pageviews'] > 2) {
       $scores['entrance']['traffic'] += ($entrance['pageviews'] - $entrance['entrances'] - $entrance['sticks']) * $scoring['additional_pages'];
+      $scores['entrance']['engagement'] += ($entrance['pageviews'] - $entrance['entrances'] - $entrance['sticks']) * $scoring['additional_pages'];
+    }
+  }
 …
   if (!empty($page['goalValueAll'])) {
     $scores['onpage']['goals'] += $page['goalValueAll'];
+    $scores['onpage']['conversion'] += $page['goalValueAll'];
+  }
 …
   if (!empty($page['pageValueAll'])) {
     $scores['assist']['goals'] += ($page['pageValueAll'] - $page['goalValueAll']);
+    $scores['assist']['conversion'] += ($page['pageValueAll'] - $page['goalValueAll']);
+  }
 …
   if (isset($page['events']['_totals'])) {
     $scores['onpage']['events'] += $page['events']['_totals']['value'];
+    $scores['onpage']['engagement'] += $page['events']['_totals']['value'];
+  }
   elseif (isset($page['events']['_all'])) {
     $scores['onpage']['events'] += $page['events']['_all']['value'];
+    $scores['onpage']['engagement'] += $page['events']['_all']['value'];
+  }
 …
     //$scores['_all']['traffic'] = $scores['entrance']['traffic'] + $scores['onpage']['traffic'];
     $scores['_all']['traffic'] = $scores['entrance']['traffic'];
+    $scores['_all']['conversion'] = $scores['onpage']['conversion'];
+    $scores['_all']['engagement'] = $scores['onpage']['engagement'];
+    $scores['_all']['attraction'] = $scores['entrance']['attraction'];
+  }
   else {
 …
     $scores['_all']['events'] = $scores['entrance']['events'];
     $scores['_all']['traffic'] = $scores['entrance']['traffic'];
+    $scores['_all']['conversion'] = $scores['entrance']['conversion'];
+    $scores['_all']['engagement'] = $scores['entrance']['engagement'];
+    $scores['_all']['attraction'] = $scores['entrance']['attraction'];
+  }
 …
+  }
   return _intel_get_report_dates($start, $end);
+  return _intel_get_report_dates($start, $end, $return_hash);
+}
 function _intel_get_report_dates($start_default = "-31 days", $end_default = "-1 day", $return_hash = FALSE) {
+  $timezone_info = &Intel_Df::drupal_static( __FUNCTION__, array());
+  if (empty($timezone_info)) {
+    $timezone_info['wp_timezone'] = get_option('timezone_string', '');
+    $ga_profile = get_option('intel_ga_profile', array());
+    $timezone_info['ga_timezone'] = !empty($ga_profile['timezone']) ? $ga_profile['timezone'] : '';
+    if (0 && !empty($timezone_info['wp_timezone'])) {
+      $timezone_info['timezone'] = $timezone_info['wp_timezone'];
+    }
+    elseif (!empty($timezone_info['ga_timezone'])) {
+      $timezone_info['timezone'] = $timezone_info['ga_timezone'];
+    }
+    else {
+      $timezone_info['timezone'] = 'UTC';
+    }
+  }
+  $timezone = $timezone_info['timezone'];
+  $timezone_info = intel_get_timezone_info();
   if (!empty($_GET['dates'])) {
     $a = explode(":", $_GET['dates']);
 …
   $end = (!empty($_GET['end_date'])) ? $_GET['end_date'] : $end_default;
+  // do this to correct for CMS timezone.
+  $timezone_obj = new DateTimeZone($timezone);
+  $start_date_obj = new DateTime($start, $timezone_obj);
+  $start_date = $start_date_obj->format('U');
+  $end_date_obj = new DateTime($end, $timezone_obj);
+  $end_date = $end_date_obj->format('U');
+  $offset = $timezone_obj->getOffset($end_date_obj);
+  //intel_d($offset);
+  //intel_d(date('Y-m-d G:i', $end_date_strtotime) . " {$end_date_strtotime}");
+  //intel_d(date('Y-m-d G:i', $start_date) . " {$start_date}");
+  //intel_d(date('Y-m-d G:i', $end_date) . " {$end_date}");
+  //intel_d(Intel_Df::format_date($end_date_strtotime, 'Y-m-d G:i') . " {$end_date_strtotime}");
+  //intel_d(Intel_Df::format_date($end_date, 'Y-m-d G:i') . " {$end_date}");
+  $start_date_local = $start_date + $offset;
+  $end_date_local = $end_date + $offset;
+  //intel_d(date('Y-m-d G:i', $start_date_local) . " {$start_date_local}");
+  //intel_d(date('Y-m-d G:i', $end_date_local) . " {$end_date_local}");
+  //intel_d(Intel_Df::format_date($end_date_local, 'Y-m-d G:i') . " {$end_date_local}");
+  //$start_date = (!empty($_GET['start_date'])) ? strtotime($_GET['start_date']) : strtotime($start_default);
+  //$end_date = (!empty($_GET['end_date'])) ? strtotime($_GET['end_date']) : strtotime($end_default);
+  $start_date = strtotime($start);
+  $end_date = strtotime($end);
+  $ga_start_date = $start_date + $timezone_info['ga_offset'];
+  $ga_end_date = $end_date + $timezone_info['ga_offset'];
   $number_of_days = ceil(($end_date - $start_date)/60/60/24);
   if (!$return_hash) {
     return array(
       $start_date_local,
       $end_date_local,
+      $ga_start_date,
+      $ga_end_date,
       $number_of_days,
+      $offset,
+    );
+    return array(
+      $start_date,
+      $end_date,
+      $number_of_days,
+      $start_date_local,
+      $end_date_local,
+      $timezone_info['ga_offset'],
     );
+  }
 …
       'start_date' => $start_date,
       'end_date' => $end_date,
+      'ga_start_date' => $ga_start_date,
+      'ga_end_date' => $ga_end_date,
       'number_of_days' => $number_of_days,
+      'timezone_offset' => $offset,
+      'number_of_seconds' => $end_date - $start_date,
+      'timezone_info' => $timezone_info,
     );
+  }
 …
   );
   list($start_date, $end_date, $number_of_days) = _intel_get_report_dates("-1 year", "Today");
+  list($start_date, $end_date, $number_of_days) = _intel_get_report_dates("-1 year", "Today 23:59");
   $cache = array(
     'refresh' => 1,
 …
     'segment' => 'sessions::condition::ga:dimension5==' . implode(',ga:dimension5==', $vtkids),
   );
   $visits = intel_fetch_analytics_visits($options);
 …
     $data = intel_ga_api_data($request, $cache_options);
+    //dsm($request); dsm($data);
     $rows = intel_get_ga_feed_rows($data);
     if (!empty($rows) && is_array($rows)) {
 …
   return $ga_goals;
+}
-function intel_goal_type_titles() {
-  return array(
-    'INTL' => Intel_Df::t('Intelligence'),
-    'INTEL' => Intel_Df::t('Intelligence'),
-    'EVENT' => Intel_Df::t('Event'),
-    'VISIT_TIME_ON_SITE' => Intel_Df::t('Duration'),
-    'VISIT_NUM_PAGES' => Intel_Df::t('Pages/session'),
-    'URL_DESTINATION' => Intel_Df::t('Destination'),
-  );
+}

intelligence/trunk/includes/intel.imapi.php

-                      r1904936
+                      r2947915
   $api_params = get_option('intel_imapi_custom_params', array());
   $apiClientProps = array(
     'apiUrl' => intel_get_imapi_url() . '/',
+    'apiUrl' => (!empty($options['api_url']) ? $options['api_url'] : intel_get_imapi_url()) . '/',
     'urlrewrite' => 1,
     //'apiConnector' => get_option('intel_l10iapi_connector', ''),
 …
+}
+function intel_imapi_do_reauth() {
+}
 function intel_imapi_property_get($options = array()) {
   $vars = array();

intelligence/trunk/includes/intel.page_alter.php

-                      r2018028
+                      r2947915
 function intel_page_alter(&$page) {
+  require_once INTEL_DIR . "includes/intel.ga.php";
+  $user = wp_get_current_user();
+  intel_load_include('includes/intel.ga');
+  $user = intel_get_current_user();
+  $uid = intel_get_user_id($user);
   $q = isset($_GET['q']) ? $_GET['q'] : '';
 …
     'debug' => intel_debug_mode(),
     // cmsHostpath, modulePath & apiPath are not standard io settings. They are used
     // exclusivly by intel module js.
+    // exclusively by intel module js.
     'cmsHostpath' => $parsed_url['hostpath'],
     'modulePath' => $modulePath,
+    // path to intel library files
     'libPath' => $modulePath . '/vendor/levelten/intel',
-    //'cms_hostpath' => $parsed_url['hostpath'],
-    //'module_path' => drupal_get_path('module', 'intel'),
     'systemPath' => $q,
     'systemHost' => $parsed_url['host'],
     'systemBasepath' => $parsed_url['base_path'],
     'srl' => $q,
-    //'lib_path' => intel_get_library_path(),
     'pageTitle' => '(not set)',
     'trackAnalytics' => 1, // this is set in intel_js_alter if ga script exists
     //'trackAdhocCtas' => ($api_level == 'pro') ? 'track-cta' : '', // Check if CTA tracking is supported in IPAI level
     //'trackAdhocEvents' => 'track-event',
+    'trackAdhocCtas' => ($api_level == 'pro') ? 'track-cta' : '', // Check if CTA tracking is supported in IPAI level
+    'trackAdhocEvents' => 'track-event',
     'trackForms' => array(),
     'trackRealtime' => (integer)get_option('intel_track_realtime', INTEL_TRACK_REALTIME_DEFAULT),
     'fetchGaRealtime' => (integer)get_option('intel_fetch_ga_realtime', 0),
     'isLandingpage' => 0,
-    //'scorings' => intel_get_scorings('js_setting'),
     'scorings' => array(
       'events' => array(),
 …
   );
+  if (!empty($_GET['io-admin']) && Intel_Df::user_access('admin intel')) {
+    wp_enqueue_style('intel_front_admin', INTEL_URL . 'css/intel-front-admin.css');
+    $config['admin'] = 1;
+  if (INTEL_PLATFORM == 'wp') {
+    if (!empty($_GET['io-admin']) && Intel_Df::user_access('admin intel')) {
+      wp_enqueue_style('intel_front_admin', INTEL_URL . 'css/intel.intel_script_admin.css');
+      $config['admin'] = 1;
+    }
+  }
 …
+  }
+  $path_is_admin = is_admin();
+  if (INTEL_PLATFORM == 'wp') {
+    $path_is_admin = is_admin();
+  }
+  else {
+    $path_is_admin = path_is_admin(current_path());
+  }
   $ga_va = array();
   if (!empty($user->ID)) {
+  if ($uid) {
     if (intel_include_library_file('class.visitor.php')) {
       $ga_va = \LevelTen\Intel\ApiVisitor::extractCookieVa();
 …
   intel_add_page_intel_push(array('set', "p.systemPath", $q));
+  // if entity not provided, lookup based on menu path
+  if (is_single() || is_page()) {
+    global $post;
+    $entity = $post;
+    $entity_type = 'post';
+    $config['pageTitle'] = get_the_title( $post );
+    $config['pageUri'] = ':post:' . $post->ID;
+  }
+  /*
+  if (arg(0) == 'node') {
+    $entity = menu_get_object();
+    $entity_type = 'node';
+  }
+  elseif (arg(0) == 'user') {
+    $entity = menu_get_object('user');
+    $entity_type = 'user';
+  }
+  */
+  // TODO WP
+  //$config['pageTitle'] = isset($entity->title) ? $entity->title : drupal_get_title();
+  // determine entity from url
+  if (INTEL_PLATFORM == 'wp') {
+    if (is_single() || is_page()) {
+      global $post;
+      $entity = $post;
+      $entity_type = 'post';
+      $config['pageTitle'] = get_the_title( $post );
+      $config['pageUri'] = ':post:' . $post->ID;
+    }
+  }
+  else {
+    // if entity not provided, lookup based on menu path
+    if (arg(0) == 'node') {
+      $entity = menu_get_object();
+      $entity_type = 'node';
+    }
+    elseif (arg(0) == 'user') {
+      $entity = menu_get_object('user');
+      $entity_type = 'user';
+    }
+    $config['pageTitle'] = isset($entity->title) ? $entity->title : drupal_get_title();
+    $config['pageUri'] = current_path();
+  }
   if ($entity_type && !empty($entity)) {
     $attrs = intel_get_entity_intel_attributes($entity, $entity_type, 1);
 …
   if (isset($page_attrs['pi']) && isset($page_attrs['pi']['l'])) {
     $config['isLandingpage'] = 1;
-    // Check if landingpage tracking is supported in IPAI level
-    if ($api_level == 'pro') {
-      //$page_events['landing_page_view'] = $intel_events['landing_page_view'];
+    }
+  }
   // set user role visitor attribute
   // only when user is logged in (otherwise page caching will cause errors)
   if (!empty($user->ID)) {
+  if ($uid) {
     if (INTEL_PLATFORM == 'wp') {
       // don't exclude on intel_demo_pages to allow testing
       if (!intel_is_demo_page()) {
         $tracking_exclude_roles = get_option('intel_tracking_exclude_role', intel_get_tracking_exclude_user_role_default());
         // WP roles do not have ids, so we create them
         $role_index = get_option('intel_role_index', array());
+        if (empty($role_index)) {
+          $role_index['anonymous'] = 0;
+        }
         $cur = isset($ga_va['ur']) ? $ga_va['ur'] : array();
         if (!empty($user->roles) && is_array($user->roles)) {
 …
+        }
+      }
+    }
     elseif (INTEL_PLATFORM == 'drupal') {
 …
+      }
+    }
+  }
 …
       intel_add_page_intel_push(array('linktracker:setLinkTypeDef', $key, $def));
+    }
+    //intel_add_page_intel_push(array('linktracker:setLinkDef', $key, $def));
+    //intel_d($link_infos);
+  }
+  /*
+  $def = array(
+    'selector' => 'form#test',
+    'trackImpression'
+  );
+  intel_add_page_intel_push(array('formtracker:trackForm', $def));
+  intel_add_page_intel_push(array('formtracker:trackForm', 'test', $def));
+  */
+  //intel_check_user_login($page);
+  }
   intel_check_form_submission($page);
 …
   // call hook for modules to add page pushes
+  do_action('intel_page_intel_pushes');
+  //module_invoke_all('intel_page_intel_pushes');
+  intel_do_hook_action('intel_page_intel_pushes');
   $pushes = intel_get_flush_page_intel_pushes();
+  $pushes_cookie = intel_get_flush_page_intel_pushes_cookie();
   // add page title and system path to any IntelEvent that is missing values
   /*
-  foreach ($pushes AS $i => $push) {
-    if ($push['method'] == '_addIntelEvent') {
-      if (empty($push['action'])) {
-        $pushes[$i]['action'] = $page_title;
+      }
-      if (empty($push['label'])) {
-        $pushes[$i]['label'] = $_GET['q'];
+      }
+    }
+  }
-  */
   if (isset($pushes['event']) && is_array($pushes['event'])) {
     foreach ($pushes['event'] AS $i => $push) {
 …
+    }
+  }
+  */
   //watchdog('intel_page_alter_pushes', print_r($pushes, 1));
 …
       'config' => $config,
       'pushes' => $pushes,
+      'pushes_cookie' => $pushes_cookie,
     ),
     // TODO: move this to intel_disqus
 …
+  }
+  // Get page status code for visibility filtering.
+  // determine if page should be tracked
   $track = 1;
+  /*
+  if (!(_googleanalytics_visibility_pages() || in_array($status, $trackable_status_codes)) && _googleanalytics_visibility_user($user)) {
+    $track = 0;
+    // TODO: Intel GA tracking should track google_analytics module settings
+    //$js['intel']['config']['track_analytics'] = 0;
+  }
+  if (path_is_admin(current_path())) {
+    $track = 0;
+  }
+  */
+  if (INTEL_PLATFORM == 'wp') {
+  }
+  else {
+    // check page tracking settings in googleanaltyics module
+    // Get page status code for visibility filtering.
+    $id = variable_get('googleanalytics_account', '');
+    $status = drupal_get_http_header('Status');
+    $trackable_status_codes = array(
+      '403 Forbidden',
+      '404 Not Found',
+    );
+    $track = 1;
+    if (!(_googleanalytics_visibility_pages() || in_array($status, $trackable_status_codes)) && _googleanalytics_visibility_user($user)) {
+      $track = 0;
+      // TODO: Intel GA tracking should track google_analytics module settings
+      //$js['intel']['config']['track_analytics'] = 0;
+    }
+    if (path_is_admin(current_path())) {
+      $track = 0;
+    }
+  }
   if (!$track) {
     $js['intel']['config']['track_forms'] = 0;
 …
+  }
   else {
+    //$scripts = intel()->intel_script_info();
+    //$enabled = get_option('intel_intel_scripts_enabled', array());
+    //foreach ($scripts AS $key => $script) {
+    //  if (!empty($enabled[$key]) || (!isset($enabled[$key]) && !empty($script['enabled']))) {
+    //    wp_enqueue_script('intel_script_' . $key, $script['path']);
+    //  }
+    //}
+  }
+    // add intel scripts to page
+    if (INTEL_PLATFORM == 'wp') {
+      // for WP, js scripts are enqueued in class-intel-tracker
+    }
+    else {
+      $scripts = intel_get_intel_script_info();
+      $enabled = variable_get('intel_intel_scripts_enabled', array());
+      foreach ($scripts AS $key => $script) {
+        if (!empty($enabled[$key]) || (!isset($enabled[$key]) && !empty($script['enabled']))) {
+          drupal_add_js($script['path']);
+        }
+      }
+      if (!empty($_GET['debug'])) {
+        if ($_GET['debug'] == 'ie9') {
+          $script = "http://ie.microsoft.com/testdrive/HTML5/CompatInspector/inspector.js";
+          drupal_add_js($script, array('scope' => 'header', 'type' => 'external', 'weight' => -10, 'group' => JS_LIBRARY));
+        }
+      }
+      // add js embed script
+      $script = intel_get_js_embed('l10i', 'local');
+      drupal_add_js($script, array('type' => 'inline', 'scope' => 'header', 'weight' => 0));
+    }
+  }
-  if (!empty($_GET['debug'])) {
-    if ($_GET['debug'] == 'ie9') {
-      $script = "http://ie.microsoft.com/testdrive/HTML5/CompatInspector/inspector.js";
-      // TODO WP
-      //drupal_add_js($script, array('scope' => 'header', 'type' => 'external', 'weight' => -10, 'group' => JS_LIBRARY));
+    }
+  }
-  /*
-  $script = get_option('intel_js_monitor_script', '');
-  if ($script) {
-    drupal_add_js($script, array('type' => 'inline', 'scope' => 'header', 'weight' => -99, 'group' => -101));
+  }
-  */
-  //$script = intel_get_js_embed('l10i', 'local');
-  //wp_enqueue_script('intel_tracker_embed', $script);
-  //drupal_add_js($script, array('type' => 'inline', 'scope' => 'header', 'weight' => 0));
-  /**
-   * check admin alter enhancements
-   */
-  /*
-  if ($_GET['q'] == 'admin/content' && user_access('view all intel reports')) {
-    drupal_add_css(drupal_get_path('module', 'intel') . '/css/intel.report.css');
-    drupal_add_js(drupal_get_path('module', 'intel') . '/js/intel.admin_content_alter.js');
+  }
-  if ($_GET['q'] == 'admin/content/cta' && user_access('view all intel reports')) {
-    drupal_add_js(drupal_get_path('module', 'intel') . '/js/intel.admin_content_cta_alter.js');
+  }
-  */
   //drupal_alter('intel_page_settings_js', $js, $page);
+  $js = apply_filters('intel_page_settings_js', $js, $page);
+  intel_do_hook_alter('intel_page_settings_js', $js, $page);
   if (!empty($_GET['debug'])) {
     intel_d($js);//
 …
   // ? not sure if this is needed or enhances performance
   $created = Intel_Entity::entity_get($entity_type, $entity, 'created');
+  $created = IntelEntity::entity_get($entity_type, $entity, 'created');
   if (isset($created)) {
     $val = date('YmdHiw', $created);
 …
   // Only load URI if entity has been created (has ID).
   if ($entity_id) {
     $uri = Intel_Entity::entity_uri($entity_type, $entity);
+    $uri = IntelEntity::entity_uri($entity_type, $entity);
     if (!empty($uri['id'])) {
       $page_attrs['ri'] = $uri['id'];
 …
       $key = 'a';
+    }
     $author_id = Intel_Entity::entity_get($entity_type, $entity, 'author_id');
+    $author_id = IntelEntity::entity_get($entity_type, $entity, 'author_id');
     $page_attrs[$key] = $author_id;
     //$page_ld['author'] = $base_path . "user/" . $entity->uid;
 …
+}
-function intel_page_footer_alter() {
-  return;
-  global $post;
-  if (!empty($post)) {
-    $stats = intel_get_post_stats($post);
+  }
+}
 function intel_get_post_entity_attr_default($post = NULL) {
   if (!isset($post)) {
 …
+}
+function intel_get_page_intel_pushes_cookie() {
+  return intel_page_intel_pushes('get_cookie');
+}
+function intel_get_flush_page_intel_pushes_cookie() {
+  return intel_page_intel_pushes('get_cookie_flush');
+}
 /**
  * Used to store intel pushes for redirects.
  * @return mixed
  */
 function intel_save_flush_page_intel_pushes() {
   $push_storage = get_option('intel_save_push_storage', INTEL_SAVE_PUSH_STORAGE_DEFAULT);
 …
 function intel_page_intel_pushes($action = 'get', $push = array(), $index = '') {
+  if (!isset($_SESSION['intel'])) {
+    $_SESSION['intel'] = array();
+  }
+  if (!isset($_SESSION['intel']['page_pushes'])) {
+    $_SESSION['intel']['page_pushes'] = array();
+  if (!isset($_SESSION['intel_pushes'])) {
+    $_SESSION['intel_pushes'] = array();
+  }
+  if (!isset($_SESSION['intel_pushes']['page_pushes'])) {
+    $_SESSION['intel_pushes']['page_pushes'] = array();
+  }
+  if (!isset($_SESSION['intel_pushes']['page_pushes_cookie'])) {
+    $_SESSION['intel_pushes']['page_pushes_cookie'] = array();
+  }
+  $data = &$_SESSION['intel_pushes']['page_pushes'];
+  if (!empty($options['cookie'])) {
+    $data = &$_SESSION['intel_pushes']['page_pushes_cookie'];
+  }
 …
+    }
     if (!isset($_SESSION['intel']['page_pushes'][$method])) {
       $_SESSION['intel']['page_pushes'][$method] = array();
+    if (!isset($data[$method])) {
+      $data[$method] = array();
+    }
 …
+    }
     elseif ($method == 'event') {
       $index = count($_SESSION['intel']['page_pushes'][$method]);
+      $index = count($data[$method]);
       $value = $push[0];
+    }
 …
       // check if push uses command(def) format
       if (count($push) == 1 && is_array($push[0])) {
         $index = count($_SESSION['intel']['page_pushes'][$method]);
+        $index = count($data[$method]);
         $value = $push[0];
+      }
       else {
         $index = count($_SESSION['intel']['page_pushes'][$method]);
+        $index = count($data[$method]);
         $value = $push;
+      }
 …
     if ($index == -1) {
       $_SESSION['intel']['page_pushes'][$method] = $value;
+      $data[$method] = $value;
+    }
     else {
       $_SESSION['intel']['page_pushes'][$method][$index] = $value;
+    }
+  }
   $ret = $_SESSION['intel']['page_pushes'];
+      $data[$method][$index] = $value;
+    }
+  }
+  $ret = $data;
   if ($action == 'save_flush' || $action == 'save_db_flush') {
     intel()->quick_session_cache();
+    unset($_SESSION['intel']['page_pushes']);
+    unset($_SESSION['intel_pushes']['page_pushes']);
+  }
   elseif ($action == 'save_cookie_flush') {
 …
     $pushes = array();
     foreach ($_SESSION['intel']['page_pushes'] as $k => $v) {
+    foreach ($_SESSION['intel_pushes']['page_pushes'] as $k => $v) {
       $a = array('');
       $pushes[] = array($k, $v);
+    }
     $json = json_encode($pushes);
+    intel_setrawcookie('l10i_push', $json);
+    unset($_SESSION['intel']['page_pushes']);
+    intel_setrawcookie('l10i_page_pushes', $json);
+    unset($_SESSION['intel_pushes']['page_pushes']);
+    unset($_SESSION['intel_pushes']['page_pushes_cookie']);
+  }
   elseif ($action == 'get_flush') {
+    unset($_SESSION['intel']['page_pushes']);
+    unset($_SESSION['intel_pushes']['page_pushes']);
+  }
+  elseif ($action == 'get_cookie') {
+    $ret = $_SESSION['intel_pushes']['page_pushes_cookie'];
+  }
+  elseif ($action == 'get_cookie_flush') {
+    $ret = $_SESSION['intel_pushes']['page_pushes_cookie'];
+    unset($_SESSION['intel_pushes']['page_pushes_cookie']);
+  }
+  /*
+   * Unset session var if empty on flush
+   */
+  if ((substr($action, -5) == 'flush')
+    && empty($_SESSION['intel_pushes']['page_pushes'])
+    && empty($_SESSION['intel_pushes']['page_pushes_cookie'])
+  ) {
+    unset($_SESSION['intel_pushes']);
+  }
 …
+      }
+    }
     else {
 …
     'clickMode' => 1,
     'clickValue' => 1,
+    'track_file_extension' => 'trackFileExtension',
+    'trackFileExtension' => 1,
   );
 …
+}
 function intel_cache_busting_url($url) {
+function intel_cache_busting_url($url, $force = FALSE) {
   $enable = &Intel_Df::drupal_static( __FUNCTION__ );
   if (!isset($enable)) {
     $enable = get_option('intel_cache_busting', INTEL_CACHE_BUSTING_DEFAULT);
+  }
   if (!$enable) {
+  if (!$enable && !$force) {
     return $url;
+  }
 …
  */
 function intel_get_js_embed($type = 'l10i', $mode = 'external', $version = 'latest', $terminator = "") {
   global $user;
+  $user = intel_get_current_user();
   $script = '';
 …
     // trigger alter to enable other modules to add pushes
     $l10iq_pushes = apply_filters('intel_l10iq_pushes_alter', $l10iq_pushes);
+    intel_do_hook_alter('intel_js_embed_intel_push', $l10iq_pushes);
     //drupal_alter('intel_l10iq_pushes', $l10iq_pushes);
 …
         $l10ijs_path = '/js/' . $api_js_ver . '/l10i' . $sv . '.js';
+        if (intel_is_no_api()) {
+          $a = explode('//', get_site_url());
+          $api_hostpath = $a[1];
+          $purl = parse_url(plugin_dir_url(__DIR__));
+          $l10ijs_path = $purl['path'] . 'js/l10i' . $sv . '.js';
+          $l10ijs_propdir = '';
+        }
         $script .= "(function(w,d,o,u,b,i,r,a,s,c,t){" . $terminator;
 …
   include_once INTEL_DIR . 'includes/class-intel-visitor.php';
   $vtk = Intel_Visitor::extractVtk();
+  $vtk = IntelVisitor::extractVtk();
   $api_level = intel_api_level();
 …
  */
 function intel_process_form_submission($vars) {
 //Intel_Df::watchdog('intel_process_form_submission vars', json_encode($vars));
+Intel_Df::watchdog('intel_process_form', 'vars', $vars);
   // set defaults
   $vars += intel_form_submission_vars_default();
 …
       $submission->vid = 0;
+    }
+  }
 …
     'hook_context' => isset($vars['hook_context']) ? $vars['hook_context'] : NULL,
   );
+  $hook_data = apply_filters('intel_form_submission_data_presave', $hook_data, $hook_context);
+//Intel_Df::watchdog('intel_process_form_submissionhook_presave', 'hook_data', $hook_data);
+  //$hook_data = apply_filters('intel_form_submission_data_presave', $hook_data, $hook_context);
+  $hook_data = intel_do_hook('intel_form_submission_data_presave', $hook_data, $hook_context);
   // save submission object
   if (!empty($submission->vid)) {
+//Intel_Df::watchdog('intel_process_form', 'submission', $submission);
     $sid = intel_submission_save($submission);
     if (empty($submission->sid)) {
 …
+  }
+  if ($submission->sid) {
+  // if submission path does not exist, set default
+  if (empty($track['submission_path']) && !empty($sid)) {
+    $track['submission_path'] = 'submission/' . $sid;
+  }
+  if (!empty($submission->sid)) {
     $track['oa']['3rk'] = $submission->sid;
     $track['oa']['3ri'] = ':intel_submission:' . $submission->sid;
 …
+  }
   //$userId = Intel_Visitor::extractUserId();
+  //$userId = IntelVisitor::extractUserId();
   //intel_set_ga_userid($visitor);
 …
   // save visitor
   if (!empty($visitor->vid)) {
+//Intel_Df::watchdog('intel_process_form', 'visitor', $visitor);
     intel_visitor_save($visitor);
-    //watchdog('intel.page_alter 992', print_r($visitor, 1));
+  }
 …
   $track = apply_filters('intel_form_submission_track_alter', $track, $hook_context);
+  // create form submission intel event
   if (!empty($track['event_category'])) {
     $call = array(
 …
       'oa' => $track['oa'],
     );
+    //Intel_Df::watchdog('form_submission', json_encode($call));
+//Intel_Df::watchdog('intel_process_form', 'intel_push', $call);
     intel_add_page_intel_push(array('event', $call));
-//dpm('page_intel_push=');dpm($call);//
+  }
 …
   // hook to allow other plugins to save data
+  do_action('intel_form_submission_data_save', $hook_context);
+  intel_do_hook_action('intel_form_submission_data_save', $hook_context);
+  //do_action('intel_form_submission_data_save', $hook_context);
+}
 …
+  }
   if (!$domain) {
     $domain = '.' . intel()->domain;
+    //$domain = '.';
+  }
 …
 function intel_deletecookie($name) {
   if (isset($_COOKIOE[$name])) {
     unset($_COOKIOE[$name]);
+  if (isset($_COOKIE[$name])) {
+    unset($_COOKIE[$name]);
+  }
   intel_setcookie($name, '', time() - 999);
 …
     // if account is currently logged in user, set $vtk
     // otherwise another user is saving user data
     $vtk = ($uid && ($user->uid == $account->uid)) ? Intel_Visitor::extractVtk() : '';
+    $vtk = ($uid && ($user->uid == $account->uid)) ? IntelVisitor::extractVtk() : '';
+  }
   elseif (INTEL_PLATFORM == 'wp') {
 …
     $email = $account->user_email;
     $name = $account->display_name;
     $vtk = Intel_Visitor::extractVtk();
+    $vtk = IntelVisitor::extractVtk();
+  }
 …
   // don't save "visitors" that don't have a vtk. They are likely spam bots
   $vtk = Intel_Visitor::extractVtk();
+  $vtk = IntelVisitor::extractVtk();
   if (empty($vtk)) {
     return;

intelligence/trunk/includes/intel.reports.php

-                      r1827302
+                      r2947915
     $vars['timeframe'] = 'l30d';
+  }
   list($vars['start_date'], $vars['end_date'], $vars['number_of_days'], $vars['timezone_offset']) = _intel_get_report_dates_from_ops($vars['timeframe'], $vars['cache_options']);
+  // check for DateHourMinute format
+  $a = explode(',', $vars['timeframe']);
+  if (count($a) == 2 && strlen($a[0]) == 12 && strlen($a[1]) == 12) {
+    if (!isset($vars['filters']['datetime'])) {
+      $vars['filters']['datetime'] = array();
+    }
+    // make not to use the input timestamp and used the ga timezone corrected start_date & end_date
+    $vars['filters']['datetime'][] = "dateHourMinute:" . date('YmdHi', $vars['start_date']) . "-" . date('YmdHi', $vars['end_date']) ;
+  }
   if (!empty($_GET['refresh'])) {

intelligence/trunk/includes/intel.visitor_sync.php

-                      r1904936
+                      r2947915
+}
+add_filter( 'intel_sync_visitor', 'intel_ga_sync_visitordata', 5, 2);
+add_filter( 'intel_sync_visitor', 'intel_intel_sync_visitor', 5, 2);
+function intel_intel_sync_visitor(IntelVisitor $visitor, $options = array()) {
+  $visitor = intel_ga_sync_visitor($visitor, $options);
+  //$visitor = intel_l10iapi_sync_visitordata($visitor, $options);
+  return $visitor;
+}
+//add_filter( 'intel_sync_visitor', 'intel_ga_sync_visitordata', 5, 2);
 /**
  * Implements intel_sync_visitordata
  * @param unknown_type $visitor
  */
+function intel_ga_sync_visitordata($visitor, $options = array()) {
+Intel_Df::watchdog('intel_ga_sync_visitordata options', print_r($options, 1));
+function intel_ga_sync_visitor($visitor, $options = array()) {
+//$args = func_get_args();
+//Intel_Df::watchdog('intel_ga_sync_visitordata', 'args', $args);
   if (!empty($options['processes']) && !in_array('ga', $options['processes'])) {
     return $visitor;
+  }
+  require_once INTEL_DIR . "includes/intel.ga.php";
+  intel_load_include('includes/intel.ga');
   $vtkids = array();
 …
+}
 add_filter( 'intel_sync_visitor', 'intel_l10iapi_sync_visitordata', 10, 2);
+//add_filter( 'intel_sync_visitor', 'intel_l10iapi_sync_visitordata', 10, 2);
 function intel_l10iapi_sync_visitordata($visitor, $options = array()) {
   if (!empty($options['processes']) && !in_array('l10iapi', $options['processes'])) {

intelligence/trunk/intel.install.php

-                      r1827302
+                      r2947915
+    }
+}
+/**
+ * Adding annotation table
+ */
+function intel_update_1005() {
+    global $wpdb;
+    require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+    $charset_collate = $wpdb->get_charset_collate();
+    $table_name = $wpdb->prefix . "intel_annotation";
+  $sql = "CREATE TABLE $table_name (
+    aid int(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+    created int(10) UNSIGNED NOT NULL DEFAULT '0',
+    updated int(10) UNSIGNED NOT NULL DEFAULT '0',
+    timestamp int(10) UNSIGNED NOT NULL DEFAULT '0',
+    type varchar(128) NOT NULL DEFAULT '',
+    message longtext NOT NULL,
+    variables longtext NOT NULL,
+    data longtext NOT NULL,
+    PRIMARY KEY (aid),
+    KEY timestamp (timestamp),
+    KEY type (type)
+    ) $charset_collate;";
+    dbDelta( $sql );
+}

intelligence/trunk/intel.module.php

-                      r2096810
+                      r2947915
 define('INTEL_L10IAPI_URL', 'https://api.getlevelten.com/v1/intel');
 define('INTEL_IMAPI_URL', 'https://admin.intelligencewp.com/imapi/v1/intel');
+define('INTEL_NO_API', 1);  // set to 1 to remove API connections
 //define('INTEL_IMAPI_URL', 'intl.getlevelten.com/imapi/v1/intel');
 define('INTEL_L10IAPI_JS_VER', '0.3.1');
 …
 define('INTEL_TRACK_PAGE_UID_DEFAULT', 'a');
 define('INTEL_TRACK_PAGE_TERMS_DEFAULT', 0);
 define('INTEL_TRACK_PAGE_TERMS_VISITOR_DEFAULT', 0);
+define('INTEL_TRACK_VISITOR_TERMS_DEFAULT', 0);
 define('INTEL_SYNC_VISITORDATA_FULLCONTACT_DEFAULT', 0);
 define('INTEL_TRACK_PHONECALLS_DEFAULT', 0);
 …
 // include required files
+require_once Intel_Df::drupal_get_path('module', 'intel') . "/includes/intel.common.php";
 require_once Intel_Df::drupal_get_path('module', 'intel') . "/includes/intel.page_alter.php";
 require_once Intel_Df::drupal_get_path('module', 'intel') . "/includes/intel.page_data.php";
 …
     'weight' => -10,
   );
   $items['admin/config/intel/settings/general'] = array(
     'title' => 'General',
 …
     'file' => 'admin/intel.admin_setup.php',
   );
+  $items['admin/config/intel/settings/annotation'] = array(
+    'title' => 'Annotations',
+    'description' => 'Annotation configuration.',
+    'page callback' => 'intel_admin_annotation_list_page',
+    'access callback' => 'user_access',
+    //'access callback' => '_intel_user_access_extended',
+    'access arguments' => array('admin intel'),
+    'type' => Intel_Df::MENU_LOCAL_TASK,
+    'weight' => $w++,
+    'file' => 'admin/intel.admin_annotation.php',
+  );
   $items['admin/config/intel/settings/scoring'] = array(
     'title' => 'Scoring',
 …
     );
+  }
+  $items['admin/config/intel/settings/framework'] = array(
+    'title' => 'Framework settings',
+    'description' => 'Basic setup',
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('intel_admin_framework_settings'),
+    'access callback' => 'user_access',
+    'access arguments' => array('admin intel'),
+    'type' => Intel_Df::MENU_CALLBACK,
+    'weight' => -1,
+    'file' => 'admin/intel.admin_framework.php',
+    'intel_install_access' => 'active',
+  );
   // intel visitor config
 …
       );
+    }
+    $items['admin/annotations'] = array(
+      'title' => 'Annotations',
+      'description' => 'Information about annotations',
+      'page callback' => 'intel_admin_annotation_list_page',
+      //'page arguments' => array(4),
+      'access callback' => 'intel_annotation_access',
+      'access arguments' => array('list'),
+      'type' => Intel_Df::MENU_NORMAL_ITEM,
+      'file' => 'admin/intel.admin_annotation.php',
+      //'intel_api_access' => 'pro',
+    );
+    $items['admin/annotations/add'] = array(
+      'title' => 'Add',
+      'description' => 'Add new annotation',
+      'page callback' => 'intel_admin_annotation_add_page',
+      //'page arguments' => array(4),
+      'access callback' => 'intel_annotation_access',
+      'access arguments' => array('update'),
+      'type' => Intel_Df::MENU_NORMAL_ITEM,
+      'file' => 'admin/intel.admin_annotation.php',
+      //'intel_api_access' => 'pro',
+    );
+    $items['annotation/%intel_annotation'] = array(
+      'title' => 'Annotation',
+      'page callback' => 'intel_annotation_page',
+      'page arguments' => array(1),
+      'access callback' => 'intel_annotation_access',
+      'access arguments' => array('view', 1),
+      'file' => 'admin/intel.admin_annotation.php',
+    );
+    $items['annotation/%intel_annotation/view'] = array(
+      'title' => 'View',
+      'type' => Intel_Df::MENU_DEFAULT_LOCAL_TASK,
+      'weight' => -20,
+    );
+    $items['annotation/%intel_annotation/edit'] = array(
+      'title' => 'Edit',
+      'description' => 'Edit annotation',
+      //'page callback' => 'intel_visitor_tab_clickstream',
+      'page callback' => 'intel_admin_annotation_edit_page',
+      'page arguments' => array(1),
+      'access callback' => 'intel_annotation_access',
+      'access arguments' => array('update', 1),
+      'type' => Intel_Df::MENU_LOCAL_TASK,
+      'file' => 'admin/intel.admin_annotation.php',
+    );
+    $items['annotation/%intel_annotation/sync_ga'] = array(
+      'title' => 'GA Sync',
+      'description' => 'Edit annotation',
+      //'page callback' => 'intel_visitor_tab_clickstream',
+      'page callback' => 'intel_admin_annotation_sync_ga_page',
+      'page arguments' => array(1),
+      'access callback' => 'intel_annotation_access',
+      'access arguments' => array('update', 1),
+      'type' => Intel_Df::MENU_CALLBACK,
+      'file' => 'admin/intel.admin_annotation.php',
+    );
+  }
 …
   );
-  /*
-  $items['admin/util/log'] = array(
-    'title' => 'Messages',
-    'description' => 'View messages log',
-    'page callback' => 'intel_util_log_page',
-    'access callback' => 'user_access',
-    'access arguments' => array('admin intel'),
-    'type' => Intel_Df::MENU_LOCAL_TASK,
-    'file' => 'admin/intel.admin_util.php',
-  );
-  */
   $items['admin/util/update'] = array(
     'title' => 'Update',
 …
     'type' => Intel_Df::MENU_LOCAL_TASK,
     'file' => 'admin/intel.admin_util.php',
+  );
+  $items['admin/util/log'] = array(
+    'title' => 'Log',
+    'description' => 'Watchdog log',
+    'page callback' => 'intel_util_log_list_page',
+    'access callback' => 'user_access',
+    'access arguments' => array('admin intel'),
+    'type' => Intel_Df::MENU_LOCAL_TASK,
+    'file' => 'admin/intel.admin_util.php',
+    'intel_install_access' => 'active',
+  );
+  $items['admin/util/log/%intel_log'] = array(
+    'title' => 'Log',
+    'description' => 'Watchdog log',
+    'page callback' => 'intel_util_log_page',
+    'page arguments' => array(3),
+    'access callback' => 'user_access',
+    'access arguments' => array('admin intel'),
+    'type' => Intel_Df::MENU_LOCAL_TASK,
+    'file' => 'admin/intel.admin_util.php',
+    'intel_install_access' => 'active',
   );
 …
+}
+function intel_is_no_api() {
+  return INTEL_NO_API;
+}
 /**
  * Determines if the api access level is adequate to access the
 …
     'phonecall/*' => 1,
     'emailclick/*' => 1,
+    'annotation/*' => 1,
   );
   return $paths;
 …
     'title' => Intel_Df::t('View emailclicks'),
     'description' => Intel_Df::t('Grants access to view emailclicks.'),
+    'roles' => array('editor', 'author'),
+  );
+  $permissions['view all intel annotations'] = array(
+    'title' => Intel_Df::t('View annotations'),
+    'description' => Intel_Df::t('Grants access to view annotations.'),
     'roles' => array('editor', 'author'),
   );
 …
       return $module_access || $general_access;
     case 'list':
+      return $module_access || $general_access;
+  }
+}
+function intel_annotation_access($op, $annotation = NULL, $account = NULL) {
+  $account = isset($account) ? $account : wp_get_current_user();
+  $general_access = Intel_Df::user_access('view all intel annotations', $account);
+  $module_access = FALSE;
+  //$module_access = count(array_filter(module_invoke_all('intel_submission_access', $submission, $op, $account))) > 0;
+  switch ($op) {
+    case 'view':
+      return $module_access || $general_access;
+    case 'list':
+      return $module_access || $general_access;
+    case 'create':
+    case 'update':
+      return $module_access || $general_access;
+    case 'delete':
       return $module_access || $general_access;
+  }
 …
 function intel_verify_apikey(&$message = '', &$property = array(), $options = array()) {
+  if (intel_is_no_api()) {
+    $api_level = 'basic';
+    update_option('intel_api_level', $api_level);
+    return $api_level;
+  }
   if (!intel_verify_library($message)) {
     return FALSE;
 …
+}
+/**
+ * Returns if is framework flag is set
+ *
+ * @return array|bool|mixed
+ */
+function intel_is_framework() {
+  $flag = &Intel_Df::drupal_static( __FUNCTION__, NULL);
+  if (!isset($flag)) {
+    $flag = (boolean) get_option('intel_framework_mode', FALSE);
+    if (intel()->is_network_framework_mode) {
+      $flag = TRUE;
+    }
+  }
+  return $flag;
+}
+function intel_is_framework_only() {
+  return intel_is_framework() && !intel_is_installed();
+}
 /**
 …
     // A human readable label to identify our entity.
     'label' => Intel_Df::t('Intel visitor'),
     'entity class' => 'Intel_Visitor',
     'controller class' => 'Intel_Visitor_Controller',
+    'entity class' => 'IntelVisitor',
+    'controller class' => 'IntelVisitorController',
     'base table' => 'intel_visitor',
     'label callback' => 'intel_visitor_label',
 …
     ),
     'file' => array(
       'includes/class-intel-visitor.php',
       'includes/class-intel-visitor-controller.php',
+      'includes/intel.IntelVisitor.php',
+      'includes/intel.IntelVisitorController.php',
     ),
     'fields' => array(
 …
     // A human readable label to identify our entity.
     'label' => Intel_Df::t('Intel submission'),
     'entity class' => 'Intel_Submission',
     'controller class' => 'Intel_Submission_Controller',
+    'entity class' => 'IntelSubmission',
+    'controller class' => 'IntelSubmissionController',
     'base table' => 'intel_submission',
     'label callback' => 'intel_submission_label',
 …
     ),
     'file' => array(
       'includes/class-intel-submission.php',
       'includes/class-intel-submission-controller.php',
+      'includes/intel.IntelSubmission.php',
+      'includes/intel.IntelSubmissionController.php',
     ),
     'fields' => array(
       'sid' => null,
       'vid' => 0,
       'submitted' => time(),
+      'submitted' => REQUEST_TIME,
       'type' => '',
       'fid' => '',
 …
       'cta_id' => '',
       'data' => array(),
+    ),
+  );
+  $info['intel_annotation'] = array(
+    // A human readable label to identify our entity.
+    'label' => Intel_Df::t('Intel annotation'),
+    'entity class' => 'IntelAnnotation',
+    'controller class' => 'IntelAnnotationController',
+    'base table' => 'intel_annotation',
+    'label callback' => 'intel_annotation_label',
+    'uri callback' => 'intel_annotation_uri',
+    'fieldable' => FALSE,
+    'module' => 'intel',
+    'entity keys' => array(
+      'id' => 'aid',
+    ),
+    'file' => array(
+      'includes/intel.IntelAnnotation.php',
+      'includes/intel.IntelAnnotationController.php',
+    ),
+    'fields' => array(
+      'aid' => null,
+      'created' => REQUEST_TIME,
+      'updated' => REQUEST_TIME,
+      'started' => REQUEST_TIME,
+      'ended' => REQUEST_TIME,
+      'analytics_period' => 0,
+      'type' => '',
+      'message' => '',
+      'variables' => array(),
+      'data' => array(),
+    ),
+  );
+  $info['intel_log'] = array(
+    // A human readable label to identify our entity.
+    'label' => Intel_Df::t('Intel log'),
+    'entity class' => 'IntelLog',
+    'controller class' => 'IntelLogController',
+    'base table' => 'intel_log',
+    'label callback' => 'intel_log_label',
+    'uri callback' => 'intel_log_uri',
+    'fieldable' => FALSE,
+    'module' => 'intel',
+    'entity keys' => array(
+      'id' => 'lid',
+    ),
+    'file' => array(
+      'includes/intel.IntelLog.php',
+      'includes/intel.IntelLogController.php',
+    ),
+    'fields' => array(
+      'lid' => null,
+      'uid' => 0,
+      'type' => '',
+      'message' => '',
+      'variables' => array(),
+      'severity' => 0,
+      'link' => '',
+      'location' => '',
+      'referer' => '',
+      'hostname' => '',
+      'timestamp' => '',
     ),
   );
 …
+}
+function intel_log_create($values = array()) {
+  $entity = intel()->get_entity_controller('intel_log')->create($values);
+  return $entity ;
+}
+/**
+ * We save the entity by calling the controller.
+ */
+function intel_log_save(&$entity) {
+  return intel()->get_entity_controller('intel_log')->save($entity);
+}
+/**
+ * Loads log object from database
+ *
+ * @param $lid Primary session id
+ *
+ * @return Submission stdClass object
+ */
+function intel_log_load($lid) {
+  //$submission = &Intel_Df::drupal_static(__FUNCTION__);
+  $entities = intel()->get_entity_controller('intel_log')->load($lid);
+  if (!empty($entities)) {
+    return array_shift($entities);
+  }
+  return FALSE;
+}
+/**
+ * Loads submission object using any table field
+ *
+ * @param $vars Array of key value pairs used to identify submission in table
+ *
+ * @return Submission stdClass object
+ */
+function intel_log_load_by_vars($vars) {
+  //$submission = &Intel_Df::drupal_static(__FUNCTION__);
+  $entities = intel()->get_entity_controller('intel_log')->loadByVars($vars);
+  if (!empty($entities) && is_array($entities)) {
+    return array_shift($entities);
+  }
+  return FALSE;
+}
 function intel_visitor_load($id = NULL, $reset = FALSE, $id_type = NULL) {
   $visitors = intel_visitor_load_multiple($id, array(), $reset, $id_type);
 …
+}
+/**
+ * Initializes properties of submission stdClass object
+ */
+function intel_annotation_construct() {
+  $annotation = intel()->get_entity_controller('intel_annotation')->create();
+  return $annotation;
+}
+/**
+ * Saves annotation objects
+ *
+ * @param stdClass $annotation
+ */
+function intel_annotation_save($annotation) {
+  return $annotation->save();
+}
+/**
+ * Loads annotation object from database
+ *
+ * @param $aid Primary annotation_id
+ *
+ * @return Annotation stdClass object
+ */
+function intel_annotation_load($aid) {
+  $annotation = intel()->get_entity_controller('intel_annotation')->load($aid);
+  if (!empty($annotation)) {
+    return array_shift($annotation);
+  }
+  return FALSE;
+}
+/**
+ * Deletes annotation entity
+ *
+ * @param $vid
+ * @return mixed
+ */
+function intel_annotation_delete($aid) {
+  // check if vid is a visitor entity, if so extract vid from entity
+  if (is_object($aid) && !empty($aid->aid)) {
+    $aid = $aid->aid;
+  }
+  return intel()->get_entity_controller('intel_annotation')->deleteOne($aid);
+}
 …
  */
 function intel_intel_scripts() {
+  return intel()->intel_script_info();
+  //return intel()->intel_script_info();
+  return intel_get_intel_script_info();
+}
+/**
+ * Returns information about intel_scripts
+ * @return array
+ */
+function intel_get_intel_script_info() {
+  $scripts = array();
+  $scripts = intel_build_info('intel_script');
+  return $scripts;
+}
 // add _intel_intel_script_info to hook_intel_script_info
 add_filter('intel_intel_script_info', '_intel_intel_script_info');
+intel_add_hook('intel_intel_script_info', '_intel_intel_script_info');
 /**
  * Implements hook_intel_intel_script
 …
  */
 function intel_is_intel_script_enabled($name) {
+  if (intel_is_framework()) {
+    return 0;
+  }
   $scripts_enabled = get_option('intel_intel_scripts_enabled', array());
   if (isset($scripts_enabled[$name])) {
 …
+}
 function intel_add_visitor_sync_request($visitor, $delay = 0) {
+function intel_add_visitor_sync_request($vtk, $delay = 0) {
   //$intel = intel();
+  // check if visitor was passed instead of vtk
+  if (is_object($vtk) && !empty($vtk->vtk)) {
+    $vtk = $vtk->vtk;
+  }
   $items = get_option('intel_sync_visitor_requests', array());
   if (!isset($items[$visitor->vtk])) {
+  if (!isset($items[$vtk])) {
     $item = new stdClass;
     $item->created = time();
     $item->run_after =  time() + $delay;
     $item->vtk = $visitor->vtk;
+    $item->vtk = $vtk;
     $item->attempts = 0;
     $items[$visitor->vtk] = $item;
+    $items[$vtk] = $item;
     update_option('intel_sync_visitor_requests', $items);
+  }
 …
  */
 function intel_sync_visitordata_page($visitor = null, $count = 5) {
   require_once Intel_Df:: drupal_get_path('module', 'intel') . "/includes/intel.visitor_sync.php";
+  intel_load_include('includes/intel.visitor_sync');
   $output = '';
 …
+}
 function intel_sync_visitordata($visitor, $options = array()) {
+function intel_sync_visitordata(IntelVisitor $visitor, $options = array()) {
   require_once Intel_Df::drupal_get_path('module', 'intel') . "/includes/intel.visitor_sync.php";
 …
     $cq_item = $queue->claimItem();
+    $func = $info['worker callback'];
+    $func($cq_item['data']);
+    $queue->deleteItem($cq_item);
+    if (!empty($cq_item)) {
+      $func = $info['worker callback'];
+      $func($cq_item['data']);
+      $queue->deleteItem($cq_item);
+    }
+  }
+}
 …
+}
-if ( !function_exists( 'intel_d' ) ) {
-  function intel_d() {
-    // check if user has access to this data
-    static $access;
-    if (!isset($access)) {
-      $access = Intel_Df::user_access('debug intel');
+    }
-    if (!$access) {
-      return;
+    }
-    static $kint_aliases;
-    $_ = func_get_args();
-    if (class_exists('Kint')) {
-      if (!Kint::enabled()) {
-        return '';
+      }
-      // add to static aliases so the function caller info translates
-      if (empty($kint_aliases)) {
-        $kint_aliases = Kint::$aliases;
-        $kint_aliases['functions'][] = 'intel_d';
-        $kint_aliases['functions'][] = 'intel_dd';
-        $kint_aliases['functions'][] = 'intel_print_var';
-        Kint::$aliases = $kint_aliases;
+      }
-      ob_start();
-      call_user_func_array(array('Kint', 'dump'), $_);
-      $output = ob_get_clean();
-      if (intel()->is_intel_admin_page()) {
-        Intel_Df::drupal_set_message($output);
+      }
-      else {
-        print $output;
+      }
+    }
-    else {
-      if (intel()->is_intel_admin_page()) {
-        Intel_Df::drupal_set_message(json_encode($_[0]));
+      }
-      else {
-        print json_encode($_[0]);
+      }
+    }
+  }
+}
 /**
  * Implements hook_theme_info().
 …
 function intel_theme_info($themes = array()) {
   //$themes = array();
+  $themes['intel_bootstrap_card'] = array(
+    'variables' => array(
+      'header' => NULL,
+      'body' => NULL,
+      'footer' => NULL,
+    ),
+    'template' => 'intel-bootstrap-card',
+    'file' => 'intel.pages.php',
+  );
+  $themes['intel_bootstrap_card_block'] = array(
+    'variables' => array(
+      'value' => NULL,
+    ),
+    'template' => 'intel-bootstrap-card',
+    'file' => 'intel.pages.php',
+  );
+  // WP admin page element theming
   $themes['intel_page'] = array(
     'variables' => array(
 …
     'file' => 'intel.pages.php',
   );
+  $theme['bootstrap_card'] = array(
+    'variables' => array(
+      'header' => NULL,
+      'body' => NULL,
+      'footer' => NULL,
+    ),
+    'template' => 'intel-bootstrap-card',
+    'file' => 'intel.pages.php',
+  );
+  $theme['bootstrap_element'] = array(
+    'variables' => array(
+      'wrapper' => NULL,
+      'markup' => NULL,
+    ),
+    'template' => 'intel-bootstrap-element',
+    'file' => 'intel.pages.php',
+  );
   $themes['intel_visitor_profile_block'] = array(
     'render element' => 'element',
 …
+}
-function intel_format_un($name) {
-  return str_replace('-', '_', strtolower(Intel_Df::drupal_clean_css_identifier($name)));
+}
 function intel_get_iapi_url($component = '') {
   $url_obj = &Intel_Df::drupal_static( __FUNCTION__);
   if (empty($url_obj)) {
     $url = get_option('intel_l10iapi_url', '');
 …
+  }
   return http_build_url($url_obj);
+  return intel_http_build_url($url_obj);
+}
 function intel_get_imapi_url($component = '') {
   $url_obj = &Intel_Df::drupal_static( __FUNCTION__);
   if (empty($url_obj)) {
     $url = get_option('intel_imapi_url', '');
+    if (!$url) {
+    if ($url) {
+      $a = explode('//', $url);
+      if (count($a) == 1) {
+        $url = '//' . $url;
+      }
+    }
+    else {
       $url = INTEL_IMAPI_URL;
+    }
     $url_obj = parse_url($url);
+  }
 …
+  }
   return http_build_url($url_obj);
+  return intel_http_build_url($url_obj);
+}
 …
 add_filter('gainwp_gapi_client_alter', 'intel_gainwp_gapi_client_alter');
+function intel_get_timezone_info() {
+  $timezone_info = &Intel_Df::drupal_static( __FUNCTION__, array());
+  if (empty($timezone_info)) {
+    $ga_profile = get_option('intel_ga_profile', array());
+    $timezone_info['timezone'] = '';
+    $timezone_info['timezone_abv'] = '';
+    $timezone_info['offset'] = 0;
+    $timezone_info['offset_hours'] = 0;
+    $timezone_info['timezone'] = $timezone_info['cms_timezone'] = get_option('timezone_string', '');
+    $timezone_info['offset_hours'] = $timezone_info['cms_offset_hours'] = get_option('gmt_offset', '');
+    if (!empty($timezone_info['cms_timezone'])) {
+      $dtz = new DateTimeZone($timezone_info['cms_timezone']);
+      $time = new DateTime("now", $dtz);
+      $timezone_info['timezone_abv'] = $timezone_info['cms_timezone_abv'] = $time->format('T');
+      $timezone_info['offset'] = $timezone_info['cms_offset'] = $dtz->getOffset($time);
+      $timezone_info['offset_hours'] = $timezone_info['cms_offset_hours'] = $timezone_info['cms_offset'] / 60 / 60;
+    }
+    else if ($timezone_info['cms_offset_hours'] != '' ) {
+      $timezone_info['offset_hours'] = $timezone_info['cms_offset_hours'] = (int) $timezone_info['cms_offset_hours'];
+      $timezone_info['offset'] = $timezone_info['cms_offset'] = $timezone_info['cms_offset_hours'] * 60 * 60;
+    }
+    else {
+      $timezone_info['cms_offset_hours'] = $timezone_info['cms_offset'] = 0;
+    }
+    if (!empty($ga_profile['timezone'])) {
+      $timezone_info['timezone'] = $timezone_info['ga_timezone'] = $ga_profile['timezone'];
+      $dtz = new DateTimeZone($timezone_info['ga_timezone']);
+      $time = new DateTime("now", $dtz);
+      $timezone_info['timezone_abv'] = $timezone_info['ga_timezone_abv'] = $time->format('T');
+      $timezone_info['offset'] = $timezone_info['ga_offset'] = $dtz->getOffset($time);
+      $timezone_info['offset_hours'] = $timezone_info['ga_offset_hours'] = $timezone_info['ga_offset'] / 60 / 60;
+    }
+  }
+  return $timezone_info;
+}

intelligence/trunk/intel.pages.php

r1827302	r2947915
104	104	$variables['messages'] = Intel_Df::drupal_get_messages();
105	105	}
	106
	107	}
	108
	109	function template_process_intel_bootstrap_card(&$variables) {
106	110
107	111	}

intelligence/trunk/intel.php

-                      r2096810
+                      r2947915
  * Plugin URI:        http://intelligencewp.com
  * Description:       Provides behavior and visitor intelligence.
  * Version:           1.3.3
+ * Version:           1.4.0
  * Minimum PHP:       5.4
  * Author:            LevelTen
 …
+}
+define('INTEL_VER', '1.3.3');
+//define('SCRIPT_DEBUG', true);
+//define( 'WP_DEBUG', true );
+//define('WP_DEBUG_LOG', 1);
+define('INTEL_VER', '1.4.0');
 /*******************************************

intelligence/trunk/public/class-intel-public.php

-                      r1814908
+                      r2947915
          */
+        // core js support functions
+        // don't add public scripts if in framework mode
+    if (intel_is_framework()) {
+      return;
+    }
+    // core js support functions
         wp_register_script('intel', INTEL_URL . 'js/intel.js', array('jquery'), $this->version, true);
 …
         // check permissions to access reports
         if (!Intel_Df::user_access('view all intel reports')) {
+        if (!Intel_Df::user_access('view all intel reports') || intel_is_framework_only()) {
             return;
+        }

intelligence/trunk/readme.txt

-                      r2250808
+                      r2947915
 Tags: analytics, google analytics, marketing, metrics, roi, stats, tracking, usability
 Requires at least: 4.5
 Tested up to: 5.3
 Stable tag: 1.3.3
+Tested up to: 5.5
+Stable tag: 1.3.4-dev
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 …
 * Verified support for WP 5.2
+= 1.4.0 =
+* Added framework mode
+* Removed Intelligence API dependency
+* Verified support for WP 6.2
 == Upgrade Notice ==

intelligence/trunk/reports/intel.ga_explorer_report.php

-                      r1827302
+                      r2947915
  */
+function intel_ga_explorer_report() {
+function intel_ga_explorer_report($form) {
+  require_once INTEL_DIR . "includes/intel.annotation.php";
   $request = get_option('intel_ga_explorer_request', '');
   $options = array('' => Intel_Df::t('- None -'));
 …
     '#default_value' => (isset($request['custom']['sort_metric'])) ? $request['custom']['sort_metric'] : '',
   );
+  $form['advanced'] = array(
+    '#type' => 'fieldset',
+    '#title' => Intel_Df::t('Advanced'),
+    '#collapsable' => 1,
+    '#collapsed' => 0,
+  );
+  $form['advanced']['annotation_launched'] = array(
+    '#type' => 'textfield',
+    '#title' => Intel_Df::t('Annotation launched'),
+    //'#description' => Intel_Df::t('Enter a value to assign to the event when the CTA is clicked. Must be an whole number.'),
+    '#default_value' => (isset($request['custom']['annotation_launched'])) ? $request['custom']['annotation_launched'] : '',
+  );
+  $options = intel_annotation_period_options();
+  $form['advanced']['annotation_timeframe'] = array(
+    '#type' => 'select',
+    '#title' => Intel_Df::t('Annotation timeframe'),
+    //'#description' => Intel_Df::t('Enter a value to assign to the event when the CTA is clicked. Must be an whole number.'),
+    '#options' => $options,
+    '#default_value' => (isset($request['custom']['annotation_timeframe'])) ? $request['custom']['annotation_timeframe'] : '',
+  );
+  $options = array(
+    'a' => Intel_Df::t('After'),
+    'b' => Intel_Df::t('Before'),
+  );
+  $form['advanced']['annotation_variant'] = array(
+    '#type' => 'select',
+    '#title' => Intel_Df::t('Annotation variant'),
+    //'#description' => Intel_Df::t('Enter a value to assign to the event when the CTA is clicked. Must be an whole number.'),
+    '#options' => $options,
+    '#default_value' => (isset($request['custom']['annotation_variant'])) ? $request['custom']['annotation_variant'] : '',
+  );
   $form['markup2'] = array(
     '#type' => 'markup',
 …
     '#value' => 'Submit',
   );
+  $items = array();
+  $items[] = Intel_Df::l(Intel_Df::t('GA Query Explorer'), 'https://ga-dev-tools.appspot.com/query-explorer');
+  $items[] = Intel_Df::l(Intel_Df::t('GA Dimensions & Metrics Explorer'), 'https://ga-dev-tools.appspot.com/dimensions-metrics-explorer/');
+  $form['markup_reference'] = array(
+    '#type' => 'markup',
+    '#markup' => '<br><br><h4>' . Intel_Df::t('Tools &amp; Reference') . '</h4>' . Intel_Df::theme('item_list', array('items' => $items)),
+  );
   $form['markup3'] = array(
     '#type' => 'markup',
 …
     if (!empty($request['custom']['metrics'])) {
       $req['metrics'] = array_merge($req['metrics'], $request['custom']['metrics']);
+    }
+    if (!empty($req['annotation_launched'])) {
+      $timeframe = (int)$req['annotation_timeframe'];
+      $timestamp_a0 = strtotime($req['annotation_launched']);
+      $timestamp_b0 = $timestamp_a0 - (60 * 60 * 168);
+      if ($timeframe > 168) {
+        $timestamp_b0 = $timestamp_a0 - (60 * 60 * $timeframe);
+      }
+      $timestamp_b0 = $timestamp_a0 - (60 * 60 * 168);
+      if ($timeframe > 168) {
+        $timestamp_b0 = $timestamp_a0 - (60 * 60 * $timeframe);
+      }
+      $timestamp_a1 = $timestamp_a0 + (60 * 60 * $timeframe);
+      $timestamp_b1 = $timestamp_b0 + (60 * 60 * $timeframe);
+      if ($req['annotation_variant'] == 'b') {
+        $dates = _intel_get_report_dates(date('YmdHi', $timestamp_b0), date('YmdHi', $timestamp_b1), 1);
+      }
+      else {
+        $dates = _intel_get_report_dates(date('YmdHi', $timestamp_a0), date('YmdHi', $timestamp_a1), 1);
+      }
+      $dates['ga_start_date_hour_minute'] = date('YmdHi', $dates['ga_start_date']);
+      $dates['ga_start_date_readable'] = date('D m/d/Y H:i', $dates['ga_start_date']);
+      $dates['ga_end_date_hour_minute'] = date('YmdHi', $dates['ga_end_date']);
+      $dates['ga_end_date_readable'] = date('D m/d/Y H:i', $dates['ga_end_date']);
+      $tzi = $dates['timezone_info'];
+      //intel_d("Annotation datetime: {$dates['ga_start_date_readable']} ({$tzi['ga_timezone_abv']}) - {$dates['ga_end_date_readable']} ({$tzi['ga_timezone_abv']})");
+      if (!isset($req['filters'])) {
+        $req['filters'] = '';
+      }
+      $req['filters'] .= (!empty($req['filters']) ? ';' : '') . LevelTen\Intel\GAModel::formatGtRegexFilter('ga:dateHourMinute', date('ymdHi', $dates['ga_start_date']), '', array('fixed_width' => 1, 'prefix' => '20'));
+      $req['filters'] .= (!empty($req['filters']) ? ';' : '') . LevelTen\Intel\GAModel::formatLtRegexFilter('ga:dateHourMinute', date('ymdHi', $dates['ga_end_date']), '', array('fixed_width' => 1, 'prefix' => '20'));
+    }
 …
+}
+function intel_ga_explorer_report_validate($form, &$form_state) {
+  $values = &$form_state['values'];
+  $ts = strtotime($values['annotation_launched']);
+  if (!is_numeric($ts)) {
+    $msg = Intel_Df::t('Annotation launced is invalid. Please provide a time in a valid format.');
+    form_set_error('annotation_launched', $msg);
+  }
+}
 function intel_ga_explorer_report_submit($form, &$form_state) {
   $values = $form_state['values'];
 …
     'end_date' => '',
     'max_results' => '',
+    'annotation_launched' => '',
+    'annotation_timeframe' => '',
+    'annotation_variant' => '',
   );
   $d = $values['dimensions'];
 …
   $request['custom']['end_date'] = strtotime(str_replace("'", '', $values['end_date']));
   $request['custom']['max_results'] = str_replace("'", '', $values['max_results']);
+  $request['custom']['annotation_launched'] = str_replace("'", '', $values['annotation_launched']);
+  $request['custom']['annotation_timeframe'] = str_replace("'", '', $values['annotation_timeframe']);
+  $request['custom']['annotation_variant'] = str_replace("'", '', $values['annotation_variant']);
   $request['realtime_mode'] = str_replace("'", '', $values['realtime_mode']);
 …
 function intel_ga_explorer_presets() {
+  intel_include_library_file('ga/class.ga_model.php');
   $presets = array();
 …
   $presets['entrances'] = array(
     'title' => Intel_Df::t('Entrances (no dimensions)'),
     'metrics' => array('ga:entrances', 'ga:pageviewsPerSession', 'ga:timeOnPage', 'ga:bounces', 'ga:goalValueAll', 'ga:goalCompletionsAll'),
+    'metrics' => array('ga:entrances', 'ga:pageviews', 'ga:uniquePageviews', 'ga:timeOnPage', 'ga:bounces', 'ga:goalValueAll', 'ga:goalCompletionsAll'),
   );

intelligence/trunk/reports/intel.report_scorecard.php

-                      r1827302
+                      r2947915
   $ga_data->setRequestSetting('details', 1);
   $ga_data->setRequestDefaultParam('max_results', 10 *  ($number_of_days+1));
+  $ga_data->setDebug(1);
   $ga_data->loadFeedData('pageviews_events_valued', 'date', 1);
+  $ga_data->setDebug(0);
   //d($ga_data->data);
 …
+  }
   $d = $ga_data->data;
-  //intel_d($d['date']);
   if (!empty($path)) {

intelligence/trunk/templates/intel-bootstrap-card.tpl.php

-                      r1653685
+                      r2947915
   <?php endif; ?>
   <?php if ($body): ?>
+    <div<?php print !empty($body_attributes) ? $body_attributes : ' class="card-block"'; ?>>
+      <?php print $body; ?>
+    </div>
+    <?php print $body; ?>
   <?php endif; ?>
   <?php if ($footer): ?>

intelligence/trunk/vendor/levelten/intel/class.apiclient.php

-                      r2018028
+                      r2947915
+    }
     if (!empty($_GET['debug'])) {
       Debug::printVar($url);
       Debug::printVar($params);
       Debug::printVar($data);
+      //Debug::printVar($url);
+      //Debug::printVar($params);
+      //Debug::printVar($data);
+    }
     if ($this->apiUrlCallMethod == 'none') {
 …
+      }
       $ret = json_decode($response, true);
+      if (!empty($_GET['debug'])) {
+        //Debug::printVar($ret);
+      }
       if (empty($ret['status'])) {
         $msg = !empty($ret['message']) ? $ret['message'] : $response;

intelligence/trunk/vendor/levelten/intel/class.visitor.php

r2287888	r2947915
188	188	if (isset($_SESSION) && isset($_SESSION['l10i_cookie']) && is_array($_SESSION['l10i_cookie'])) {
189	189	self::$cookieStrings += $_SESSION['l10i_cookie'];
	190	unset($_SESSION['l10i_cookie']);
190	191	}
191	192	}

intelligence/trunk/vendor/levelten/intel/ga/class.ga_model.php

-                      r1713257
+                      r2947915
           $gafilters['visitor'][] = "ga:{$a[0]}==" . $a[1];
+        }
+      }
+    }
 …
       //$ga_segments['visitor-attr'] = "dynamic::ga:dimension3=" . $query;
+    }
+    if (!empty($filters['datetime'])) {
+      $gafilters['datetime'] = array();
+      foreach ($filters['datetime'] AS $i => $filter) {
+        $a = explode(":", $filter);
+        if ($a[0] == 'dateHourMinute') {
+          $f = '';
+          $ts = explode('-', $a[1]);
+          $f .= $this->formatGtRegexFilter('ga:dateHourMinute', substr($ts[0], 2), '', array('fixed_width' => 1, 'prefix' => '20'));
+          $f .= ';';
+          $f .= $this->formatLtRegexFilter('ga:dateHourMinute', substr($ts[1], 2), '', array('fixed_width' => 1, 'prefix' => '20'));
+          $gafilters['datetime'][] = $f;
+        }
+      }
+    }
     $this->gaFilters = array(
       'filters' => $gafilters,
 …
     $segment_scope = ($indexBy == 'visitor') ? 'users' : 'sessions';
+//intel_d($type);
+//intel_d($types);
+//intel_d($gaFilters);
     foreach ($gaFilters AS $filter_type => $gafarr) {
       foreach ($gafarr AS $i => $filt) {
+        if ($types[0] == 'entrances') {
+          // traffic sources cannot be used in segments, make exception
+          if ($filter_type == 'trafficsource') {
+            $filters[] = $filt;
+          }
+          elseif ($filter_type == 'page') {
+            // change default of pagePath to landingPagePath
+            $filters[] = str_replace('pagePath', 'landingPagePath', $filt);
+          }
+          else {
+            if ($indexBy == 'trafficsources_intersite') {
+              $notfilt = str_replace('=@', '!@', $filt);
+              $notfilt = str_replace('==', '!=', $notfilt);
+              $notfilt = str_replace('=~', '!~', $notfilt);
+              $segments[] = 'sessions::sequence::^' . $notfilt . ';->>' . $filt;
+        if ($filter_type == 'datetime') {
+          $filters[] = $filt;
+        }
+        else {
+          if ($types[0] == 'entrances') {
+            // traffic sources cannot be used in segments, make exception
+            if ($filter_type == 'trafficsource') {
+              $filters[] = $filt;
+            }
+            elseif ($filter_type == 'page') {
+              // change default of pagePath to landingPagePath
+              $filters[] = str_replace('pagePath', 'landingPagePath', $filt);
+            }
             else {
+              // if filter is page_group, don't apply as segment
+              if ($filter_type == 'page-attr' && ($filt == $this->gaSubsite)) {
+              if ($indexBy == 'trafficsources_intersite') {
+                $notfilt = str_replace('=@', '!@', $filt);
+                $notfilt = str_replace('==', '!=', $notfilt);
+                $notfilt = str_replace('=~', '!~', $notfilt);
+                $segments[] = 'sessions::sequence::^' . $notfilt . ';->>' . $filt;
+              }
+              else {
+                // if filter is page_group, don't apply as segment
+                if ($filter_type == 'page-attr' && ($filt == $this->gaSubsite)) {
+                  $filters[] = $filt;
+                }
+                else {
+                  if ($filter_type == 'event') {
+                    $segments[] = $segment_scope . '::sequence::' . $filt;
+                  }
+                  else {
+                    $segments[] = 'sessions::sequence::^' . $filt;
+                  }
+                }
+                /*
+                if ($context_mode == 'subsite') {
+                  $filters[] = $filt;
+                }
+                */
+              }
+            }
+          }
+          elseif ($types[0] == 'sessions') {
+            if ($filter_type == 'page-attr' && ($filt == $this->gaSubsite)) {
+              if ($type != 'sessions') {
                 $filters[] = $filt;
+              }
+            }
+            else {
+              if ($type == 'sessions') {
+                $segments[] = 'sessions::sequence::' . $filt;
+              }
+              elseif($types[1] == 'events') {
+                if (isset($types[2]) && $types[2] == 'valued') {
+                  $segments[] = 'sessions::sequence::' . $filt . ';->>ga:eventCategory=~\!$';
+                }
+              }
+              elseif($types[1] == 'goals') {
+                $segments[] = 'sessions::sequence::' . $filt . ';->>ga:eventCategory=~\+$';
+              }
+            }
+          }
+          // pageview request type
+          else {
+            if ($filter_type == 'event') {
+              if ($indexBy == 'trafficsource' || $indexBy == 'visitor' || $indexBy == 'visit') {
+                $segments[] = $segment_scope . '::condition::' . $filt;
+              }
               else {
-                if ($filter_type == 'event') {
-                  $segments[] = $segment_scope . '::sequence::' . $filt;
+                }
-                else {
-                  $segments[] = 'sessions::sequence::^' . $filt;
+                }
+              }
-              /*
-              if ($context_mode == 'subsite') {
                 $filters[] = $filt;
+              }
-              */
+            }
+          }
+        }
-        elseif ($types[0] == 'sessions') {
-          if ($filter_type == 'page-attr' && ($filt == $this->gaSubsite)) {
-            if ($type != 'sessions') {
-              $filters[] = $filt;
+            }
+          }
-          else {
-            if ($type == 'sessions') {
-              $segments[] = 'sessions::sequence::' . $filt;
+            }
-            elseif($types[1] == 'events') {
-              if (isset($types[2]) && $types[2] == 'valued') {
-                $segments[] = 'sessions::sequence::' . $filt . ';->>ga:eventCategory=~\!$';
+              }
+            }
-            elseif($types[1] == 'goals') {
-              $segments[] = 'sessions::sequence::' . $filt . ';->>ga:eventCategory=~\+$';
+            }
+          }
+        }
-        // pageview request type
-        else {
-          if ($filter_type == 'event') {
-            if ($indexBy == 'trafficsource' || $indexBy == 'visitor' || $indexBy == 'visit') {
-              $segments[] = $segment_scope . '::condition::' . $filt;
+            }
             else {
               $filters[] = $filt;
+            }
+          }
-          else {
-            $filters[] = $filt;
+          }
+        }
 …
    * @param $number
    * @param string $key
+   * @param array options
    * @return string
    */
   static function formatGtRegexFilter($param, $number, $key = '') {
+  static function formatGtRegexFilter($param, $number, $key = '', $options = array()) {
     $k = ($key) ? "&$key=" : "^";
     $end = ($key) ? '&' : "$";
     $nstr = (string)$number;
     $num_arr = str_split($nstr);
     $digits = count($num_arr);
+    $regex = $param . '=~' . $k . '\d{' . ($digits+1) . '\,}' . $end;
+    $prefix = '';
+    $prefix_digits = 0;
+    if (!empty($options['prefix'])) {
+      $prefix = $options['prefix'];
+      $nstr = (string)$prefix;
+      $prefix_num_arr = str_split($nstr);
+      $prefix_digits = count($prefix_num_arr);
+    }
+    $regex = '';
+    if (empty($options['fixed_width'])) {
+      $regex .= $param . '=~' . $k . '\d{' . ($prefix_digits + $digits + 1) . '\,}' . $end;
+    }
     $p = '';
     foreach ($num_arr AS $i => $digit) {
       $digit = (int)$digit;
       if ($digit < 9) {
         $regex .= ',' . $param .  '=~' . $k . $p;
+        $regex .= ($regex ? ',' : '') . $param .  '=~'  . $k . $prefix . $p;
         if ((1 + $digit) == 9) {
           $regex .= '9';
 …
    * @return string
    */
   static function formatGtEqRegexFilter($param, $number, $key = '') {
+  static function formatGtEqRegexFilter($param, $number, $key = '', $options = array()) {
     $regex = '';
     $k = ($key) ? "&$key=" : "^";
 …
+    }
+    $regex .= $param . '=~' . $k . '\d{' . ($digits + 1) . '\,}' . $end;
+    $prefix = '';
+    $prefix_digits = 0;
+    if (!empty($options['prefix'])) {
+      $prefix = $options['prefix'];
+      $nstr = (string)$prefix;
+      $prefix_num_arr = str_split($nstr);
+      $prefix_digits = count($prefix_num_arr);
+    }
+    $regex = '';
+    if (empty($options['fixed_width'])) {
+      $regex .= $param . '=~' . $k . '\d{' . ($prefix_digits + $digits + 1) . '\,}' . $end;
+    }
     $p = '';
     $rs = $nstr;
 …
       if ($r > 0) {
         if ($digit < 9) {
           $regex .= ',' . $param . '=~' . $k . $p;
+          $regex .= ',' . $param . '=~' . $k . $prefix . $p;
           if ((1 + $digit) == 9) {
             $regex .= '9';
 …
       else {
         if ($digit > 0) {
           $regex .= ',' . $param . '=~' . $k . $p;
+          $regex .= ',' . $param . '=~' . $k . $prefix . $p;
           if ($digit == 9) {
             $regex .= '9';
 …
+  }
   static function formatLtRegexFilter($param, $number, $key = '') {
+  static function formatLtRegexFilter($param, $number, $key = '', $options = array()) {
     $end = ($key) ? '&' : "$";
     $nstr = (string)$number;
+    if (isset($options['prefix'])) {
+      $nstr = (string)$options['prefix'] . $nstr;
+    }
     $num_arr = str_split($nstr);
     $digits = count($num_arr);
 …
+    }
     if (($digits) > 1) {
       $regex .= (($regex) ? ',' : '') . $param . '=~^\d{0\,' . ($digits-1) . '}' . $end;
+      $regex .= (($regex) ? ',' : '') . $param . '=~^\d{0\,' . ($digits - 1) . '}' . $end;
+    }
 …
    * @return string
    */
   static function formatLtEqRegexFilter($param, $number, $key = '') {
+  static function formatLtEqRegexFilter($param, $number, $key = '', $options = array()) {
     $end = ($key) ? '&' : "$";
     $nstr = (string)$number;

intelligence/trunk/vendor/levelten/intel/js/l10intel_admin.js

r1756687	r2947915
26	26
27	27	this.bindEventCallback = function bindEventCallback(evtDef, $target) {
	28	//console.log('admin:bindEventCallback()', evtDef, $target);
28	29	var evt = {};
29	30	var options = {

intelligence/trunk/vendor/levelten/intel/js/l10intel_formtracker.js

-                      r1814908
+                      r2947915
     var ths = {};
+    this.formDefs = {};
+    this.formDefs = [];
+    this.formDefsIndex = {};
     this.init = function init() {
         var ths = this;
         $('form').not('.formtracker-0').on('submit', ths.eventHandler);
+        //$('form').not('.formtracker-0').on('submit', ths.eventHandler);
         //$('a').on('mouseover', {eventType: 'click'}, ths.eventHandler); // for testing event sends
     };
     ths.trackForm = function trackForm(def) {
+    this.trackForm = function trackForm(def) {
         if (ioq.isArray(def)) {
             for (var i = 0; i < def.length; i++) {
                 ths.trackFormInit(def[i]);
+            }
+        }
         else {
             ths.trackFormInit(def);
+        }
     };
     ths.trackFormInit = function trackFormInit(def) {
+                this.trackFormInit(def[i]);
+            }
+        }
+        else {
+            this.trackFormInit(def);
+        }
+    };
+    this.trackFormInit = function trackFormInit(def) {
         //console.log('trackFormInit()');
         //console.log(def);
+        var ths = _ioq.plugins.formtracker;
         var $obj, $this, $onObj, enable = 1, $dataField, def2;
+        var key = def.key || def.formId;
         if (ioq.isNull(def)) {
             def = {};
+        }
         if (!ioq.isNull(def.landingpage)) {
             def.landingpage = ths.trackLandingpage(def.landingpage);
+        if (!ioq.isNull(def.landingpage) && !ioq.isNull(ioq.plugins.convtracker)) {
+            def.landingpage = ioq.plugins.convtracker.trackLandingpage(def.landingpage);
+        }
 …
             io('event', evtDef);
+        }
+        if ($onObj.length && def.trackSubmission) {
+            //delete def.trackView;
+            evtDef = ioq.objectMerge({}, def);
+            evtDef.eventCategory = 'Form submission';
+            evtDef.onEvent = 'submission';
+            evtDef.eid = 'formSubmission';
+            evtDef.nonInteraction = 1;
+            io('event', evtDef);
+        }
         /* Disabling logic until full conversion tracking can be implemented
 …
+        }
+        if (key) {
+            if (!ths.formDefsIndex[key]) {
+                ths.formDefsIndex[key] = ths.formDefs.length;
+                ths.formDefs.push(def);
+            }
+        }
         return def;
     };
     ths.processFormSpecialFields = function (def, $obj, event) {
+    this.processFormSpecialFields = function (def, $obj, event) {
         var pf = 'io';
         if ($obj.is('form')) {
 …
     this.init();
-    return ths;
+}

intelligence/trunk/vendor/levelten/intel/js/l10intel_linktracker.js

-                      r1904936
+                      r2947915
     this.linkTypeDefs.download = {
         title: 'Download link',
+        track: 1
+        track: 1,
+        trackFileExtension: 'zip|exe|dmg|pdfx|doc.*|xls.*|ppt.*|mp3|txt|rar|wma|mov|avi|wmv|flv|wav|png|jpg|jpeg|gif',
     };
     this.linkTypeDefs.mailto = {
 …
     this.addHrefType = function addHrefType(name, obj) {
       this.hrefTypeDefs[name] = obj;
+        this.hrefTypeDefs[name] = obj;
     };
 …
         f.hrefType = '';
         if (!f.hrefType) {
+            var downloadPattern = /\.(zip|exe|dmg|pdf|doc.*|xls.*|ppt.*|mp3|txt|rar|wma|mov|avi|wmv|flv|wav|png|jpg|jpeg|gif)$/i;
+            //var downloadPattern = /\.(zip|exe|dmg|pdf|doc.*|xls.*|ppt.*|mp3|txt|rar|wma|mov|avi|wmv|flv|wav|png|jpg|jpeg|gif)$/i;
+            var downloadPattern = new RegExp('\\.(' + f.linkTypeDefs['download']['trackFileExtension'] + ')$', 'i');
             f.hrefObj = _ioq.parseUrl(f.href);
 …
         linkDef = f.linkTypeDefs[f.linkType] || {};
         if (linkDef.track || f.$obj.objSettings['link-track'] || f.$obj.objSettings['link-' + f.eventType + '-track']) {
-            console.log();
             f.evtDef.eventCategory = linkDef.title;
             if (f.eventType) {

intelligence/trunk/vendor/levelten/intel/libs/class.debug.php

-                      r1653685
+                      r2947915
    */
   static public function printVar($var, $mode = 0) {
+    if (function_exists('intel_print_var')) {
+      intel_print_var($var, $mode);
+    }
+    else {
+      if ($mode == 1) {
+        return print_r($var, 1);
+    if (function_exists('intel_is_debug') && intel_is_debug()) {
+      if (function_exists('intel_print_var')) {
+        intel_print_var($var, $mode);
+      }
       else {
+        print_r($var);
+        if ($mode == 1) {
+          return print_r($var, 1);
+        }
+        else {
+          print_r($var);
+        }
+      }
+    }

Plugin Directory

Context Navigation

Legend:

intelligence/trunk/admin/class-intel-admin.php

intelligence/trunk/admin/intel.admin_config.php

intelligence/trunk/admin/intel.admin_setup.php

intelligence/trunk/admin/intel.admin_util.php

intelligence/trunk/admin/intel.admin_visitor.php

intelligence/trunk/includes/class-intel-activator.php

intelligence/trunk/includes/class-intel-df.php

intelligence/trunk/includes/class-intel-form.php

intelligence/trunk/includes/class-intel-tracker.php

intelligence/trunk/includes/class-intel-visitor-page.php

intelligence/trunk/includes/class-intel.php

intelligence/trunk/includes/intel.demo.php

intelligence/trunk/includes/intel.ga.php

intelligence/trunk/includes/intel.imapi.php

intelligence/trunk/includes/intel.page_alter.php

intelligence/trunk/includes/intel.reports.php

intelligence/trunk/includes/intel.visitor_sync.php

intelligence/trunk/intel.install.php

intelligence/trunk/intel.module.php

intelligence/trunk/intel.pages.php

intelligence/trunk/intel.php

intelligence/trunk/public/class-intel-public.php

intelligence/trunk/readme.txt

intelligence/trunk/reports/intel.ga_explorer_report.php

intelligence/trunk/reports/intel.report_scorecard.php

intelligence/trunk/templates/intel-bootstrap-card.tpl.php

intelligence/trunk/vendor/levelten/intel/class.apiclient.php

intelligence/trunk/vendor/levelten/intel/class.visitor.php

intelligence/trunk/vendor/levelten/intel/ga/class.ga_model.php

intelligence/trunk/vendor/levelten/intel/js/l10intel_admin.js

intelligence/trunk/vendor/levelten/intel/js/l10intel_formtracker.js

intelligence/trunk/vendor/levelten/intel/js/l10intel_linktracker.js

intelligence/trunk/vendor/levelten/intel/libs/class.debug.php

Download in other formats: