Code cleanup, fixes and updates for current versions of CiviCRM

CRM/Admin/Form/AdhocChargesItem.php

@@ -1,5 +1,5 @@
 <?php
-use CRM_Booking_ExtensionUtil as E; 
+use CRM_Booking_ExtensionUtil as E;
 /*
  +--------------------------------------------------------------------+
  | CiviCRM version 4.4                                                |
@@ -38,7 +38,7 @@
  *
  */
 class CRM_Admin_Form_AdhocChargesItem extends CRM_Admin_Form {
-  protected $_id = NULL;
+  public $_id = NULL;
 
   function preProcess() {
     parent::preProcess();

CRM/Admin/Form/Resource.php

@@ -1,5 +1,5 @@
 <?php
-use CRM_Booking_ExtensionUtil as E; 
+use CRM_Booking_ExtensionUtil as E;
 /*
  +--------------------------------------------------------------------+
  | CiviCRM version 4.4                                                |
@@ -38,7 +38,7 @@
  *
  */
 class CRM_Admin_Form_Resource extends CRM_Admin_Form {
-  protected $_id = NULL;
+  public $_id = NULL;
 
   function preProcess() {
     parent::preProcess();
@@ -88,13 +88,13 @@ public function buildQuickForm($check = FALSE) {
       foreach ($activeSets['values'] as $key => $set) {
         $configSets[$key] = $set['title'];
       }
-      
+
       $resource = civicrm_api3('Resource', 'getsingle', array(
         'sequential' => 1,
         'id' => $this->_id,
       ));
     }
-    catch (CiviCRM_API3_Exception $e) {}   
+    catch (CiviCRM_API3_Exception $e) {}
 
     //allow state changes only when there is enabled config set
     if(!empty($resource['set_id']) && !in_array($resource['set_id'], array_keys($activeSets['values']))){

CRM/Admin/Form/ResourceConfigOption.php

@@ -1,5 +1,5 @@
 <?php
-use CRM_Booking_ExtensionUtil as E; 
+use CRM_Booking_ExtensionUtil as E;
 /*
  +--------------------------------------------------------------------+
  | CiviCRM version 4.4                                                |
@@ -38,7 +38,7 @@
  *
  */
 class CRM_Admin_Form_ResourceConfigOption extends CRM_Admin_Form {
-  protected $_id = NULL;
+  public $_id = NULL;
   protected $_sid = NULL;
 
   function preProcess() {

CRM/Admin/Form/ResourceConfigSet.php

@@ -1,5 +1,5 @@
 <?php
-use CRM_Booking_ExtensionUtil as E; 
+use CRM_Booking_ExtensionUtil as E;
 /*
  +--------------------------------------------------------------------+
  | CiviCRM version 4.4                                                |
@@ -38,7 +38,7 @@
  *
  */
 class CRM_Admin_Form_ResourceConfigSet extends CRM_Admin_Form {
-  protected $_id = NULL;
+  public $_id = NULL;
 
   function preProcess() {
     parent::preProcess();
@@ -61,13 +61,13 @@ public function buildQuickForm($check = FALSE) {
     $this->add('text', 'title', E::ts('Title'), array('size' => 50, 'maxlength' => 255), TRUE);
     $this->add('text', 'weight', E::ts('Weight'), CRM_Core_DAO::getAttribute('CRM_Booking_DAO_ResourceConfigSet', 'weight'), TRUE);
     $statusCheckbox = $this->add('checkbox', 'is_active', E::ts('Enabled?'));
-    
+
     //allow state changes and delete only when there are no enabled resources
     $resourceDao = new CRM_Booking_DAO_Resource();
     $resourceDao->set_id = $this->_id;
     $resourceDao->is_deleted = FALSE;
     $resourceDao->is_active = TRUE;
-    
+
     if($resourceDao->count() > 0){
       $statusCheckbox->setAttribute('disabled', 'disabled');
     }

CRM/Booking/BAO/Query.php

@@ -1,5 +1,5 @@
 <?php
-use CRM_Booking_ExtensionUtil as E; 
+use CRM_Booking_ExtensionUtil as E;
 
 /*
  +--------------------------------------------------------------------+