From e9ecb9dab2701478751750b4c95085fd49355dbe Mon Sep 17 00:00:00 2001
From: Ken Chapple <ken.chapple@gmail.com>
Date: Thu, 14 Apr 2011 10:57:41 -0700
Subject: [PATCH] CDR Module: Fixed broken headers in Admin GUI. No longer
 require output buffering.

---
 interface/super/rules/base/template/basic.php                        | 1 -
 interface/super/rules/base/template/redirect.php                     | 4 ++--
 interface/super/rules/base/template/undecorated.php                  | 4 ++--
 interface/super/rules/base/view/error.php                            | 4 ++--
 interface/super/rules/controllers/add/controller.php                 | 3 +--
 interface/super/rules/controllers/browse/controller.php              | 2 --
 interface/super/rules/controllers/detail/controller.php              | 3 +--
 interface/super/rules/controllers/detail/view/view.php               | 4 ++--
 interface/super/rules/controllers/edit/controller.php                | 2 --
 interface/super/rules/controllers/edit/view/age.php                  | 1 -
 interface/super/rules/controllers/edit/view/bucket.php               | 1 -
 interface/super/rules/controllers/edit/view/custom.php               | 1 -
 interface/super/rules/controllers/edit/view/intervals.php            | 1 -
 interface/super/rules/controllers/edit/view/lifestyle.php            | 1 -
 interface/super/rules/controllers/edit/view/sex.php                  | 1 -
 interface/super/rules/controllers/edit/view/simple_text_criteria.php | 1 -
 interface/super/rules/controllers/edit/view/summary.php              | 4 +---
 interface/super/rules/include/common.php                             | 2 --
 interface/super/rules/include/header.php                             | 2 --
 interface/super/rules/include/ui.php                                 | 5 +----
 interface/super/rules/library/CdrHelper.class.php                    | 1 -
 interface/super/rules/library/Code.php                               | 2 --
 interface/super/rules/library/CodeManager.php                        | 2 --
 interface/super/rules/library/Option.php                             | 2 --
 interface/super/rules/library/ReminderIntervalDetail.php             | 2 --
 interface/super/rules/library/ReminderIntervalRange.php              | 2 --
 interface/super/rules/library/ReminderIntervalType.php               | 2 --
 interface/super/rules/library/ReminderIntervals.php                  | 3 ---
 interface/super/rules/library/Rule.php                               | 2 --
 interface/super/rules/library/RuleAction.php                         | 2 --
 interface/super/rules/library/RuleActions.php                        | 2 --
 interface/super/rules/library/RuleCriteria.php                       | 2 --
 interface/super/rules/library/RuleCriteriaAge.php                    | 2 --
 interface/super/rules/library/RuleCriteriaAgeBuilder.php             | 2 --
 interface/super/rules/library/RuleCriteriaAllergy.php                | 2 --
 interface/super/rules/library/RuleCriteriaBuilder.php                | 2 --
 interface/super/rules/library/RuleCriteriaDatabaseBucket.php         | 2 --
 interface/super/rules/library/RuleCriteriaDatabaseBuilder.php        | 2 --
 interface/super/rules/library/RuleCriteriaDatabaseCustom.php         | 2 --
 interface/super/rules/library/RuleCriteriaDbView.php                 | 2 --
 interface/super/rules/library/RuleCriteriaDiagnosis.php              | 2 --
 interface/super/rules/library/RuleCriteriaFactory.php                | 2 --
 interface/super/rules/library/RuleCriteriaFilterFactory.php          | 2 --
 interface/super/rules/library/RuleCriteriaLifestyle.php              | 3 ---
 interface/super/rules/library/RuleCriteriaListsBuilder.php           | 2 --
 interface/super/rules/library/RuleCriteriaMedicalIssue.php           | 3 ---
 interface/super/rules/library/RuleCriteriaMedication.php             | 2 --
 interface/super/rules/library/RuleCriteriaSex.php                    | 2 --
 interface/super/rules/library/RuleCriteriaSexBuilder.php             | 2 --
 interface/super/rules/library/RuleCriteriaSimpleText.php             | 2 --
 interface/super/rules/library/RuleCriteriaSurgery.php                | 2 --
 interface/super/rules/library/RuleCriteriaTargetFactory.php          | 2 --
 interface/super/rules/library/RuleCriteriaType.php                   | 2 --
 interface/super/rules/library/RuleFilters.php                        | 2 --
 interface/super/rules/library/RuleManager.php                        | 3 ---
 interface/super/rules/library/RuleTargetActionGroup.php              | 2 --
 interface/super/rules/library/RuleTargets.php                        | 2 --
 interface/super/rules/library/RuleType.php                           | 2 --
 interface/super/rules/library/TimeUnit.php                           | 2 --
 library/clinical_rules.php                                           | 3 ---
 60 files changed, 12 insertions(+), 119 deletions(-)

