Create farm_api_oauth module

drupal-org.make

@@ -68,8 +68,6 @@ projects[geocoder][version] = "1.4"
 
 projects[geofield][subdir] = "contrib"
 projects[geofield][version] = "2.4"
-; Patch to fix deleting map features.
-projects[geofield][patch][] = "http://www.drupal.org/files/issues/geofield-delete_feature_fix-1350320-20.patch"
 
 projects[geophp][subdir] = "contrib"
 projects[geophp][version] = "1.x-dev"
@@ -100,31 +98,6 @@ projects[multiupload_imagefield_widget][version] = "1.3"
 projects[navbar][subdir] = "contrib"
 projects[navbar][version] = "1.7"
 
-projects[openlayers][subdir] = "contrib"
-projects[openlayers][download][type] = "git"
-projects[openlayers][download][url] = "https://git.drupal.org/project/openlayers.git"
-projects[openlayers][download][branch] = "7.x-3.x"
-projects[openlayers][download][revision] = "569e90ca74ea1862c9ecfbc16836242e205de778"
-; Move Elements dependency to Openlayers Examples.
-projects[openlayers][patch][] = "http://www.drupal.org/files/issues/openlayers_examples_elements_dependency-2620098-2.patch"
-; Switch to ROADMAP when zoomed further than Google's max zoom level.
-projects[openlayers][patch][] = "http://www.drupal.org/files/issues/openlayers_gmap_zoom_switch_type-2680273-1.patch"
-; Add a jQuery trigger event when popups are displayed.
-projects[openlayers][patch][] = "http://www.drupal.org/files/issues/openlayers_popup_trigger-2687781-1.patch"
-; Issue #2644580: Maps with Google layers break when loaded in invisible element
-projects[openlayers][patch][] = "http://www.drupal.org/files/issues/openlayers_googlemaps_refresh-2644580-19.patch"
-; Issue #2911611: Update ZoomToSource Component: use new view.animate() method.
-projects[openlayers][patch][] = "http://www.drupal.org/files/issues/openlayers_ol4_zoomtosource-2911611-4.patch"
-; Issue #2946213: Google maps do not support fractional zoom
-projects[openlayers][patch][] = "http://www.drupal.org/files/issues/openlayers_googlemaps_fractional_zoom-2946213-2.patch"
-; Issue #3006751: PHP 7 support
-projects[openlayers][patch][] = "http://www.drupal.org/files/issues/2018-10-30/openlayers-2952602-6-php-72.patch"
-; Remove base layer assignment code.
-projects[openlayers][patch][] = "http://www.drupal.org/files/issues/2018-11-01/openlayers_base_layer_mechanism-2543130-12.patch"
-
-projects[openlayers_geolocate_button][subdir] = "contrib"
-projects[openlayers_geolocate_button][version] = "3.2"
-
 projects[pathauto][subdir] = "contrib"
 projects[pathauto][version] = "1.3"
 ; Fix SQLite3 issue.
@@ -133,9 +106,6 @@ projects[pathauto][patch][] = "http://www.drupal.org/files/issues/2582655-path-p
 projects[pathauto_entity][subdir] = "contrib"
 projects[pathauto_entity][version] = "1.0"
 
-projects[registry_autoload][subdir] = "contrib"
-projects[registry_autoload][version] = "1.3"
-
 projects[restws][subdir] = "contrib"
 projects[restws][version] = "2.8"
 ; Add ability to filter by entity bundle.
@@ -153,9 +123,6 @@ projects[restws_file][version] = "1.3"
 ; Fix Issue #3019850: Notice: Trying to get property of non-object in restws_file_restws_request_alter() (line 30 of restws_file.module).
 projects[restws_file][patch][] = "http://www.drupal.org/files/issues/2019-10-26/restws_file-bundlenotice-3019850-3.patch"
 
-projects[service_container][subdir] = "contrib"
-projects[service_container][version] = "1.0-beta5"
-
 projects[strongarm][subdir] = "contrib"
 projects[strongarm][version] = "2.0"
 
