Communication History

db_objects/comm_reply.class.php

@@ -0,0 +1,62 @@
+<?php
+include_once 'include/db_object.class.php';
+class Comm_Reply extends DB_Object
+{
+	protected $_load_permission_level = PERM_VIEWNOTE;
+	protected $_save_permission_level = PERM_EDITNOTE;
+
+	protected static function _getFields()
+	{
+		return Array(
+				'commid'	=> Array(
+								'type'			=> 'int',
+								'references'	=> 'abstract_note',
+								'editable'		=> false,
+								'label'			=> 'Response to',
+							   ),
+				'creator'		=> Array(
+									'type'			=> 'int',
+									'editable'		=> false,
+									'references'	=> 'person',
+								   ),
+				'created'		=> Array(
+									'type'			=> 'datetime',
+									'readonly'		=> true,
+								   ),
+				'contents'		=> Array(
+									'type'		=> 'text',
+									'width'		=> 50,
+									'height'	=> 5,
+									'initial_cap'	=> true,
+									'label'		=> '',
+									'class' => 'initial-focus'
+								   ),
+			   );
+	}
+
+	function getInitSQL($table_name=NULL)
+	{
+		return "
+			CREATE TABLE `comm_reply` (
+			  `id` int(11) NOT NULL auto_increment,
+			  `commid` int(11) NOT NULL default '0',
+			  `creator` int(11) NOT NULL default '0',
+			  `created` timestamp NOT NULL default CURRENT_TIMESTAMP,
+			  `contents` text NOT NULL,
+			  PRIMARY KEY  (`id`)
+			) ENGINE=InnoDB ;
+		";
+	}
+
+	function getInstancesQueryComps($params, $logic, $order)
+	{
+		$res = parent::getInstancesQueryComps($params, $logic, $order);
+		$res['from'] = '('.$res['from'].') LEFT OUTER JOIN person creator ON comm_reply.creator = creator.id';
+		$res['select'][] = 'creator.first_name as creator_fn';
+		$res['select'][] = 'creator.last_name as creator_ln';
+		return $res;
+
+	}
+
+}
+?>

db_objects/person.class.php

@@ -352,6 +352,16 @@ function getNotesHistory()
 		return $all_notes;
 	}
 
+        function getCommsHistory()
+        {
+                $person_comms = $GLOBALS['system']->getDBObjectData('person_comm', Array('personid' => $this->id));
+                if (ifdef('NOTES_ORDER', 'ASC') != 'ASC') {
+                        $person_comms = array_reverse($person_comms, TRUE);
+                }
+                return $person_comms;
+        }
+
+
 	function validateFields()
 	{
 		if (!parent::validateFields()) return FALSE;
@@ -1044,4 +1054,3 @@ public function delete()
 	}
 
 }
-

db_objects/person_comm.class.php

