Merge pull request dingproject#9 from ding2tal/core-pr-4

Core pr 4

Author: kasperg

alma.features.field_instance.inc

@@ -107,7 +107,7 @@ function alma_field_default_field_instances() {
     'bundle' => 'provider_alma',
     'default_value' => array(
       0 => array(
-        'value' => 30,
+        'value' => 180,
       ),
     ),
     'deleted' => 0,

alma.info

@@ -3,11 +3,11 @@ description = Implementation of Axiell’s Alma API for DDELibra.
 core = 7.x
 package = Providers
 php = 5.2.4
-version = 7.x-1.0-beta2
 project = alma
 dependencies[] = date
 dependencies[] = ding_provider
 dependencies[] = ding_reservation
+dependencies[] = ding_user
 dependencies[] = email
 dependencies[] = entity
 dependencies[] = features

alma.install

@@ -1,5 +1,46 @@
 <?php
 
+/**
+ * Implements hook_requirements().
+ */
+function alma_requirements($phase) {
+  $requirements = array();
+  // Ensure translations don't break at install time.
+  $t = get_t();
+
+  if (!function_exists('simplexml_load_string')) {
+    $requirements['simplexml'] = array(
+      'title' => 'SimpleXML',
+      'description' => $t('The Alma module requires SimpleXML to function. Please install and/or enable SimpleXML in your PHP configuration.'),
+      'severity' => REQUIREMENT_ERROR,
+    );
+  }
+
+  if ($phase == 'runtime') {
+    $requirements['alma'] = array(
+      'title' => $t('Alma'),
+      'value' => $t('Alma configured'),
+      'severity' => REQUIREMENT_OK,
+    );
+    if (!variable_get('alma_base_url', FALSE) || !variable_get('ting_agency', FALSE)) {
+      $requirements['alma']['value'] = $t('Alma not configured');
+      $requirements['alma']['description'] = $t('Alma is not properly configured, please visit <a href="@link">the settings page</a>.', array('@link' => url('admin/config/ding/provider/alma')));
+      $requirements['alma']['severity'] = REQUIREMENT_ERROR;
+    }
+    $requirements['alma_wayf'] = array(
+      'title' => $t('Alma WAYF'),
+      'value' => $t('Alma WAYF configured'),
+      'severity' => REQUIREMENT_OK,
+    );
+    if (!variable_get('wayf_hash', FALSE)) {
+      $requirements['alma']['value'] = $t('Alma WAYF not configured');
+      $requirements['alma']['description'] = $t('Alma WAYF is not properly configured, you need to set $conf[\'wayf_hash\'] in setttings.php.');
+      $requirements['alma']['severity'] = REQUIREMENT_ERROR;
+    }
+  }
+
+  return $requirements;
+}
 
 /**
  * Update system table set alma weight=10 to ensure form_alter hooks are called
@@ -32,7 +73,7 @@ function alma_update_7002() {
 function alma_update_7003() {
   return db_update('field_config')
     ->fields(array(
-      'type' => 'datetime'
+      'type' => 'datetime',
     ))
     ->condition('field_name', 'field_alma_reservation_pause', '=')
     ->execute();