@@ -179,6 +146,15 @@ projects[views_geojson][version] = "1.0-beta3"
 projects[views_tree][subdir] = "contrib"
 projects[views_tree][version] = "2.0"
 
+projects[xautoload][subdir] = "contrib"
+projects[xautoload][version] = "5.7"
+
+projects[oauth2_server][subdir] = "contrib"
+projects[oauth2_server][version] = "1.7"
+
+projects[restws_oauth2_server][subdir] = "contrib"
+projects[restws_oauth2_server][version] = "1.x-dev"
+
 ; -----------------------------------------------------------------------------
 ; Modules (Development)
 ; -----------------------------------------------------------------------------
@@ -205,11 +181,14 @@ libraries[backbone][download][url] = "http://github.com/jashkenas/backbone/archi
 libraries[easy-responsive-tabs][download][type] = "get"
 libraries[easy-responsive-tabs][download][url] = "https://github.com/samsono/Easy-Responsive-Tabs-to-Accordion/archive/1.2.2.zip"
 
+libraries[farmOS-map][download][type] = "get"
+libraries[farmOS-map][download][url] = "http://github.com/farmOS/farmOS-map/releases/download/v0.9.4/v0.9.4-dist.zip"
+
 libraries[modernizr][download][type] = "get"
 libraries[modernizr][download][url] = "http://github.com/Modernizr/Modernizr/archive/v2.8.3.zip"
 
-libraries[openlayers3][download][type] = "get"
-libraries[openlayers3][download][url] = "http://github.com/openlayers/openlayers/releases/download/v4.6.4/v4.6.4.zip"
-
 libraries[underscore][download][type] = "get"
 libraries[underscore][download][url] = "http://github.com/jashkenas/underscore/archive/1.9.1.zip"
+
+libraries[oauth2-server-php][download][type] = "get"
+libraries[oauth2-server-php][download][url] = "http://github.com/bshaffer/oauth2-server-php/archive/v1.11.1.zip"

farm.install

@@ -40,13 +40,15 @@ function farm_modules() {
       'farm_help' => st('farmOS Help Pages'),
       'farm_tour' => st('farmOS Tours'),
       'farm_api' => st('farmOS API'),
+      'farm_api_oauth' => st('farmOS API OAuth2 Server'),
     ),
     'optional' => array(
       'farm_water_test' => st('Water test logs'),
       'farm_soil_compost' => st('Compost'),
       'farm_sensor' => st('Sensor'),
       'farm_sensor_listener' => st('Sensor: Listener'),
       'farm_ledger' => st('Sale and purchase logs (beta)'),
+      'farm_quantity_report' => st('Quantity report generator (beta)'),
     ),
   );
 }