diff --git a/interface/super/rules/base/template/basic.php b/interface/super/rules/base/template/basic.php
index f3207a475..fb85040fd 100644
--- a/interface/super/rules/base/template/basic.php
+++ b/interface/super/rules/base/template/basic.php
@@ -6,7 +6,6 @@
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
 ?>
-
 <html>
 <head>
     <?php html_header_show();?>
diff --git a/interface/super/rules/base/template/redirect.php b/interface/super/rules/base/template/redirect.php
index 4590a1573..5976603e8 100644
--- a/interface/super/rules/base/template/redirect.php
+++ b/interface/super/rules/base/template/redirect.php
@@ -5,5 +5,5 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
-<?php header("Location: $_redirect"); exit; ?>
\ No newline at end of file
+ 
+header("Location: $_redirect"); exit; ?>
\ No newline at end of file
diff --git a/interface/super/rules/base/template/undecorated.php b/interface/super/rules/base/template/undecorated.php
index 5b15d1c66..3471a0022 100644
--- a/interface/super/rules/base/template/undecorated.php
+++ b/interface/super/rules/base/template/undecorated.php
@@ -5,5 +5,5 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
-<?php if ( file_exists($viewBean->_view_body) ) { require_once($viewBean->_view_body); } ?>
+ 
+if ( file_exists($viewBean->_view_body) ) { require_once($viewBean->_view_body); } ?>
diff --git a/interface/super/rules/base/view/error.php b/interface/super/rules/base/view/error.php
index d7581b0fb..2682b1031 100644
--- a/interface/super/rules/base/view/error.php
+++ b/interface/super/rules/base/view/error.php
@@ -5,5 +5,5 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
-<?php echo xl('An unexpected error has occurred.'); ?>
+
+echo xl('An unexpected error has occurred.'); ?>
diff --git a/interface/super/rules/controllers/add/controller.php b/interface/super/rules/controllers/add/controller.php
index 8bbb1d022..bec4db5d1 100644
--- a/interface/super/rules/controllers/add/controller.php
+++ b/interface/super/rules/controllers/add/controller.php
@@ -5,8 +5,7 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
-<?php
+
 class Controller_add extends BaseController {
 
     function _action_add() {
diff --git a/interface/super/rules/controllers/browse/controller.php b/interface/super/rules/controllers/browse/controller.php
index b4e43a735..a6c104fcb 100644
--- a/interface/super/rules/controllers/browse/controller.php
+++ b/interface/super/rules/controllers/browse/controller.php
@@ -5,9 +5,7 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
 
-<?php
 require_once( src_dir() . "/clinical_rules.php");
 
 class Controller_browse extends BaseController {
diff --git a/interface/super/rules/controllers/detail/controller.php b/interface/super/rules/controllers/detail/controller.php
index 33e47c298..4f797b779 100644
--- a/interface/super/rules/controllers/detail/controller.php
+++ b/interface/super/rules/controllers/detail/controller.php
@@ -5,8 +5,7 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
-<?php
+
 class Controller_detail extends BaseController {
 
     function _action_view() {
diff --git a/interface/super/rules/controllers/detail/view/view.php b/interface/super/rules/controllers/detail/view/view.php
index 2cd561f00..866b215ee 100644
--- a/interface/super/rules/controllers/detail/view/view.php
+++ b/interface/super/rules/controllers/detail/view/view.php
@@ -5,8 +5,8 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
-<?php $rule = $viewBean->rule ?>
+
+$rule = $viewBean->rule ?>
 
 <script language="javascript" src="<?php js_src('detail.js') ?>"></script>
 <script type="text/javascript">
diff --git a/interface/super/rules/controllers/edit/controller.php b/interface/super/rules/controllers/edit/controller.php
index e289f3c92..6867e5322 100644
--- a/interface/super/rules/controllers/edit/controller.php
+++ b/interface/super/rules/controllers/edit/controller.php
@@ -5,9 +5,7 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
 
-<?php
 class Controller_edit extends BaseController {
 
     function _action_summary() {
diff --git a/interface/super/rules/controllers/edit/view/age.php b/interface/super/rules/controllers/edit/view/age.php
index 94bf57833..ab08e91f9 100644
--- a/interface/super/rules/controllers/edit/view/age.php
+++ b/interface/super/rules/controllers/edit/view/age.php
@@ -6,7 +6,6 @@
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
 ?>
-
 <!-- age -->
 <p class="row">
     <span class="left_col colhead req" data-fld="fld_value"><?php echo out( xl( 'Age' ) );?> <?php echo out( xl( $criteria->getType() ) ); ?></span>
diff --git a/interface/super/rules/controllers/edit/view/bucket.php b/interface/super/rules/controllers/edit/view/bucket.php
index 3d2ed8dac..b00aec2fa 100644
--- a/interface/super/rules/controllers/edit/view/bucket.php
+++ b/interface/super/rules/controllers/edit/view/bucket.php
@@ -6,7 +6,6 @@
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
 ?>
-
 <head>
     <script language="javascript" src="<?php js_src('bucket.js') ?>"></script>
 
diff --git a/interface/super/rules/controllers/edit/view/custom.php b/interface/super/rules/controllers/edit/view/custom.php
index f4a7c2acd..780376dfb 100644
--- a/interface/super/rules/controllers/edit/view/custom.php
+++ b/interface/super/rules/controllers/edit/view/custom.php
@@ -6,7 +6,6 @@
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
 ?>
-
 <head>
     <script language="javascript" src="<?php js_src('custom.js') ?>"></script>
 
diff --git a/interface/super/rules/controllers/edit/view/intervals.php b/interface/super/rules/controllers/edit/view/intervals.php
index 777737577..fc301bce9 100644
--- a/interface/super/rules/controllers/edit/view/intervals.php
+++ b/interface/super/rules/controllers/edit/view/intervals.php
@@ -1,7 +1,6 @@
 <?php require_once( $GLOBALS["srcdir"] . "/../interface/super/rules/controllers/edit/helper/common.php" ); ?>
 <?php $rule = $viewBean->rule ?>
 <?php $intervals = $rule->reminderIntervals ?>
-
 <script language="javascript" src="<?php js_src('edit.js') ?>"></script>
 <script type="text/javascript">
     var edit = new rule_edit( {});
diff --git a/interface/super/rules/controllers/edit/view/lifestyle.php b/interface/super/rules/controllers/edit/view/lifestyle.php
index 87a70791f..94d77de97 100644
--- a/interface/super/rules/controllers/edit/view/lifestyle.php
+++ b/interface/super/rules/controllers/edit/view/lifestyle.php
@@ -6,7 +6,6 @@
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
 ?>
-
 <p class="row">
     <span class="left_col colhead req" data-fld="fld_lifestyle"><?php echo out( $criteria->getTitle() ); ?></span>
     <span class="end_col">
diff --git a/interface/super/rules/controllers/edit/view/sex.php b/interface/super/rules/controllers/edit/view/sex.php
index feda3645e..ac14cb460 100644
--- a/interface/super/rules/controllers/edit/view/sex.php
+++ b/interface/super/rules/controllers/edit/view/sex.php
@@ -6,7 +6,6 @@
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
 ?>
-
 <p class="row">
     <span class="left_col colhead req" data-fld="fld_sex"><?php echo xl('Sex');?></span>
     <span class="end_col">
diff --git a/interface/super/rules/controllers/edit/view/simple_text_criteria.php b/interface/super/rules/controllers/edit/view/simple_text_criteria.php
index 90c08996e..3f7cd763a 100644
--- a/interface/super/rules/controllers/edit/view/simple_text_criteria.php
+++ b/interface/super/rules/controllers/edit/view/simple_text_criteria.php
@@ -6,7 +6,6 @@
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
 ?>
-
 <p class="row">
     <span class="left_col colhead req" data-fld="fld_value"><?php echo out( $criteria->getTitle() ); ?></span>
     <span class="end_col"><input id="fld_value" type="text" name="fld_value" class="field" value="<?php echo out( $criteria->getRequirements() ); ?>"></span>
diff --git a/interface/super/rules/controllers/edit/view/summary.php b/interface/super/rules/controllers/edit/view/summary.php
index 066a684a7..2d586eece 100644
--- a/interface/super/rules/controllers/edit/view/summary.php
+++ b/interface/super/rules/controllers/edit/view/summary.php
@@ -5,9 +5,7 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
-
-<?php $rule = $viewBean->rule ?>
+ $rule = $viewBean->rule ?>
 
 <script language="javascript" src="<?php js_src('edit.js') ?>"></script>
 <script type="text/javascript">
diff --git a/interface/super/rules/include/common.php b/interface/super/rules/include/common.php
index 612ba16f2..0c267ae21 100644
--- a/interface/super/rules/include/common.php
+++ b/interface/super/rules/include/common.php
@@ -5,9 +5,7 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
 
-<?php
 /**
  * This is a shortcut for htmlspecial vars.
  * @param <type> $txt 
diff --git a/interface/super/rules/include/header.php b/interface/super/rules/include/header.php
index 86e2ebbc3..0bb4fe5f5 100644
--- a/interface/super/rules/include/header.php
+++ b/interface/super/rules/include/header.php
@@ -5,9 +5,7 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
 
-<?php
 // for security
 $fake_register_globals=false;
 $sanitize_all_escapes=true;
diff --git a/interface/super/rules/include/ui.php b/interface/super/rules/include/ui.php
index 73e718bb7..8972d1345 100644
--- a/interface/super/rules/include/ui.php
+++ b/interface/super/rules/include/ui.php
@@ -5,10 +5,7 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
-
-<?php
-
+ 
 	require_once( $GLOBALS['fileroot'] . "/library/options.inc.php" );
 
     function getLabel( $value, $list_id ) {
diff --git a/interface/super/rules/library/CdrHelper.class.php b/interface/super/rules/library/CdrHelper.class.php
index 771788aab..79060be1f 100644
--- a/interface/super/rules/library/CdrHelper.class.php
+++ b/interface/super/rules/library/CdrHelper.class.php
@@ -1,4 +1,3 @@
-
 <?php 
 // Copyright (C) 2011 Ensoftek, Inc
 //
diff --git a/interface/super/rules/library/Code.php b/interface/super/rules/library/Code.php
index fe8647f5c..d76088299 100644
--- a/interface/super/rules/library/Code.php
+++ b/interface/super/rules/library/Code.php
@@ -5,9 +5,7 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
 
-<?php
 /**
  * Description of Code
  *
diff --git a/interface/super/rules/library/CodeManager.php b/interface/super/rules/library/CodeManager.php
index c380c1d58..949d5913d 100644
--- a/interface/super/rules/library/CodeManager.php
+++ b/interface/super/rules/library/CodeManager.php
@@ -5,9 +5,7 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
 
-<?php
 /**
  * Description of CodeManager
  *
diff --git a/interface/super/rules/library/Option.php b/interface/super/rules/library/Option.php
index 1ba0ed7b7..42c07f043 100644
--- a/interface/super/rules/library/Option.php
+++ b/interface/super/rules/library/Option.php
@@ -5,9 +5,7 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
 
-<?php
 /**
  * Description of Option
  *
diff --git a/interface/super/rules/library/ReminderIntervalDetail.php b/interface/super/rules/library/ReminderIntervalDetail.php
index a9b1d3cae..ff5a483ef 100644
--- a/interface/super/rules/library/ReminderIntervalDetail.php
+++ b/interface/super/rules/library/ReminderIntervalDetail.php
@@ -5,9 +5,7 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
 
-<?php
 /**
  * Description of ReminderIntervalDetail
  *
diff --git a/interface/super/rules/library/ReminderIntervalRange.php b/interface/super/rules/library/ReminderIntervalRange.php
index 2929f501d..a1d76f0d9 100644
--- a/interface/super/rules/library/ReminderIntervalRange.php
+++ b/interface/super/rules/library/ReminderIntervalRange.php
@@ -5,9 +5,7 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
 
-<?php
 /**
  * todo docs
  * enum
diff --git a/interface/super/rules/library/ReminderIntervalType.php b/interface/super/rules/library/ReminderIntervalType.php
index 89433c8ea..da5e16491 100644
--- a/interface/super/rules/library/ReminderIntervalType.php
+++ b/interface/super/rules/library/ReminderIntervalType.php
@@ -5,9 +5,7 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
 
-<?php
 /**
  * enum
  * @author aron
diff --git a/interface/super/rules/library/ReminderIntervals.php b/interface/super/rules/library/ReminderIntervals.php
index 27cdc27b5..4ca2a8065 100644
--- a/interface/super/rules/library/ReminderIntervals.php
+++ b/interface/super/rules/library/ReminderIntervals.php
@@ -5,9 +5,6 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
-
-<?php
 
 /**
  * This object maintains a collection of ReminderIntervalDetail for a given rule.
diff --git a/interface/super/rules/library/Rule.php b/interface/super/rules/library/Rule.php
index 0634b05a8..b22c46f67 100644
--- a/interface/super/rules/library/Rule.php
+++ b/interface/super/rules/library/Rule.php
@@ -5,9 +5,7 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
 
-<?php
 /**
  * This is the primary domain object representing a rule in the rules engine.
  * Rules are composed of:
diff --git a/interface/super/rules/library/RuleAction.php b/interface/super/rules/library/RuleAction.php
index 454dcf4cf..b66aaff0c 100644
--- a/interface/super/rules/library/RuleAction.php
+++ b/interface/super/rules/library/RuleAction.php
@@ -5,9 +5,7 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
 
-<?php
 /**
  * Description of RuleAction
  *
diff --git a/interface/super/rules/library/RuleActions.php b/interface/super/rules/library/RuleActions.php
index cb7560d00..c04bef879 100644
--- a/interface/super/rules/library/RuleActions.php
+++ b/interface/super/rules/library/RuleActions.php
@@ -5,9 +5,7 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
 
-<?php
 /**
  * Description of RuleActions
  *
diff --git a/interface/super/rules/library/RuleCriteria.php b/interface/super/rules/library/RuleCriteria.php
index ab118ef39..c4f7b6ce3 100644
--- a/interface/super/rules/library/RuleCriteria.php
+++ b/interface/super/rules/library/RuleCriteria.php
@@ -5,9 +5,7 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
 
-<?php
 /**
  * Description of RuleCriteria
  *
diff --git a/interface/super/rules/library/RuleCriteriaAge.php b/interface/super/rules/library/RuleCriteriaAge.php
index e5ee6f368..209ebc351 100644
--- a/interface/super/rules/library/RuleCriteriaAge.php
+++ b/interface/super/rules/library/RuleCriteriaAge.php
@@ -5,9 +5,7 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
 
-<?php
 /**
  * Description of RuleCriteriaAge
  *
diff --git a/interface/super/rules/library/RuleCriteriaAgeBuilder.php b/interface/super/rules/library/RuleCriteriaAgeBuilder.php
index 7a54d79a3..67e6437dd 100644
--- a/interface/super/rules/library/RuleCriteriaAgeBuilder.php
+++ b/interface/super/rules/library/RuleCriteriaAgeBuilder.php
@@ -5,9 +5,7 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
 
-<?php
 require_once( library_src( 'RuleCriteriaBuilder.php') );
 /**
  * Description of RuleCriteriaAgeBuilder
diff --git a/interface/super/rules/library/RuleCriteriaAllergy.php b/interface/super/rules/library/RuleCriteriaAllergy.php
index c70ac6c28..5f82fe650 100644
--- a/interface/super/rules/library/RuleCriteriaAllergy.php
+++ b/interface/super/rules/library/RuleCriteriaAllergy.php
@@ -5,9 +5,7 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
 
-<?php
 require_once( library_src( 'RuleCriteriaSimpleText.php') );
 
 /**
diff --git a/interface/super/rules/library/RuleCriteriaBuilder.php b/interface/super/rules/library/RuleCriteriaBuilder.php
index 9a1912cb7..8f70425d7 100644
--- a/interface/super/rules/library/RuleCriteriaBuilder.php
+++ b/interface/super/rules/library/RuleCriteriaBuilder.php
@@ -5,9 +5,7 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
 
-<?php
 /**
  * Description of RuleCriteriaBuilder
  *
diff --git a/interface/super/rules/library/RuleCriteriaDatabaseBucket.php b/interface/super/rules/library/RuleCriteriaDatabaseBucket.php
index d99c0ddf7..ae5ddf5be 100644
--- a/interface/super/rules/library/RuleCriteriaDatabaseBucket.php
+++ b/interface/super/rules/library/RuleCriteriaDatabaseBucket.php
@@ -5,9 +5,7 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
 
-<?php
 /**
  * Description of RuleCriteriaDatabaseBucketBuilder
  *
diff --git a/interface/super/rules/library/RuleCriteriaDatabaseBuilder.php b/interface/super/rules/library/RuleCriteriaDatabaseBuilder.php
index 30c3d871c..d0dde7acc 100644
--- a/interface/super/rules/library/RuleCriteriaDatabaseBuilder.php
+++ b/interface/super/rules/library/RuleCriteriaDatabaseBuilder.php
@@ -5,9 +5,7 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
 
-<?php
 /**
  * Description of RuleCriteriaDatabaseBuilder
  *
diff --git a/interface/super/rules/library/RuleCriteriaDatabaseCustom.php b/interface/super/rules/library/RuleCriteriaDatabaseCustom.php
index ba2cfa8d6..47c7b12d8 100644
--- a/interface/super/rules/library/RuleCriteriaDatabaseCustom.php
+++ b/interface/super/rules/library/RuleCriteriaDatabaseCustom.php
@@ -5,9 +5,7 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
 
-<?php
 /**
  * Description of RuleCriteriaDatabaseCustom
  *
diff --git a/interface/super/rules/library/RuleCriteriaDbView.php b/interface/super/rules/library/RuleCriteriaDbView.php
index 6eb2c7fdb..f7b8fa5cf 100644
--- a/interface/super/rules/library/RuleCriteriaDbView.php
+++ b/interface/super/rules/library/RuleCriteriaDbView.php
@@ -5,9 +5,7 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
 
-<?php
 /**
  * Description of RuleCriteriaDbModel
  *
diff --git a/interface/super/rules/library/RuleCriteriaDiagnosis.php b/interface/super/rules/library/RuleCriteriaDiagnosis.php
index 650e48225..7997e6150 100644
--- a/interface/super/rules/library/RuleCriteriaDiagnosis.php
+++ b/interface/super/rules/library/RuleCriteriaDiagnosis.php
@@ -5,9 +5,7 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
 
-<?php
 /**
  * Description of RuleCriteriaDiagnosis
  *
diff --git a/interface/super/rules/library/RuleCriteriaFactory.php b/interface/super/rules/library/RuleCriteriaFactory.php
index aa148be79..377abcdbf 100644
--- a/interface/super/rules/library/RuleCriteriaFactory.php
+++ b/interface/super/rules/library/RuleCriteriaFactory.php
@@ -5,9 +5,7 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
 
-<?php
 /**
  * Description of RuleCriteriaFactory
  *
diff --git a/interface/super/rules/library/RuleCriteriaFilterFactory.php b/interface/super/rules/library/RuleCriteriaFilterFactory.php
index 209873a2e..3079d3fce 100644
--- a/interface/super/rules/library/RuleCriteriaFilterFactory.php
+++ b/interface/super/rules/library/RuleCriteriaFilterFactory.php
@@ -5,9 +5,7 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
 
-<?php
 require_once( library_src( 'RuleCriteriaFactory.php') );
 
 /**
diff --git a/interface/super/rules/library/RuleCriteriaLifestyle.php b/interface/super/rules/library/RuleCriteriaLifestyle.php
index 53889ca5d..f3f2a76e6 100644
--- a/interface/super/rules/library/RuleCriteriaLifestyle.php
+++ b/interface/super/rules/library/RuleCriteriaLifestyle.php
@@ -5,9 +5,6 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
-
-<?php
 
 /**
  * Description of RuleCriteriaLifestyle
diff --git a/interface/super/rules/library/RuleCriteriaListsBuilder.php b/interface/super/rules/library/RuleCriteriaListsBuilder.php
index 65c7ce018..47d7f1027 100644
--- a/interface/super/rules/library/RuleCriteriaListsBuilder.php
+++ b/interface/super/rules/library/RuleCriteriaListsBuilder.php
@@ -5,9 +5,7 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
 
-<?php
 /**
  * Description of RuleCriteriaListsBuilder
  *
diff --git a/interface/super/rules/library/RuleCriteriaMedicalIssue.php b/interface/super/rules/library/RuleCriteriaMedicalIssue.php
index bb6b81e3c..881264cc8 100644
--- a/interface/super/rules/library/RuleCriteriaMedicalIssue.php
+++ b/interface/super/rules/library/RuleCriteriaMedicalIssue.php
@@ -5,9 +5,6 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
-
-<?php
 
 require_once( library_src( 'RuleCriteriaSimpleText.php') );
 /**
diff --git a/interface/super/rules/library/RuleCriteriaMedication.php b/interface/super/rules/library/RuleCriteriaMedication.php
index fba0bbe7b..4d18ee959 100644
--- a/interface/super/rules/library/RuleCriteriaMedication.php
+++ b/interface/super/rules/library/RuleCriteriaMedication.php
@@ -5,9 +5,7 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
 
-<?php
 require_once( library_src( 'RuleCriteriaSimpleText.php') );
 
 /**
diff --git a/interface/super/rules/library/RuleCriteriaSex.php b/interface/super/rules/library/RuleCriteriaSex.php
index a151339b4..1774600ce 100644
--- a/interface/super/rules/library/RuleCriteriaSex.php
+++ b/interface/super/rules/library/RuleCriteriaSex.php
@@ -5,9 +5,7 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
 
-<?php
 /**
  * Description of RuleCriteriaSex
  *
diff --git a/interface/super/rules/library/RuleCriteriaSexBuilder.php b/interface/super/rules/library/RuleCriteriaSexBuilder.php
index 455ca60d9..bd5003d9e 100644
--- a/interface/super/rules/library/RuleCriteriaSexBuilder.php
+++ b/interface/super/rules/library/RuleCriteriaSexBuilder.php
@@ -5,9 +5,7 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
 
-<?php
 /**
  * Description of RuleCriteriaSexBuilder
  *
diff --git a/interface/super/rules/library/RuleCriteriaSimpleText.php b/interface/super/rules/library/RuleCriteriaSimpleText.php
index 69621ce89..e508d9391 100644
--- a/interface/super/rules/library/RuleCriteriaSimpleText.php
+++ b/interface/super/rules/library/RuleCriteriaSimpleText.php
@@ -5,9 +5,7 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
 
-<?php
 /**
  * Description of RuleCriteriaSimpleText
  *
diff --git a/interface/super/rules/library/RuleCriteriaSurgery.php b/interface/super/rules/library/RuleCriteriaSurgery.php
index 17f90d3f6..84255b8ed 100644
--- a/interface/super/rules/library/RuleCriteriaSurgery.php
+++ b/interface/super/rules/library/RuleCriteriaSurgery.php
@@ -5,9 +5,7 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
 
-<?php
 require_once( library_src( 'RuleCriteriaSimpleText.php') );
 
 /**
diff --git a/interface/super/rules/library/RuleCriteriaTargetFactory.php b/interface/super/rules/library/RuleCriteriaTargetFactory.php
index 26d40ebce..ed02ba66e 100644
--- a/interface/super/rules/library/RuleCriteriaTargetFactory.php
+++ b/interface/super/rules/library/RuleCriteriaTargetFactory.php
@@ -5,9 +5,7 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
 
-<?php
 require_once( library_src( 'RuleCriteriaFactory.php') );
 
 /**
diff --git a/interface/super/rules/library/RuleCriteriaType.php b/interface/super/rules/library/RuleCriteriaType.php
index 354964fe8..6a85adcce 100644
--- a/interface/super/rules/library/RuleCriteriaType.php
+++ b/interface/super/rules/library/RuleCriteriaType.php
@@ -5,9 +5,7 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
 
-<?php
 /**
  * Description of RuleCriteriaType
  *
diff --git a/interface/super/rules/library/RuleFilters.php b/interface/super/rules/library/RuleFilters.php
index 8d3f9375e..441a4cd75 100644
--- a/interface/super/rules/library/RuleFilters.php
+++ b/interface/super/rules/library/RuleFilters.php
@@ -5,9 +5,7 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
 
-<?php
 /**
  * Description of RuleFilter
  *
diff --git a/interface/super/rules/library/RuleManager.php b/interface/super/rules/library/RuleManager.php
index 079b115ba..a910f4ec1 100644
--- a/interface/super/rules/library/RuleManager.php
+++ b/interface/super/rules/library/RuleManager.php
@@ -5,9 +5,6 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
-
-<?php
 
 require_once( src_dir() . "/clinical_rules.php");
 require_once( library_src( 'RuleCriteriaFilterFactory.php') );
diff --git a/interface/super/rules/library/RuleTargetActionGroup.php b/interface/super/rules/library/RuleTargetActionGroup.php
index 401a91697..abf81d7ee 100644
--- a/interface/super/rules/library/RuleTargetActionGroup.php
+++ b/interface/super/rules/library/RuleTargetActionGroup.php
@@ -5,9 +5,7 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
 
-<?php
 /**
  * Description of RuleGroup
  *
diff --git a/interface/super/rules/library/RuleTargets.php b/interface/super/rules/library/RuleTargets.php
index 6a8dae8d0..d4c92855c 100644
--- a/interface/super/rules/library/RuleTargets.php
+++ b/interface/super/rules/library/RuleTargets.php
@@ -5,9 +5,7 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
 
-<?php
 /**
  * Description of RuleTargets
  *
diff --git a/interface/super/rules/library/RuleType.php b/interface/super/rules/library/RuleType.php
index 74458b2dc..399c64ea6 100644
--- a/interface/super/rules/library/RuleType.php
+++ b/interface/super/rules/library/RuleType.php
@@ -5,9 +5,7 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
 
-<?php
 /**
  * Enumerates rule types
  * todo turn this into a real enum
diff --git a/interface/super/rules/library/TimeUnit.php b/interface/super/rules/library/TimeUnit.php
index 918d4df44..d2de089d7 100644
--- a/interface/super/rules/library/TimeUnit.php
+++ b/interface/super/rules/library/TimeUnit.php
@@ -5,9 +5,7 @@
  // modify it under the terms of the GNU General Public License
  // as published by the Free Software Foundation; either version 2
  // of the License, or (at your option) any later version.
-?>
 
-<?php
 /**
  * todo docs
  * enum
diff --git a/library/clinical_rules.php b/library/clinical_rules.php
index 81f908ea6..2ec6d6869 100644
--- a/library/clinical_rules.php
+++ b/library/clinical_rules.php
@@ -1780,6 +1780,3 @@ function convertDobtoAgeMonthDecimal($dob,$target) {
 
     return (12 * $iDiffYear) + $iDiffMonth;
 }
-
-?>
-
-- 
2.11.4.GIT