Merge branch 'develop'

Author: andersbryrup

os2web_cp_service.module

@@ -50,6 +50,13 @@ function os2web_cp_service_handler() {
   if (!os2web_esdh_provider_has_api('cp')) {
     drupal_access_denied();
   }
+
+  $ip_string = variable_get('os2web_cp_service_cp_access_ip', '');
+  $valid_ips = array_map('trim', explode(',', $ip_string));
+  if (!in_array(ip_address(), $valid_ips)) {
+    drupal_access_denied();
+  }
+
   $data = os2web_esdh_provider_invoke('cp', 'handle_request');
   return $data;
 }
@@ -217,7 +224,7 @@ function os2web_cp_service_create_case(array $data) {
 
       switch ($field_info['type']) {
         case 'text':
-          if ($field['label'] === 'Sagstitel') {
+          if ($field['label'] === 'Sagstitel' && $data['fields']['Sagstype - Sagstype'] === 'EJSAG') {
             $node->{$field_name}[LANGUAGE_NONE][0]['value'] = (string) preg_replace('/\s\(\d{4}\)/', '', $data['fields']['Sagstitel']);
           }
           else {
@@ -785,7 +792,7 @@ function os2web_cp_service_preprocess_views_exposed_form(&$variables) {
  */
 function os2web_cp_service_theme_registry_alter(&$theme_registry) {
   // Add the tpl for exposed form to the theme registry
-  // Somehow this gets overridden by cmstheme.
+  // Somehow this gets overridden by os2web_core_theme.
   if (!empty($theme_registry['views_exposed_form__os2web_cp_service_cp_case_search']['path'])) {
     $theme_registry['views_exposed_form__os2web_cp_service_cp_case_search']['path'] = drupal_get_path('module', 'os2web_cp_service') . '/theme/';
   }
@@ -815,6 +822,12 @@ function os2web_cp_service_form_os2web_settings_settings_form_alter(&$form, &$fo
     '#title' => t('CP File endpoint password'),
     '#description' => t('CP File endpoint HTTP authentification password.'),
   );
+  $form['os2web_cp_service_config_group']['os2web_cp_service_cp_access_ip'] = array(
+    '#type' => 'textfield',
+    '#title' => 'IP addresser der kan tilgå publiserings webservicen',
+    '#description' => 'Komma separeret liste af ip-addresser der kan tilgå <em>webservicen</em>.',
+    '#default_value' => variable_get('os2web_cp_service_cp_access_ip', ip_address()),
+  );
 }
 
 /**

os2web_cp_service.views_default.inc

@@ -256,8 +256,8 @@ function os2web_cp_service_views_default_views() {
   $handler->display->display_options['filters']['php']['group'] = 1;
   $handler->display->display_options['filters']['php']['use_php_setup'] = 0;
   $handler->display->display_options['filters']['php']['php_filter'] = 'if (count($view->exposed_input)) {
-return FALSE; 
-} else { 
+return FALSE;
+} else {
 return TRUE; // If no exposed inputs, remove all results
 }';
   /* Filterkriterie: Global: Combine fields filter */
@@ -363,7 +363,7 @@ return TRUE; // If no exposed inputs, remove all results
   $handler->display->display_options['empty']['area_text_custom']['table'] = 'views';
   $handler->display->display_options['empty']['area_text_custom']['field'] = 'area_text_custom';
   $handler->display->display_options['empty']['area_text_custom']['empty'] = TRUE;
-  $handler->display->display_options['empty']['area_text_custom']['content'] = 'Der kunne ikke findes nogle sager ud fra dine søgekriterier. ';
+  $handler->display->display_options['empty']['area_text_custom']['content'] = 'Der kunne ikke findes nogle sager ud fra dine søgekriterier.';
   $handler->display->display_options['empty']['area_text_custom']['tokenize'] = TRUE;
   $handler->display->display_options['path'] = 'aaben-indsigt';
 
@@ -399,7 +399,7 @@ return TRUE; // If no exposed inputs, remove all results
     t('Sagsnummer'),
     t('fx. 12/99999999'),
     t('Page'),
-    t('Der kunne ikke findes nogle sager ud fra dine søgekriterier. '),
+    t('Der kunne ikke findes nogle sager ud fra dine søgekriterier.'),
     t('Content pane'),
     t('View panes'),
   );
@@ -719,8 +719,8 @@ return TRUE; // If no exposed inputs, remove all results
   $handler->display->display_options['fields']['php']['alter']['path'] = 'aaben-indsigt?search-text=[field_os2web_cp_service_address]&field_os2web_cp_service_date_from[value][date]=01-01-2007';
   $handler->display->display_options['fields']['php']['element_label_colon'] = FALSE;
   $handler->display->display_options['fields']['php']['use_php_setup'] = 0;
-  $handler->display->display_options['fields']['php']['php_output'] = '<?php 
-$node = node_load($data->nid); 
+  $handler->display->display_options['fields']['php']['php_output'] = '<?php
+$node = node_load($data->nid);
 if($node->field_os2web_cp_service_casetype[und][0][\'value\'] === \'EJSAG\') : ?>
 Se alle sager på denne addresse
 <?php endif; ?>';