From bc1052c4fca9dd8706c0672a9aa10f4fbd386523 Mon Sep 17 00:00:00 2001
From: Carrie <cmarnold@tacc.utexas.edu>
Date: Fri, 13 Sep 2013 14:50:25 -0500
Subject: [PATCH] Added spaces into the ticket summary

---
 modules/fgtickets/fgtickets.module            |   9 +-
 .../templates/fg_ticket_email_body.tpl.php    |   2 +-
 node-fg_projects.tpl.php                      | 160 ------------------
 3 files changed, 7 insertions(+), 164 deletions(-)
 delete mode 100644 node-fg_projects.tpl.php

diff --git a/modules/fgtickets/fgtickets.module b/modules/fgtickets/fgtickets.module
index 487db13..59bc70a 100644
--- a/modules/fgtickets/fgtickets.module
+++ b/modules/fgtickets/fgtickets.module
@@ -660,7 +660,7 @@ function fgtickets_publication_form_submit($form, &$form_state) {
 
 function fgtickets_ticket_form_submit($form, &$form_state) {
 	global $user;
-	
+
 	$theme_args = array('fg_ticket_email_body');
 	
 	if ($user->uid) {
@@ -706,7 +706,8 @@ function fgtickets_ticket_form_submit($form, &$form_state) {
 		}
 	}
 	$theme_args[] = $resources;
-	$theme_args[] = htmlentities($form_state['values']['summary']);
+	$theme_args[] = $form_state['values']['summary'];
+
 	
 	$attach = array();
 	if ($file = file_save_upload('attachment', array(), 'sites/default/files/attachments',FILE_EXISTS_RENAME)) {
@@ -724,8 +725,10 @@ function fgtickets_ticket_form_submit($form, &$form_state) {
 	}
 
 	$body = call_user_func_array('theme', $theme_args);
+
 	
-	$recipient = variable_get('fgtickets_tickets_email', 'help@tickets.futuregrid.org');
+	#	$recipient = variable_get('fgtickets_tickets_email', 'help@tickets.futuregrid.org');
+	$recipient = 'cmarnold@tacc.utexas.edu';
 	
 	$encoded = mimemail(
 		$sender,
diff --git a/modules/fgtickets/templates/fg_ticket_email_body.tpl.php b/modules/fgtickets/templates/fg_ticket_email_body.tpl.php
index 7ca66c4..240545b 100644
--- a/modules/fgtickets/templates/fg_ticket_email_body.tpl.php
+++ b/modules/fgtickets/templates/fg_ticket_email_body.tpl.php
@@ -1,5 +1,5 @@
 <p>
-	<?php print $summary; ?>
+	<?php print preg_replace("/\n/", "<br>", $summary); ?>
 </p>
 
 <p>
diff --git a/node-fg_projects.tpl.php b/node-fg_projects.tpl.php
deleted file mode 100644
index 3f2713f..0000000
--- a/node-fg_projects.tpl.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<div class="node<?php print " $classes"; ?><?php if ($sticky) { print " sticky"; } ?><?php if (!$status) { print " node-unpublished"; } ?>">
-  <?php if ($picture) { print $picture; }?>
-
-  <?php if ($page == 0) { ?>
-    <?php if ($title) { ?>
-      <h2 class="title"><a href="<?php print $node_url?>"><?php print $title?></a></h2>
-    <?php }; ?>
-  <?php }; ?>
-
-  <?php if ($node->project_admin_view && $submitted) { ?>
-    <span class="submitted"><?php print $submitted?></span> 
-  <?php }; ?>
-
-  <?php foreach($node->taxonomy as $term) { ?>
-    <span class="taxonomy"><?php print l($term->name, "projects/" . $term->name); ?></span>
-  <?php }; ?>
-
-  <div class="content">
-  	<?php if (fg_phase_2_fg_projects_join_access($node)) : ?>
-			<div class="project-join">
-				<?php print l(t('Join this project'), "node/$node->nid/join-project"); ?>
-			</div>
-  	<?php endif; ?>
-  	<h3>Project Details</h3>
-  	<dl>
-	<!--
-  		<dt>Project ID</dt>
-  		<dd><?php //print $node->field_projectid[0]['view']; ?>&nbsp;</dd>
-  		
-  		<dt>Title</dt>
-  		<dd><?php //print $node->title; ?>&nbsp;</dd>
-  	-->
-  		<dt>Project Lead</dt>
-  		<dd><?php print theme('user_fullname', $node->field_project_lead[0]['uid']); ?>&nbsp;</dd>
-  		
-  		<dt>Project Manager</dt>
-  		<dd><?php print theme('user_fullname', $node->field_project_manager[0]['uid']); ?>&nbsp;</dd>
-  		
-			<?php if ($node->field_project_members[0]['uid']) : ?>
-				<dt>Project Members</dt>
-				<dd>
-					<?php
-						$members = array();
-						foreach ($node->field_project_members as $member) {
-							$members[] = theme('user_fullname', $member['uid']);
-						}
-						print implode(', ', $members);
-					?>
-					&nbsp;
-				</dd>
-			<?php endif; ?>
-  		
-			<?php if ($node->field_project_expert[0]['uid']) : ?>
-				<dt>Supporting Experts</dt>
-				<dd>
-					<?php
-						$experts = array();
-						foreach ($node->field_project_expert as $expert) {
-							$experts[] = theme('user_fullname', $expert['uid']);
-						}
-					print implode(', ', $experts);
-					?>
-					&nbsp;
-				</dd>
-			<?php endif; ?>
-
-  		<dt>Institution</dt>
-  		<dd>
-  			<?php
-  				$user = user_load($node->field_project_lead[0]['uid']);
-					$org = $user->profile_organization;
-					$inst = $user->profile_institution_name;
-					$org = $org . ", " . $inst;
-					if (strcmp($org, "Please signup, Please sign up") == 0) {
-						$contact = $node->field_project_contact[0]['value'];
-						$firstmark = "Organization: ";
-						$lastmark = "Institution: ";
-						$firstmarkStart = strpos($contact, $firstmark);
-						$lastmarkStart = strpos($contact, $lastmark);
-						if ($firstmarkStart > 0 && $lastmarkStart > 0) {
-							$firstStart = $firstmarkStart + strlen($firstmark);
-							$lastStart = $lastmarkStart + strlen($lastmark);
-							$firstAlt = trim(substr($contact, $firstStart, strpos($contact, $lastmark) - $firstStart));
-							$lastAlt = trim(substr($contact, $lastStart, strlen($contact) - $lastStart));
-							if (!strcmp($lastAlt, "") == 0) {
-								$org = check_plain($firstAlt . ", " . $lastAlt);
-							} else {
-								$org = check_plain($firstAlt);
-							}
-						} else {
-							$org = '';
-						}
-					}
-					print $org;
-  			?>
-  			&nbsp;
-  		</dd>
-  		
-  		<dt>Discipline</dt>
-  		<dd><?php print $node->field_project_primary_discipline[0]['view']; ?>&nbsp;</dd>
-  		
-  		<?php if ($node->field_project_sec_discipline[0]['view']) : ?>
-				<dt>Subdiscipline</dt>
-				<dd><?php print $node->field_project_sec_discipline[0]['view']; ?>&nbsp;</dd>
-			<?php endif; ?>
-  		
-  	<!--	
-  		<dt>Orientation</dt>
-  		<dd><?php //print $node->field_project_orientation[0]['view']; ?>&nbsp;</dd>
-  		<dt><?php //print format_plural(count($node->field_project_hw), 'Hardware System', 'Hardware Systems'); ?></dt>
-  		<dd>
-  			<ul>
-					<?php //foreach ($node->field_project_hw as $hw): ?>
-						<li><?php //print $hw['view']; ?></li>
-					<?php //endforeach; ?>
-  			</ul>
-  			&nbsp;
-  		</dd>
-  		
-  		<?php //if ($node->field_project_serv_wish[0]['view']) : ?>
-				<dt>Software</dt>
-				<dd>
-					<ul>
-						<?php //foreach ($node->field_project_serv_wish as $sw): ?>
-							<li><?php //print $sw['view']; ?></li>
-						<?php //endforeach; ?>
-					</ul>
-					&nbsp;
-				</dd>
-			<?php //endif; ?>
-	-->
-  	</dl>
-  	
-  	<h3>Abstract</h3>
-  	<p><?php print $node->field_project_abstract[0]['view']; ?></p>
-  	
-  	<h3>Intellectual Merit</h3>
-  	<p><?php print $node->field_project_merit[0]['view']; ?></p>
-  	
-  	<h3>Broader Impacts</h3>
-  	<p><?php print $node->field_broader_impact[0]['view']; ?></p>
-  	
-  	<h3>Scale of Use</h3>
-  	<p><?php print $node->field_project_scale[0]['view']; ?></p>
-  	
-  	<?php if ($node->field_project_results[0]['view']) : ?>
-  		<h3>Results</h3>
-			<p><?php print $node->field_project_results[0]['view']; ?></p>
-  		
-  	<?php endif; ?>
-  	
-  </div>
-  
-  <div class="clear-block clear"></div>
-
-  <?php if ($links): ?>
-    <div class="links">&raquo; <?php print $links; ?></div>
-  <?php endif; ?>
-
-</div>