From 37ca34a6b57cd24b624f6f3d0d51e77e0272a2bc Mon Sep 17 00:00:00 2001 From: Paolo Date: Wed, 11 Jul 2018 12:13:39 +0200 Subject: [PATCH] - Renamed helpers to avoid conflicts with CI helpers - Adapted helpers includes --- application/controllers/api/v1/Test.php | 2 +- application/controllers/jobs/AmpelMail.php | 2 +- application/core/APIv1_Controller.php | 4 ++-- application/core/Auth_Controller.php | 2 +- application/core/FHC_Controller.php | 8 ++++---- .../{fhcauth_helper.php => fhc_authentication_helper.php} | 0 .../helpers/{fhc_helper.php => fhc_common_helper.php} | 0 .../{language_helper.php => fhc_language_helper.php} | 0 .../{message_helper.php => fhc_message_helper.php} | 0 .../helpers/{sancho_helper.php => fhc_sancho_helper.php} | 0 .../{session_helper.php => fhc_session_helper.php} | 0 application/libraries/FiltersLib.php | 2 +- application/models/system/MessageToken_model.php | 2 +- 13 files changed, 11 insertions(+), 11 deletions(-) rename application/helpers/{fhcauth_helper.php => fhc_authentication_helper.php} (100%) rename application/helpers/{fhc_helper.php => fhc_common_helper.php} (100%) rename application/helpers/{language_helper.php => fhc_language_helper.php} (100%) rename application/helpers/{message_helper.php => fhc_message_helper.php} (100%) rename application/helpers/{sancho_helper.php => fhc_sancho_helper.php} (100%) rename application/helpers/{session_helper.php => fhc_session_helper.php} (100%) diff --git a/application/controllers/api/v1/Test.php b/application/controllers/api/v1/Test.php index f0e05e880..fa79f1c1e 100644 --- a/application/controllers/api/v1/Test.php +++ b/application/controllers/api/v1/Test.php @@ -14,7 +14,7 @@ class Test extends REST_Controller parent::__construct(); // Loads helper message to manage returning messages - $this->load->helper('message'); + $this->load->helper('fhc_message'); } /** diff --git a/application/controllers/jobs/AmpelMail.php b/application/controllers/jobs/AmpelMail.php index 66938d822..5727187d9 100644 --- a/application/controllers/jobs/AmpelMail.php +++ b/application/controllers/jobs/AmpelMail.php @@ -44,7 +44,7 @@ class AmpelMail extends FHC_Controller $this->load->model('person/Person_model', 'PersonModel'); // Load helpers - $this->load->helper('sancho'); + $this->load->helper('fhc_sancho'); } /** diff --git a/application/core/APIv1_Controller.php b/application/core/APIv1_Controller.php index 67841d7fa..11ed9fc98 100644 --- a/application/core/APIv1_Controller.php +++ b/application/core/APIv1_Controller.php @@ -12,10 +12,10 @@ class APIv1_Controller extends REST_Controller parent::__construct(); // Loads helper message to manage returning messages - $this->load->helper('message'); + $this->load->helper('fhc_message'); // Loads helper with generic utility function - $this->load->helper('fhc'); + $this->load->helper('fhc_common'); // Loads permission lib $this->load->library('PermissionLib'); diff --git a/application/core/Auth_Controller.php b/application/core/Auth_Controller.php index c3be8b4d9..3cdde3e0e 100644 --- a/application/core/Auth_Controller.php +++ b/application/core/Auth_Controller.php @@ -12,7 +12,7 @@ class Auth_Controller extends FHC_Controller parent::__construct(); // Loads authentication helper - $this->load->helper('fhcauth'); + $this->load->helper('fhc_authentication'); // Checks if the caller is allowed to access to this content $this->_isAllowed($requiredPermissions); diff --git a/application/core/FHC_Controller.php b/application/core/FHC_Controller.php index b62d3f9b8..33bde6c4e 100644 --- a/application/core/FHC_Controller.php +++ b/application/core/FHC_Controller.php @@ -21,16 +21,16 @@ class FHC_Controller extends CI_Controller $this->_controllerId = null; // set _controllerId as null by default // Loads helper message to manage returning messages - $this->load->helper('message'); + $this->load->helper('fhc_message'); // Loads helper with generic utility function - $this->load->helper('fhc'); + $this->load->helper('fhc_common'); // Loads helper session to manage the php session - $this->load->helper('session'); + $this->load->helper('fhc_session'); // Loads language helper - $this->load->helper('language'); + $this->load->helper('fhc_language'); } //------------------------------------------------------------------------------------------------------------------ diff --git a/application/helpers/fhcauth_helper.php b/application/helpers/fhc_authentication_helper.php similarity index 100% rename from application/helpers/fhcauth_helper.php rename to application/helpers/fhc_authentication_helper.php diff --git a/application/helpers/fhc_helper.php b/application/helpers/fhc_common_helper.php similarity index 100% rename from application/helpers/fhc_helper.php rename to application/helpers/fhc_common_helper.php diff --git a/application/helpers/language_helper.php b/application/helpers/fhc_language_helper.php similarity index 100% rename from application/helpers/language_helper.php rename to application/helpers/fhc_language_helper.php diff --git a/application/helpers/message_helper.php b/application/helpers/fhc_message_helper.php similarity index 100% rename from application/helpers/message_helper.php rename to application/helpers/fhc_message_helper.php diff --git a/application/helpers/sancho_helper.php b/application/helpers/fhc_sancho_helper.php similarity index 100% rename from application/helpers/sancho_helper.php rename to application/helpers/fhc_sancho_helper.php diff --git a/application/helpers/session_helper.php b/application/helpers/fhc_session_helper.php similarity index 100% rename from application/helpers/session_helper.php rename to application/helpers/fhc_session_helper.php diff --git a/application/libraries/FiltersLib.php b/application/libraries/FiltersLib.php index efb41b449..22fd77d4b 100644 --- a/application/libraries/FiltersLib.php +++ b/application/libraries/FiltersLib.php @@ -87,7 +87,7 @@ class FiltersLib $this->_ci =& get_instance(); // get code igniter instance // Loads authentication helper - $this->_ci->load->helper('fhcauth'); // NOTE: needed to load custom filters do not remove! + $this->_ci->load->helper('fhc_authentication'); // NOTE: needed to load custom filters do not remove! $this->_filterUniqueId = $this->_getFilterUniqueId($params); // sets the id for the related filter widget } diff --git a/application/models/system/MessageToken_model.php b/application/models/system/MessageToken_model.php index d3277e720..04f23382d 100644 --- a/application/models/system/MessageToken_model.php +++ b/application/models/system/MessageToken_model.php @@ -18,7 +18,7 @@ class MessageToken_model extends CI_Model $this->config->load('message'); // Load return message helper - $this->load->helper('message'); + $this->load->helper('fhc_message'); // Loads the database object $this->load->database();