@@ -0,0 +1,62 @@
+<?php
+include_once 'db_objects/abstract_note.class.php';
+class Person_Comm extends Abstract_Note
+{
+	protected static function _getFields()
+	{
+		return Array(
+				'personid'	=> Array(
+								'type'			=> 'int',
+								'references'	=> 'person',
+								'editable'		=> false,
+								'label'			=> 'Person',
+							   ),
+			   );
+
+	}
+
+
+	function getInitSQL($table_name=NULL)
+	{
+		return "
+			CREATE TABLE `person_comm` (
+			  `personid` int(11) NOT NULL default '0',
+			  `id` int(11) NOT NULL default '0',
+			  PRIMARY KEY  (`personid`,`id`),
+			  CONSTRAINT `pn_personid` FOREIGN KEY (personid) REFERENCES _person(id) ON DELETE CASCADE,
+			  CONSTRAINT pn_id FOREIGN KEY (id) REFERENCES abstract_note(id) ON DELETE CASCADE
+			) ENGINE=InnoDB ;
+		";
+	}
+
+	function printFieldValue($name, $value=NULL)
+	{
+		if (is_null($value)) $value = $this->values[$name];
+		if ($name == 'personid') {
+			if (!empty($value)) {
+				$person = $GLOBALS['system']->getDBObject('person', $value);
+				?>
+				<a href="?view=persons&personid=<?php echo $value; ?>"><?php echo $person->toString(); ?></a> (#<?php echo $value; ?>)
+				<?php
+				return;
+			}
+		}
+		return parent::printFieldValue($name, $value);
+	}
+
+	function getInstancesQueryComps($params, $logic, $order)
+	{
+		$res = parent::getInstancesQueryComps($params, $logic, $order);
+		$res['from'] = '('.$res['from'].') LEFT OUTER JOIN person person ON person_comm.personid = person.id';
+		$res['select'][] = 'person.first_name as person_fn';
+		$res['select'][] = 'person.last_name as person_ln';
+		return $res;
+	}
+
+	function printFieldInterface($name, $prefix = '') {
+		parent::printFieldInterface($name, $prefix);
+	}
+
+
+}
+?>

db_objects/roster_view.class.php

@@ -38,15 +38,15 @@ function load($id)
 		// Enforce visibility
 		switch ($this->getValue('visibility')) {
 			case '':
-				if (!$GLOBALS['user_system']->getCurrentUser('id')) {
+				if (!$GLOBALS['user_system']->getCurrentUser('id') && (PHP_SAPI != 'cli')) {
 					header($_SERVER["SERVER_PROTOCOL"]." 401 Not Authorised");
 					print_message("Roster view #{$this->id} is only available to logged in operators", 'error');
 					exit;
 				}
 				break;
 			case 'members':
 				// Make sure either a user or a member is logged in
-				if (!$GLOBALS['user_system']->getCurrentPerson('id')) {
+				 if (!$GLOBALS['user_system']->getCurrentPerson('id') && (PHP_SAPI != 'cli')) {
 					header($_SERVER["SERVER_PROTOCOL"]." 401 Not Authorised");
 					print_message("Roster view #{$this->id} is only available to logged in members", 'error');
 					exit;

db_objects/service.class.php

@@ -345,7 +345,7 @@ function printFieldValue($fieldname, $value=NULL)
 					foreach ($this->getItems(FALSE, $compCatID) as $item) {
 						$res[] = ents($item['title']);
 					}
-					echo implode('<br />', $res);
+					echo implode('<br />', nbsp($res));
 				} else {
 					parent::printFieldvalue($fieldname);
 				}

include/sms_sender.class.php

@@ -120,10 +120,10 @@ private static function cleanseMessage($message)
 	 * Send an SMS message
 	 * @param string $message
 	 * @param array $recips	Array of person records
-	 * @param boolean $saveAsNote Whether to save a note against the recipients
+	 * @param boolean $saveComm Whether to save a copy against the recipients
 	 * @return array('success' => bool, 'successes' => array, 'failures' => array, 'rawresponse' => string)
 	 */
-	public static function sendMessage($message, $recips, $saveAsNote=FALSE)
+	public static function sendMessage($message, $recips, $saveComm=TRUE)
 	{
 		$message = self::cleanseMessage($message);
 		$mobile_tels = Array();
@@ -177,7 +177,7 @@ public static function sendMessage($message, $recips, $saveAsNote=FALSE)
 		}
 
 		$header = "" . ifdef('SMS_HTTP_HEADER_TEMPLATE', '');
-		$header = $header . "Content-Length: " . strlen($content) . "\r\n" . "Content-Type: application/x-www-form-urlencoded\r\n";
+		$header = $header . "\r\n" . "Content-Length: " . strlen($content) . "\r\n" . "Content-Type: application/x-www-form-urlencoded\r\n";
 
 		$opts = Array(
 			'http' => Array(
@@ -204,7 +204,7 @@ public static function sendMessage($message, $recips, $saveAsNote=FALSE)
 				fclose($fp);
 			}
 		} catch (Exception $e) {
-			$error = "ERROR: Unable to connect to SMS Server. " + $e->getMessage();
+			$error = "Exception ERROR: Unable to connect to SMS Server." . print_r($e, TRUE);
 			return array("success" => false, "successes" => array(), "failures" => array(), "rawresponse" => $error, "error" => $error);
 		}
 		restore_error_handler(); // Restore system error_handler
@@ -231,10 +231,10 @@ public static function sendMessage($message, $recips, $saveAsNote=FALSE)
 					}
 				} //$recips as $id => $recip
 				self::logSuccess(count($successes), $message);
-				if ($saveAsNote) self::saveAsNote($successes, $message);
+				if ($saveComm) self::saveComm($successes, $message);
 			} else {
 				self::logSuccess(count($mobile_tels), $message);
-				if ($saveAsNote) self::saveAsNote($recips, $message);
+				if ($saveComm) self::saveComm($recips, $message);
 			}
 		} //$success
 
@@ -311,18 +311,18 @@ public static function printModal()
 		<?php
 	}
 
