PHP7 Project. Commit 13. Fixed more deprecated constructors, take 4.

Most recent commit included from practiceprovider/php7-deprecated-constructors branch is: 0d82bf7
DiscoverAndChange · Feb 6, 2016 · 8289682 · 8289682
1 parent 4a9c55b
commit 8289682
Show file tree

Hide file tree

Showing 70 changed files with 128 additions and 128 deletions.
diff --git a/contrib/forms/soap2/C_FormSOAP.class.php b/contrib/forms/soap2/C_FormSOAP.class.php
@@ -8,8 +8,8 @@ class C_FormSOAP extends Controller {
 
  var $template_dir;
 
- function C_FormSOAP($template_mod = "general") {
- parent::Controller();
+ function __construct($template_mod = "general") {
+ parent::__construct();
  $this->template_mod = $template_mod;
  $this->template_dir = dirname(__FILE__) . "/templates/";
  $this->assign("FORM_ACTION", $GLOBALS['web_root']);

diff --git a/contrib/forms/soap2/FormSOAP.class.php b/contrib/forms/soap2/FormSOAP.class.php
@@ -52,7 +52,7 @@ class FormSOAP extends ORDataObject {
  * Constructor sets all Form attributes to their default value
  */
 
- function FormSOAP($id= "", $_prefix = "") {
+ function __construct($id= "", $_prefix = "") {
  if (is_numeric($id)) {
  $this->id = $id;
  }

diff --git a/controllers/C_BillingContact.class.php b/controllers/C_BillingContact.class.php
@@ -8,8 +8,8 @@ class C_InsuranceCompany extends Controller {
  var $template_mod;
  var $icompanies;
 
- function C_InsuranceCompany($template_mod = "general") {
- parent::Controller();
+ function __construct($template_mod = "general") {
+ parent::__construct();
  $this->icompanies = array();
  $this->template_mod = $template_mod;
  $this->assign("FORM_ACTION", $GLOBALS['webroot']."/controller.php?" . $_SERVER['QUERY_STRING']);

diff --git a/controllers/C_Document.class.php b/controllers/C_Document.class.php
@@ -23,8 +23,8 @@ class C_Document extends Controller {
  var $_config;
  var $manual_set_owner=false; // allows manual setting of a document owner/service
 
- function C_Document($template_mod = "general") {
- parent::Controller();
+ function __construct($template_mod = "general") {
+ parent::__construct();
  $this->documents = array();
  $this->template_mod = $template_mod;
  $this->assign("FORM_ACTION", $GLOBALS['webroot']."/controller.php?" . $_SERVER['QUERY_STRING']);

diff --git a/controllers/C_DocumentCategory.class.php b/controllers/C_DocumentCategory.class.php
@@ -11,8 +11,8 @@ class C_DocumentCategory extends Controller {
  var $tree;
  var $link;
 
- function C_DocumentCategory($template_mod = "general") {
- parent::Controller();
+ function __construct($template_mod = "general") {
+ parent::__construct();
  $this->document_categories = array();
  $this->template_mod = $template_mod;
  $this->assign("FORM_ACTION", $GLOBALS['webroot']."/controller.php?" . $_SERVER['QUERY_STRING']);

diff --git a/controllers/C_Hl7.class.php b/controllers/C_Hl7.class.php
@@ -6,8 +6,8 @@
 
 class C_Hl7 extends Controller {
 
- function C_Hl7($template_mod = "general") {
- parent::Controller();
+ function __construct($template_mod = "general") {
+ parent::__construct();
  $this->template_mod = $template_mod;
  $this->assign("STYLE", $GLOBALS['style']);
  }

diff --git a/controllers/C_InsuranceCompany.class.php b/controllers/C_InsuranceCompany.class.php
@@ -10,8 +10,8 @@ class C_InsuranceCompany extends Controller {
  var $template_mod;
  var $icompanies;
 
- function C_InsuranceCompany($template_mod = "general") {
- parent::Controller();
+ function __construct($template_mod = "general") {
+ parent::__construct();
  $this->icompanies = array();
  $this->template_mod = $template_mod;
  $this->assign("FORM_ACTION", $GLOBALS['webroot']."/controller.php?" . $_SERVER['QUERY_STRING']);

diff --git a/controllers/C_InsuranceNumbers.class.php b/controllers/C_InsuranceNumbers.class.php
@@ -10,8 +10,8 @@ class C_InsuranceNumbers extends Controller {
  var $providers;
  var $insurance_numbers;
 
- function C_InsuranceNumbers($template_mod = "general") {
- parent::Controller();
+ function __construct($template_mod = "general") {
+ parent::__construct();
  $this->providers = array();
  $this->insurance_numbers = array();
  $this->template_mod = $template_mod;

diff --git a/controllers/C_PatientFinder.class.php b/controllers/C_PatientFinder.class.php
@@ -9,8 +9,8 @@ class C_PatientFinder extends Controller {
  var $template_mod;
  var $_db;
 
- function C_PatientFinder($template_mod = "general") {
- parent::Controller();
+ function __construct($template_mod = "general") {
+ parent::__construct();
  $this->_db = $GLOBALS['adodb']['db']; 
  $this->template_mod = $template_mod;
  $this->assign("FORM_ACTION", $GLOBALS['webroot']."/controller.php?" . $_SERVER['QUERY_STRING']);

diff --git a/controllers/C_Pharmacy.class.php b/controllers/C_Pharmacy.class.php
@@ -8,8 +8,8 @@ class C_Pharmacy extends Controller {
  var $template_mod;
  var $pharmacies;
 
- function C_Pharmacy($template_mod = "general") {
- parent::Controller();
+ function __construct($template_mod = "general") {
+ parent::__construct();
  $this->pharmacies = array();
  $this->template_mod = $template_mod;
  $this->assign("FORM_ACTION", $GLOBALS['webroot']."/controller.php?" . $_SERVER['QUERY_STRING']);

diff --git a/controllers/C_PracticeSettings.class.php b/controllers/C_PracticeSettings.class.php
@@ -10,8 +10,8 @@ class C_PracticeSettings extends Controller {
 
  var $template_mod;
 
- function C_PracticeSettings ($template_mod = "general") {
- parent::Controller();
+ function __construct ($template_mod = "general") {
+ parent::__construct();
  $this->template_mod = $template_mod;
  $this->assign("FORM_ACTION", $GLOBALS['webroot']."/controller.php?" . $_SERVER['QUERY_STRING']);
  $this->assign("TOP_ACTION", $GLOBALS['webroot']."/controller.php?" . "practice_settings" . "&");

diff --git a/controllers/C_Prescription.class.php b/controllers/C_Prescription.class.php
@@ -36,8 +36,8 @@ class C_Prescription extends Controller {
  var $is_faxing = false;
  var $is_print_to_fax = false;
 
- function C_Prescription($template_mod = "general") {
- parent::Controller();
+ function __construct($template_mod = "general") {
+ parent::__construct();
 
  $this->template_mod = $template_mod;
  $this->assign("FORM_ACTION", $GLOBALS['webroot']."/controller.php?" . $_SERVER['QUERY_STRING']);

diff --git a/controllers/C_X12Partner.class.php b/controllers/C_X12Partner.class.php
@@ -9,8 +9,8 @@ class C_X12Partner extends Controller {
  var $providers;
  var $x12_partners;
 
- function C_X12Partner($template_mod = "general") {
- parent::Controller();
+ function __construct($template_mod = "general") {
+ parent::__construct();
  $this->x12_partner = array();
  $this->template_mod = $template_mod;
  $this->assign("FORM_ACTION", $GLOBALS['webroot']."/controller.php?" . $_SERVER['QUERY_STRING']);

diff --git a/interface/forms/ros/C_FormROS.class.php b/interface/forms/ros/C_FormROS.class.php
@@ -8,8 +8,8 @@ class C_FormROS extends Controller {
 
  var $template_dir;
 
- function C_FormROS($template_mod = "general") {
- parent::Controller();
+ function __construct($template_mod = "general") {
+ parent::__construct();
  $returnurl = $GLOBALS['concurrent_layout'] ? 'encounter_top.php' : 'patient_encounter.php';
  $this->template_mod = $template_mod;
  $this->template_dir = dirname(__FILE__) . "/templates/ros/";

diff --git a/interface/forms/ros/FormROS.class.php b/interface/forms/ros/FormROS.class.php
@@ -171,7 +171,7 @@ class FormROS extends ORDataObject {
  * Constructor sets all Form attributes to their default value
  */
 
- function FormROS($id= "", $_prefix = "") {
+ function __construct($id= "", $_prefix = "") {
  if (is_numeric($id)) {
  $this->id = $id;
  }

diff --git a/interface/forms/soap/C_FormSOAP.class.php b/interface/forms/soap/C_FormSOAP.class.php
@@ -8,8 +8,8 @@ class C_FormSOAP extends Controller {
 
  var $template_dir;
 
- function C_FormSOAP($template_mod = "general") {
- parent::Controller();
+ function __construct($template_mod = "general") {
+ parent::__construct();
  $this->template_mod = $template_mod;
  $this->template_dir = dirname(__FILE__) . "/templates/";
  $this->assign("FORM_ACTION", $GLOBALS['web_root']);

diff --git a/interface/forms/soap/FormSOAP.class.php b/interface/forms/soap/FormSOAP.class.php
@@ -40,7 +40,7 @@ class FormSOAP extends ORDataObject {
  * Constructor sets all Form attributes to their default value
  */
 
- function FormSOAP($id= "", $_prefix = "") {
+ function __construct($id= "", $_prefix = "") {
  if (is_numeric($id)) {
  $this->id = $id;
  }

diff --git a/interface/forms/vitals/C_FormVitals.class.php b/interface/forms/vitals/C_FormVitals.class.php
@@ -9,8 +9,8 @@ class C_FormVitals extends Controller {
 
  var $template_dir;
 
- function C_FormVitals($template_mod = "general") {
- parent::Controller();
+ function __construct($template_mod = "general") {
+ parent::__construct();
  $returnurl = $GLOBALS['concurrent_layout'] ? 'encounter_top.php' : 'patient_encounter.php';
  $this->template_mod = $template_mod;
  $this->template_dir = dirname(__FILE__) . "/templates/vitals/";

diff --git a/interface/forms/vitals/FormVitals.class.php b/interface/forms/vitals/FormVitals.class.php
@@ -51,7 +51,7 @@ class FormVitals extends ORDataObject {
  * Constructor sets all Form attributes to their default value
  */
 
- function FormVitals($id= "", $_prefix = "") {
+ function __construct($id= "", $_prefix = "") {
  if ($id > 0) {
  $this->id = $id;
 

diff --git a/interface/super/rules/library/CdrHelper.class.php b/interface/super/rules/library/CdrHelper.class.php
@@ -25,7 +25,7 @@ class CdrResults{
  var $reminder_flag;
  var $access_control;
 
- function CdrResults($rule_id = "", $active_alert_flag = "", $passive_alert_flag = "", $patient_reminder_flag = "", $access_control = "") {
+ function __construct($rule_id = "", $active_alert_flag = "", $passive_alert_flag = "", $patient_reminder_flag = "", $access_control = "") {
  $this->id = $rule_id;
  $this->rule = getLabel($this->id,'clinical_rules');
  $this->active_flag = $active_alert_flag;

diff --git a/library/Smarty.class.php b/library/Smarty.class.php
@@ -568,7 +568,7 @@ class Smarty
  /**
  * The class constructor.
  */
- function Smarty()
+ function __construct()
  {
  $this->assign('SCRIPT_NAME', isset($_SERVER['SCRIPT_NAME']) ? $_SERVER['SCRIPT_NAME']
  : @$GLOBALS['HTTP_SERVER_VARS']['SCRIPT_NAME']);

diff --git a/library/classes/Address.class.php b/library/classes/Address.class.php
@@ -27,7 +27,7 @@ class Address extends ORDataObject{
  /**
  * Constructor sets all Address attributes to their default value
  */
- function Address($id = "", $foreign_id = "") {
+ function __construct($id = "", $foreign_id = "") {
  $this->id = $id;
  $this->foreign_id = $foreign_id;
  $this->_table = "addresses";

diff --git a/library/classes/CategoryTree.class.php b/library/classes/CategoryTree.class.php
@@ -13,9 +13,9 @@ class CategoryTree extends Tree {
  /*
  * This just sits on top of the parent constructor, only a shell so that the _table var gets set
  */
- function CategoryTree($root,$root_type = ROOT_TYPE_ID) {
+ function __construct($root,$root_type = ROOT_TYPE_ID) {
  $this->_table = "categories";
- parent::Tree($root,$root_type);
+ parent::__construct($root,$root_type);
  }
 
  function _get_categories_array($patient_id) {

diff --git a/library/classes/Company.class.php b/library/classes/Company.class.php
@@ -28,7 +28,7 @@ class Company extends ORDataObject{
  /**
  * Constructor sets all Company attributes to their default value
  */
- function company($id = "", $foreign_id = "") {
+ function __construct($id = "", $foreign_id = "") {
  $this->id = $id;
  $this->name = "";
  $this->foreign_id = $foreign_id;

diff --git a/library/classes/ConfigTree.class.php b/library/classes/ConfigTree.class.php
@@ -12,9 +12,9 @@ class ConfigTree extends Tree {
  /*
  * This just sits on top of the parent constructor, only a shell so that the _table var gets set
  */
- function ConfigTree($root,$root_type = ROOT_TYPE_ID) {
+ function __construct($root,$root_type = ROOT_TYPE_ID) {
  $this->_table = "config";
- parent::Tree($root,$root_type);
+ parent::__construct($root,$root_type);
  }
 }
 ?>
diff --git a/library/classes/Controller.class.php b/library/classes/Controller.class.php
@@ -13,8 +13,8 @@ class Controller extends Smarty {
  var $_state;
  var $_args = array();
 
- function Controller() {
- parent::Smarty();
+ function __construct() {
+ parent::__construct();
  $this->template_mod = "general";
  $this->_current_action = "";
  $this->_state = true;

diff --git a/library/classes/CouchDB.class.php b/library/classes/CouchDB.class.php
@@ -26,7 +26,7 @@
 // +------------------------------------------------------------------------------+
 
 class CouchDB {
- function CouchDB() {
+ function __construct() {
  $this->host = $GLOBALS['couchdb_host'];
  $this->user = ($GLOBALS['couchdb_user'] != '') ? $GLOBALS['couchdb_user'] : null;
  $this->pass = ($GLOBALS['couchdb_pass'] != '') ? $GLOBALS['couchdb_pass'] : null;

diff --git a/library/classes/Document.class.php b/library/classes/Document.class.php
@@ -115,9 +115,9 @@ class Document extends ORDataObject{
  * Constructor sets all Document attributes to their default value
  * @param int $id optional existing id of a specific document, if omitted a "blank" document is created 
  */
- function Document($id = "") {
+ function __construct($id = "") {
  //call the parent constructor so we have a _db to work with
- parent::ORDataObject();
+ parent::__construct();
 
  //shore up the most basic ORDataObject bits
  $this->id = $id;

diff --git a/library/classes/InsuranceCompany.class.php b/library/classes/InsuranceCompany.class.php
@@ -131,7 +131,7 @@ class InsuranceCompany extends ORDataObject{
  /**
  * Constructor sets all Insurance Company attributes to their default value
  */
- function InsuranceCompany($id = "", $prefix = "") {
+ function __construct($id = "", $prefix = "") {
  $this->id = $id;
  $this->name = "";
  $this->_table = "insurance_companies";

diff --git a/library/classes/InsuranceNumbers.class.php b/library/classes/InsuranceNumbers.class.php
@@ -32,7 +32,7 @@ class InsuranceNumbers extends ORDataObject{
  * Constructor sets all Insurance attributes to their default value
  */
 
- function InsuranceNumbers ($id = "", $prefix = "") {
+ function __construct ($id = "", $prefix = "") {
  $this->id = $id;
  $this->_table = "insurance_numbers";
  if ($id != "") {

diff --git a/library/classes/Note.class.php b/library/classes/Note.class.php
@@ -51,9 +51,9 @@ class Note extends ORDataObject{
  * Constructor sets all Note attributes to their default value
  * @param int $id optional existing id of a specific note, if omitted a "blank" note is created 
  */
- function Note($id = "") {
+ function __construct($id = "") {
  //call the parent constructor so we have a _db to work with
- parent::ORDataObject();
+ parent::__construct();
 
  //shore up the most basic ORDataObject bits
  $this->id = $id;

diff --git a/library/classes/NumberToText.class.php b/library/classes/NumberToText.class.php
@@ -38,7 +38,7 @@ class NumberToText {
  var $capatalize;
  var $and;
 
- function NumberToText($number, $currency = false, $capatalize = false, $and = false) {
+ function __construct($number, $currency = false, $capatalize = false, $and = false) {
  $this->number = $number;
  $this->currency = $currency;
  $this->capatalize = $capatalize;

diff --git a/library/classes/OFX.class.php b/library/classes/OFX.class.php
@@ -13,7 +13,7 @@ class OFX {
  /**
  * Constructor sets all OFX attributes to their default value
  */
- function OFX($ba = array()) {
+ function __construct($ba = array()) {
  $this->billing_array = $ba;
  $this->config = $GLOBALS['oer_config']['ofx'];
  }

diff --git a/library/classes/ORDataObject.class.php b/library/classes/ORDataObject.class.php
@@ -16,7 +16,7 @@ class ORDataObject {
  var $_table;
  var $_db;
 
- function ORDataObject() {
+ function __construct() {
  $this->_db = $GLOBALS['adodb']['db']; 
  }
 

diff --git a/library/classes/PDF_Label.php b/library/classes/PDF_Label.php
@@ -91,7 +91,7 @@ class PDF_Label extends FPDF {
  );
 
  // Constructor
- function PDF_Label($format, $unit='mm', $posX=1, $posY=1) {
+ function __construct($format, $unit='mm', $posX=1, $posY=1) {
  if (is_array($format)) {
  // Custom format
  $Tformat = $format;
@@ -102,7 +102,7 @@ function PDF_Label($format, $unit='mm', $posX=1, $posY=1) {
  $Tformat = $this->_Avery_Labels[$format];
  }
 
- parent::FPDF('P', $unit, $Tformat['paper-size']);
+ parent::__construct('P', $unit, $Tformat['paper-size']);
  $this->_Metric_Doc = $unit;
  $this->_Set_Format($Tformat);
  $this->SetFont('Arial');

diff --git a/library/classes/POSRef.class.php b/library/classes/POSRef.class.php
@@ -4,7 +4,7 @@ class POSRef {
 
  var $pos_ref;
 
- function POSRef($state = "") {
+ function __construct($state = "") {
  $this->pos_ref = array();
  $this->pos_ref = POSRef::init_pos();
  $this->pos_ref = array_merge ($this->pos_ref,$this->state_overides($state)); 

diff --git a/library/classes/PQRIXml.class.php b/library/classes/PQRIXml.class.php
@@ -12,8 +12,8 @@
 
 class PQRIXml extends XmlWriterOemr {
 
- function PQRIXml($indent = ' ') {
- parent::XmlWriterOemr($indent);
+ function __construct($indent = ' ') {
+ parent::__construct($indent);
  }
 
  function open_submission() {

diff --git a/library/classes/Patient.class.php b/library/classes/Patient.class.php
@@ -27,7 +27,7 @@ class Patient extends ORDataObject{
  /**
  * Constructor sets all Prescription attributes to their default value
  */
- function Patient($id = "") {
+ function __construct($id = "") {
  $this->id = $id;
  $this->_table = "patient_data";
  $this->pubpid = "";