#3818 change methods visibility

centreon · Oct 13, 2015 · 79ff4bf · 79ff4bf
1 parent b4dd29b
commit 79ff4bf
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 11 deletions.
diff --git a/www/class/config-generate/contact.class.php b/www/class/config-generate/contact.class.php
@@ -4,8 +4,8 @@ class Contact extends AbstractObject {
     private $use_cache = 1;
     private $done_cache = 0;
     private $contacts_service_linked_cache = array();
-    private $contacts_cache = array();
-    private $contacts = array();
+    protected $contacts_cache = array();
+    protected $contacts = array();
     protected $generate_filename = 'contacts.cfg';
     protected $object_name = 'contact';
     protected $attributes_select = '
@@ -109,7 +109,7 @@ public function getContactForService($service_id) {
         return $this->contacts_service_linked_cache[$service_id];
     }
 
-    private function getContactFromId($contact_id) {
+    protected function getContactFromId($contact_id) {
         if (is_null($this->stmt_contact)) {
             $this->stmt_contact = $this->backend_instance->db->prepare("SELECT 
                     $this->attributes_select
@@ -149,7 +149,7 @@ protected function getContactNotificationCommands($contact_id, $label) {
         }        
     }
 
-    private function buildCache() {
+    protected function buildCache() {
         if ($this->done_cache == 1) {
             return 0;
         }

diff --git a/www/class/config-generate/contactgroup.class.php b/www/class/config-generate/contactgroup.class.php
@@ -4,8 +4,8 @@ class Contactgroup extends AbstractObject {
     private $use_cache = 1;
     private $done_cache = 0;
     private $cg_service_linked_cache = array();
-    private $cg_cache = array();
-    private $cg = null;
+    protected $cg_cache = array();
+    protected $cg = null;
     protected $generate_filename = 'contactgroups.cfg';
     protected $object_name = 'contactgroup';
     protected $attributes_select = '
@@ -24,7 +24,7 @@ class Contactgroup extends AbstractObject {
     protected $stmt_contact = null;
     protected $stmt_cg_service = null;
 
-    private function getCgCache() {
+    protected function getCgCache() {
         $stmt = $this->backend_instance->db->prepare("SELECT 
                     $this->attributes_select
                 FROM contactgroup
@@ -49,7 +49,7 @@ private function getCgForServiceCache() {
         }
     }
 
-    private function buildCache() {
+    protected function buildCache() {
         if ($this->done_cache == 1) {
             return 0;
         }
@@ -84,7 +84,7 @@ public function getCgForService($service_id) {
         return $this->cg_service_linked_cache[$service_id];
     }
 
-    private function getCgFromId($cg_id) {
+    public function getCgFromId($cg_id) {
         if (is_null($this->stmt_cg)) {
             $this->stmt_cg = $this->backend_instance->db->prepare("SELECT 
                     $this->attributes_select
@@ -96,9 +96,10 @@ private function getCgFromId($cg_id) {
         $this->stmt_cg->execute();
         $results = $this->stmt_cg->fetchAll(PDO::FETCH_ASSOC);
         $this->cg[$cg_id] = array_pop($results);
+        return $this->cg[$cg_id];
     }
 
-    protected function getContactFromCgId($cg_id) {
+    public function getContactFromCgId($cg_id) {
         if (!isset($this->cg[$cg_id]['members_cache'])) {
             if (is_null($this->stmt_contact)) {
                 $this->stmt_contact = $this->backend_instance->db->prepare("SELECT 

diff --git a/www/class/config-generate/host.class.php b/www/class/config-generate/host.class.php
@@ -160,6 +160,10 @@ protected function getSeverity($host_id_arg) {
         # For applied on services without severity
         $this->hosts[$host_id_arg]['severity_id_for_services'] = $severity_instance->getHostSeverityById($severity_id);
     }
+
+    public function addHost($host_id, $attr = array()) {
+        $this->hosts[$host_id] = $attr;
+    }
 
     private function getHosts($poller_id) {        
         # We use host_register = 1 because we don't want _Module_* hosts

diff --git a/www/class/config-generate/service.class.php b/www/class/config-generate/service.class.php
@@ -52,6 +52,10 @@ private function getServiceCache() {
         $stmt->execute();
         $this->service_cache = $stmt->fetchAll(PDO::FETCH_GROUP|PDO::FETCH_UNIQUE|PDO::FETCH_ASSOC);
     }
+
+    public function addServiceCache($service_id, $attr = array()) {
+        $this->service_cache[$service_id] = $attr;
+    }
 
     private function getServiceFromId($service_id) {
         if (is_null($this->stmt_service)) {
@@ -208,7 +212,7 @@ private function clean(&$service) {
         }
     }
 
-    private function addGeneratedServices($host_id, $service_id) {
+    public function addGeneratedServices($host_id, $service_id) {
         if (!isset($this->generated_services[$host_id])) {
             $this->generated_services[$host_id] = array();
         }