Merge pull request #1 from syddjurs/hotfix-1.0.3

Hotfix 1.0.1, 1.0.2, 1.0.3

Author: MathiasGajhede

js/os2web_print_send_to_friend.js

@@ -5,13 +5,13 @@
 jQuery(document).ready(function($) {
   $(".throbber").hide();
   $("#send_to_friend_form").submit(function(e){
-    e.preventDefault;
+    e.preventDefault();
     var $form = $("#send_to_friend_form");
     serializedData = $form.serialize();
 
     var email = $("#field_send_to_friend_email").val();
     var id = $("#field_bullet_point_id").val();
-    var base_url = $("#field_base_url").val();
+    var base_url = $(this).find('input[name=base_url]').val();
 
     if (!checkEmail(email)){
      $("#field_send_to_friend_email").focus();
@@ -22,8 +22,8 @@ jQuery(document).ready(function($) {
       $("#field_send_to_friend_email").removeClass("error");
 
       $.post(base_url + "/dagsorden_punkt/"+ id +"/send_to_friend_service", serializedData, function(response){
-	$(".throbber").hide();
-	parent.Lightbox.end();
+        $(".throbber").hide();
+        parent.Lightbox.end();
       });
       return false;
     }

os2web_print_send_to_friend.module

@@ -102,13 +102,10 @@ function os2web_print_send_to_friend_bullet_point_access($bullet_point_id) {
   $bullet_point = node_load($bullet_point_id);
   if (strcmp($bullet_point->type, 'os2web_meetings_bullet') == 0) {
     if ($bullet_point->field_os2web_meetings_bul_closed['und'][0]['value']) {
-      return TRUE;
-    }
-    else {
       return FALSE;
     }
   }
-  return FALSE;
+  return TRUE;
 }
 
 /**
@@ -121,14 +118,26 @@ function os2web_print_send_to_friend_bullet_point_access($bullet_point_id) {
  */
 function os2web_print_send_to_friend_send_to_friend($bullet_point_id) {
   $bullet_point = node_load($bullet_point_id);
+
+  // Find the parent meeting. Use to generate an URL.
+  $query = new EntityFieldQuery();
+  $meetings = $query
+    ->entityCondition('entity_type', 'node')
+    ->fieldCondition('field_os2web_meetings_bullets', 'target_id', $bullet_point_id, '=')
+    ->execute();
+  $meeting = !empty($meetings['node']) ? array_pop($meetings['node']) : NULL;
+
   $subject = 'Dagsorden Punkt: ' . $bullet_point->title;
 
   $body = "Hej \n\n" . $_POST['name'] . " har sendt dig et dagsordenspunkt. \n\n";
+  if ($meeting) {
+    $body .= "URL:\n" . url('node/' . $meeting->nid, array('absolute' => TRUE)) . "\n\n";
+  }
   $body .= "Med beskeden:\n" . trim($_POST['message']) . "\n\n";
 
   $body .= os2web_print_send_to_friend_print_bullet_point($bullet_point_id);
 
-  $from = variable_get('system_mail');
+  $from = variable_get('site_mail');
   $message = array(
     'id' => 'send_to_friend_',
     'to' => $_POST['email'],