-	private static function saveAsNote($recipients, $message)
+    private static function saveComm($recipients, $message)
 	{
-		$GLOBALS['system']->includeDBClass('person_note');
+		$GLOBALS['system']->includeDBClass('person_comm');
 		$subject = ifdef('SMS_SAVE_TO_NOTE_SUBJECT', 'SMS Sent');
 		foreach ($recipients as $id => $details) {
 			// Add a note containing the SMS to the user
-			$note = new Person_Note();
-			$note->setValue('subject', $subject);
-			$note->setvalue('details', $message);
-			$note->setValue('personid', $id);
-			if (!$note->create()) {
-				trigger_error('Failed to save SMS as a note.');
+			$comm = new Person_Comm();
+			$comm->setValue('subject', $subject);
+			$comm->setvalue('details', $message);
+			$comm->setValue('personid', $id);
+			if (!$comm->create()) {
+				trigger_error('Failed to save SMS as a communications note.');
 			}
 		}
 	}

public/views/view_2_display_roster.class.php

@@ -44,7 +44,7 @@ function printView()
 			?>
 			<ul>
 			<?php
-			$views = $GLOBALS['system']->getDBObjectData('roster_view', Array('!visibility' => ''), 'AND', 'name');
+			$views = $GLOBALS['system']->getDBObjectData('roster_view', Array('visibility' => 'public'), 'AND', 'name');
 			foreach ($views as $id => $detail) {
 				?>
 				<li><a href="<?php echo build_url(Array('roster_view' => $id)); ?>"><?php echo ents($detail['name']); ?></a></li>

scripts/date_reminder.php

@@ -156,7 +156,7 @@ function send_reminder($person)
 			$toNumber = $person['mobile_tel'];
 			if (!empty($ini['OVERRIDE_RECIPIENT_SMS'])) $toNumber = $ini['OVERRIDE_RECIPIENT_SMS'];
 			$message = replace_keywords($ini['SMS_MESSAGE'], $person);
-			$res = SMS_Sender::sendMessage($message, Array($person), FALSE);
+			$res = SMS_Sender::sendMessage($message, Array($person), TRUE);
 			if (count($res['successes']) != 1) {
 				echo "Failed to send SMS to ".$toNumber."\n";
 			} else {

scripts/roster_reminder.php

@@ -161,7 +161,7 @@
 		require_once JETHRO_ROOT.'/include/sms_sender.class.php';
 		$notification_sms = '';
 		if (!empty($assignees))  {
-			$sendResponse = SMS_Sender::sendMessage($sms_message, $assignees, FALSE);
+			$sendResponse = SMS_Sender::sendMessage($sms_message, $assignees, TRUE);
 			$successes = $failures = $rawresponse = Array();
 			$success = $sendResponse['success'];
 			$successes = array_values($sendResponse['successes']);

templates/list_comms.template.php

@@ -0,0 +1,9 @@
+<div class="notes-history-container">
+<?php
+$GLOBALS['system']->includeDBClass('abstract_note');
+$dummy = new Abstract_Note();
+foreach ($comms as $id => $entry) {
+	include 'single_comm.template.php';
+}
+?>
+</div>

templates/single_comm.template.php

@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * @var $id
+ * $var $entry
+ * @var $show_form
+ * @var $show_edit_link
+ */
+
+$dummy->populate($id, $entry);
+$type = 1;
+$icon = 'phone';
+?>
+<a name="note_<?php echo $id; ?>"></a>
+<div class="notes-history-entry well <?php echo $type; ?>-note" id="note_<?php echo $id; ?>">
+
+
+	<?php
+	if (!empty($show_names)) {
+		if ($entry['type'] === 1) {
+			$type = 'sms';
+			$icon = 'phone';
+		} else {
+			$type = 'email';
+			$icon = 'envelope';
+		}
+		$notee = $entry['person_fn'].' '.$entry['person_ln'];
+		$view_url = '?view=persons&personid='.$entry['personid'].'#comm_'.$id;
+		?>
+		<h4><a href="<?php echo $view_url; ?>"><?php echo ents($notee); ?></a></h4>
+		<?php
+	}
+	?>
+	<i class="icon-<?php echo $icon; ?>"></i>
+	<blockquote>
+		<p class="subject"><?php echo ents($entry['subject']); ?></p>
+	<?php
+	if (strlen($entry['details'])) {
+		?>
+		<p class="content"><?php echo nl2br(ents($entry['details'])); ?></p>
+		<?php
+	}
+	?>
+		<small class="author">
+			<?php echo $entry['creator_fn'].' '.$entry['creator_ln'].' <span class="visible-desktop">(#'.$entry['creator'].')</span>,'; ?>
+			<?php echo format_datetime($entry['created']); ?>
+			<?php
+			?>
+		</small>
+	</blockquote>
+	<?php
+	if (!empty($entry['comments'])) {
+		?>
+		<div class="comments">
+		<?php
+		foreach ($entry['comments'] as $comment) {
+			?>
+			<blockquote>
+				<p><?php echo nl2br(ents(trim($comment['contents']))); ?></p>
+				<small class="author">
+					<?php echo $comment['creator_fn'].' '.$comment['creator_ln'].' <span class="visible-desktop">(#'.$entry['creator'].')</span>, '; ?>
+					<?php echo format_datetime($comment['created']); ?>
+				</small>
+			</blockquote>
+			<?php
+		}
+		?>
+		</div>
+		<?php
+	}
+
+
+	?>
+
+</div>