@@ -71,9 +73,6 @@ function farm_install() {
 
   // Use the farm menu for primary links (provided by farm_admin).
   variable_set('menu_main_links_source', 'farm');
-
-  // Set the Openlayers library variant to local.
-  \Drupal\openlayers\Config::set('openlayers.variant', 'local:4.6.4');
 }
 
 /**
@@ -132,10 +131,18 @@ function farm_install_configure_form($form, &$form_state) {
   $form['farm_map_google_api_key'] = array(
     '#type' => 'textfield',
     '#title' => t('Google Maps API Key'),
-    '#description' => t('Google Maps layers require that you obtain an API key. Refer to the <a href="@doc">Google Maps API Key</a> documentation on farmOS.org for instructions.', array('@doc' => 'https://farmos.org/hosting/googlemaps')) . ' ' . t('This can also be done after installation. If no key is provided, OpenStreetMaps will be used as the default map base layer.'),
+    '#description' => t('Google Maps layers require that you obtain an API key. Refer to the <a href="@doc">Google Maps API Key</a> documentation on farmOS.org for instructions.', array('@doc' => 'https://farmos.org/hosting/googlemaps')) . ' ' . t('This can also be done after installation.'),
     '#default_value' => variable_get('farm_map_google_api_key', ''),
   );
 
+  // Allow the user to enter a Mapbox API key.
+  $form['farm_map_mapbox_api_key'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Mapbox API Key'),
+    '#description' => t('Enter your Mapbox API key.') . ' ' . t('This can also be done after installation.'),
+    '#default_value' => variable_get('farm_map_mapbox_api_key', ''),
+  );
+
   // Form actions.
   $form['actions'] = array('#type' => 'actions');
   $form['actions']['submit'] = array(
@@ -162,14 +169,20 @@ function farm_install_configure_form_submit($form, &$form_state) {
     variable_set('farm_quantity_unit_system', $form_state['values']['farm_quantity_unit_system']);
   }
 
-  // Save the Google Maps API key, and make Google Hybrid the default.
-  // If a Google Maps API key was not provided, make OpenStreetMap the default.
+  // If a Google Maps API key was provided, save it and enable the module.
   if (!empty($form_state['values']['farm_map_google_api_key'])) {
     variable_set('farm_map_google_api_key', $form_state['values']['farm_map_google_api_key']);
-    variable_set('farm_map_default_base_layer', 'farm_map_layer_google_hybrid');
+    if (!module_exists('farm_map_google')) {
+      module_enable(array('farm_map_google'));
+    }
   }
-  else {
-    variable_set('farm_map_default_base_layer', 'farm_map_layer_openstreetmap');
+
+  // If a Mapbox API key was provided, save it and enable the module.
+  if (!empty($form_state['values']['farm_map_mapbox_api_key'])) {
+    variable_set('farm_map_mapbox_api_key', $form_state['values']['farm_map_mapbox_api_key']);
+    if (!module_exists('farm_map_mapbox')) {
+      module_enable(array('farm_map_mapbox'));
+    }
   }
 }
 
@@ -272,7 +285,7 @@ function farm_update_7001(&$sandbox) {
 
   // Enable new module dependencies.
   $modules = array(
-    'openlayers_geofield',
+    // 'openlayers_geofield',  // Removed.
     'views_geojson',
   );
   _farm_update_enable_modules($modules);
@@ -308,12 +321,7 @@ function farm_update_7004(&$sandbox) {
  * Load Openlayers via CDN.
  */
 function farm_update_7005(&$sandbox) {
-
-  // Enable the Libraries CDN module.
-  _farm_update_enable_modules(array('libraries_cdn'));
-
-  // Load Openlayers 3.8.2 from JSDelivr CDN.
-  \Drupal\openlayers\Config::set('openlayers.variant', 'jsdelivr:ol3:3.8.2');
+  // Removed.
 }
 
 /**
@@ -455,14 +463,14 @@ function farm_update_7010(&$sandbox) {
  * Load Openlayers 3.10.1 from CDNJS.
  */
 function farm_update_7011(&$sandbox) {
-  \Drupal\openlayers\Config::set('openlayers.variant', 'cdnjs:ol3:3.10.1');
+  // Removed.
 }
 
 /**
  * Load Openlayers 3.11.2 from CDNJS.
  */
 function farm_update_7012(&$sandbox) {
-  \Drupal\openlayers\Config::set('openlayers.variant', 'cdnjs:ol3:3.11.2');
+  // Removed.
 }
 
 /**
@@ -642,7 +650,7 @@ function farm_update_7027(&$sandbox) {
  * Update Openlayers JS library to 4.3.3.
  */
 function farm_update_7028(&$sandbox) {
-  \Drupal\openlayers\Config::set('openlayers.variant', 'cdnjs:ol3:4.3.3');
+  // Removed.
 }
 
 /**
@@ -730,7 +738,7 @@ function farm_update_7037(&$sandbox) {
  * Update Openlayers JS library to 4.6.4.
  */
 function farm_update_7038(&$sandbox) {
-  \Drupal\openlayers\Config::set('openlayers.variant', 'cdnjs:ol3:4.6.4');
+  // Removed.
 }
 
 /**
@@ -781,7 +789,7 @@ function farm_update_7044(&$sandbox) {
 function farm_update_7045(&$sandbox) {
 
   // Set the variant config in the Openlayers module.
-  \Drupal\openlayers\Config::set('openlayers.variant', 'local:4.6.4');
+  // Removed.
 
   // Uninstall Libraries CDN.
   db_query("DELETE FROM {system} WHERE name = 'libraries_cdn' AND type = 'module'");
@@ -819,6 +827,114 @@ function farm_update_7049(&$sandbox) {
   _farm_update_enable_modules(array('farm_fields_autocomplete'));
 }
 
+/**
+ * Install the new Farm Map Geofield module and update Geofield instance settings.
+ */
+function farm_update_7050(&$sandbox) {
+
+  // Enable farm_map_geofield.
+  _farm_update_enable_modules(array('farm_map_geofield'));
+
+  // Update all instances of field_farm_geofield.
+  $instances_info = field_info_instances();
+  foreach ($instances_info as $entity_type => $bundles) {
+    foreach ($bundles as $bundle => $instances) {
+      foreach ($instances as $field_name => $instance) {
+
+        // If the field name is not field_farm_geofield, skip.
+        if ($field_name != 'field_farm_geofield') {
+          continue;
+        }
+
+        // Update widget settings.
+        if (!empty($instance['widget'])) {
+          $instance['widget']['module'] = 'farm_map_geofield';
+          $remove_settings = array('allow_edit', 'data_storage', 'feature_types', 'openlayers_map', 'showInputField');
+          foreach ($remove_settings as $name) {
+            unset($instance['widget']['settings'][$name]);
+          }
+          $instance['widget']['type'] = 'farm_map_geofield';
+        }
+
+        // Update display settings.
+        if (!empty($instance['display']['default'])) {
+          $instance['display']['default']['module'] = 'farm_map_geofield';
+          $instance['display']['default']['settings'] = array();
+          $instance['display']['default']['type'] = 'farm_map_geofield';
+        }
+
+        // Update the instance.
+        field_update_instance($instance);
+      }
+    }
+  }
+}
+
+/**
+ * Uninstall Openlayers modules and dependencies.
+ */
+function farm_update_7051(&$sandbox) {
+  global $conf;
+  foreach (array_keys($conf) as $key) {
+    if (strpos($key, 'openlayers_') === 0) {
+      variable_del($key);
+    }
+  }
+  $modules = array(
+    'openlayers',
+    'openlayers_block',
+    'openlayers_block_switcher',
+    'openlayers_boxes',
+    'openlayers_cesium',
+    'openlayers_content_types',
+    'openlayers_contextual_links',
+    'openlayers_examples',
+    'openlayers_field',
+    'openlayers_geofield',
+    'openlayers_geolocate_button',
+    'openlayers_library',
+    'openlayers_quicktabs',
+    'openlayers_services',
+    'openlayers_ui',
+    'openlayers_views',
+    'registry_autoload',
+    'registry_autoload_test',
+    'service_container',
+    'service_container_annotation_discovery',
+    'service_container_annotation_discovery_subtest',
+    'service_container_annotation_discovery_test',
+    'service_container_block',
+    'service_container_symfony',
+    'service_container_symfony_subtest',
+    'service_container_symfony_test',
+    'service_container_test',
+    'service_container_test_ctools',
+  );
+  foreach ($modules as $module) {
+    db_query("DELETE FROM {system} WHERE name = '$module' AND type = 'module'");
+  }
+  $tables = array(
+    'openlayers_components',
+    'openlayers_controls',
+    'openlayers_interactions',
+    'openlayers_layers',
+    'openlayers_maps',
+    'openlayers_projections',
+    'openlayers_sources',
+    'openlayers_styles',
+  );
+  foreach ($tables as $table) {
+    db_query("DROP TABLE {$table}");
+  }
+}
+
+/**
+ * Enable farm_api_oauth module.
+ */
+function farm_update_7052(&$sandbox) {
+  _farm_update_enable_modules(array('farm_api_oauth'));
+}
+
 /**
  * Update helper function: enable modules.
  */