diff --git a/README.md b/README.md index e6d9d1ed..53b2cbb6 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Cost Benefit Projection (3.4.x) +# Cost Benefit Projection (3.5.x) This is a [Joomla 3.x](http://www.joomla.org/) component. @@ -22,12 +22,12 @@ max_input_vars = 5000 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Cost Benefit Projection](https://www.staffhealthcbp.com/) + *First Build*: 15th June, 2012 -+ *Last Build*: 2nd March, 2022 -+ *Version*: 3.4.x ++ *Last Build*: 27th May, 2022 ++ *Version*: 3.5.x + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **86587** -+ *File count*: **587** ++ *Line count*: **86905** ++ *File count*: **588** + *Folder count*: **103** > This **component** was build with a Joomla [Automated Component Builder](https://www.vdm.io/joomla-component-builder). diff --git a/admin/README.txt b/admin/README.txt index e6d9d1ed..53b2cbb6 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -1,4 +1,4 @@ -# Cost Benefit Projection (3.4.x) +# Cost Benefit Projection (3.5.x) This is a [Joomla 3.x](http://www.joomla.org/) component. @@ -22,12 +22,12 @@ max_input_vars = 5000 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Cost Benefit Projection](https://www.staffhealthcbp.com/) + *First Build*: 15th June, 2012 -+ *Last Build*: 2nd March, 2022 -+ *Version*: 3.4.x ++ *Last Build*: 27th May, 2022 ++ *Version*: 3.5.x + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **86587** -+ *File count*: **587** ++ *Line count*: **86905** ++ *File count*: **588** + *Folder count*: **103** > This **component** was build with a Joomla [Automated Component Builder](https://www.vdm.io/joomla-component-builder). diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index c7aa6667..d86bb180 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage admin.css diff --git a/admin/assets/css/causerisk.css b/admin/assets/css/causerisk.css index 8c46bd6c..3ee38594 100644 --- a/admin/assets/css/causerisk.css +++ b/admin/assets/css/causerisk.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk.css diff --git a/admin/assets/css/causesrisks.css b/admin/assets/css/causesrisks.css index a4fede36..ae6d0d96 100644 --- a/admin/assets/css/causesrisks.css +++ b/admin/assets/css/causesrisks.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causesrisks.css diff --git a/admin/assets/css/combinedresults.css b/admin/assets/css/combinedresults.css index b5b9b2ea..c2472492 100644 --- a/admin/assets/css/combinedresults.css +++ b/admin/assets/css/combinedresults.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage combinedresults.css diff --git a/admin/assets/css/companies.css b/admin/assets/css/companies.css index 817d39e7..1d9a8285 100644 --- a/admin/assets/css/companies.css +++ b/admin/assets/css/companies.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companies.css diff --git a/admin/assets/css/company.css b/admin/assets/css/company.css index 89d749e7..40bad298 100644 --- a/admin/assets/css/company.css +++ b/admin/assets/css/company.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.css diff --git a/admin/assets/css/companyresults.css b/admin/assets/css/companyresults.css index 43fdd0cc..296ca532 100644 --- a/admin/assets/css/companyresults.css +++ b/admin/assets/css/companyresults.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companyresults.css diff --git a/admin/assets/css/countries.css b/admin/assets/css/countries.css index ccbd523d..5bdac556 100644 --- a/admin/assets/css/countries.css +++ b/admin/assets/css/countries.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage countries.css diff --git a/admin/assets/css/country.css b/admin/assets/css/country.css index 1b9406dc..e9095845 100644 --- a/admin/assets/css/country.css +++ b/admin/assets/css/country.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage country.css diff --git a/admin/assets/css/currencies.css b/admin/assets/css/currencies.css index 78c78fe3..bcb0eb81 100644 --- a/admin/assets/css/currencies.css +++ b/admin/assets/css/currencies.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currencies.css diff --git a/admin/assets/css/currency.css b/admin/assets/css/currency.css index 467330f4..47e09dbc 100644 --- a/admin/assets/css/currency.css +++ b/admin/assets/css/currency.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currency.css diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css index 29817097..0ba60331 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage dashboard.css diff --git a/admin/assets/css/health_data.css b/admin/assets/css/health_data.css index f641f739..825caa6a 100644 --- a/admin/assets/css/health_data.css +++ b/admin/assets/css/health_data.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data.css diff --git a/admin/assets/css/health_data_sets.css b/admin/assets/css/health_data_sets.css index d9f38d4c..3867ed4f 100644 --- a/admin/assets/css/health_data_sets.css +++ b/admin/assets/css/health_data_sets.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data_sets.css diff --git a/admin/assets/css/help_document.css b/admin/assets/css/help_document.css index 5b065a88..6e7965dc 100644 --- a/admin/assets/css/help_document.css +++ b/admin/assets/css/help_document.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help_document.css diff --git a/admin/assets/css/help_documents.css b/admin/assets/css/help_documents.css index cc20f79a..55088c67 100644 --- a/admin/assets/css/help_documents.css +++ b/admin/assets/css/help_documents.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help_documents.css diff --git a/admin/assets/css/intervention.css b/admin/assets/css/intervention.css index a6298fc2..93a71ef5 100644 --- a/admin/assets/css/intervention.css +++ b/admin/assets/css/intervention.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage intervention.css diff --git a/admin/assets/css/interventions.css b/admin/assets/css/interventions.css index 9375c30c..57f4a471 100644 --- a/admin/assets/css/interventions.css +++ b/admin/assets/css/interventions.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage interventions.css diff --git a/admin/assets/css/scaling_factor.css b/admin/assets/css/scaling_factor.css index 3cd52af3..a192514a 100644 --- a/admin/assets/css/scaling_factor.css +++ b/admin/assets/css/scaling_factor.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factor.css diff --git a/admin/assets/css/scaling_factors.css b/admin/assets/css/scaling_factors.css index d5f73db6..ffc0041d 100644 --- a/admin/assets/css/scaling_factors.css +++ b/admin/assets/css/scaling_factors.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factors.css diff --git a/admin/assets/css/service_provider.css b/admin/assets/css/service_provider.css index 3697221a..7f50a22b 100644 --- a/admin/assets/css/service_provider.css +++ b/admin/assets/css/service_provider.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_provider.css diff --git a/admin/assets/css/service_providers.css b/admin/assets/css/service_providers.css index 54ca08a0..e15d9729 100644 --- a/admin/assets/css/service_providers.css +++ b/admin/assets/css/service_providers.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_providers.css diff --git a/admin/assets/js/admin.js b/admin/assets/js/admin.js index f244a346..c240402a 100644 --- a/admin/assets/js/admin.js +++ b/admin/assets/js/admin.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage admin.js diff --git a/admin/controller.php b/admin/controller.php index 1cf8d830..888088c9 100644 --- a/admin/controller.php +++ b/admin/controller.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage controller.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\BaseController; use Joomla\Utilities\ArrayHelper; /** * General Controller of Costbenefitprojection component */ -class CostbenefitprojectionController extends JControllerLegacy +class CostbenefitprojectionController extends BaseController { /** * Constructor. diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php index c8390553..17246380 100644 --- a/admin/controllers/ajax.json.php +++ b/admin/controllers/ajax.json.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage ajax.json.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\BaseController; use Joomla\Utilities\ArrayHelper; /** - * Costbenefitprojection Ajax Controller + * Costbenefitprojection Ajax Base Controller */ -class CostbenefitprojectionControllerAjax extends JControllerLegacy +class CostbenefitprojectionControllerAjax extends BaseController { public function __construct($config) { diff --git a/admin/controllers/causerisk.php b/admin/controllers/causerisk.php index 11678f58..3f697e57 100644 --- a/admin/controllers/causerisk.php +++ b/admin/controllers/causerisk.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Causerisk Controller + * Causerisk Form Controller */ -class CostbenefitprojectionControllerCauserisk extends JControllerForm +class CostbenefitprojectionControllerCauserisk extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/causesrisks.php b/admin/controllers/causesrisks.php index 03a4c43f..2c883feb 100644 --- a/admin/controllers/causesrisks.php +++ b/admin/controllers/causesrisks.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causesrisks.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Causesrisks Controller + * Causesrisks Admin Controller */ -class CostbenefitprojectionControllerCausesrisks extends JControllerAdmin +class CostbenefitprojectionControllerCausesrisks extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/combinedresults.php b/admin/controllers/combinedresults.php index 5e839a91..aaf73959 100644 --- a/admin/controllers/combinedresults.php +++ b/admin/controllers/combinedresults.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage combinedresults.php @@ -20,14 +20,22 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Combinedresults Controller + * Combinedresults Admin Controller */ -class CostbenefitprojectionControllerCombinedresults extends JControllerAdmin +class CostbenefitprojectionControllerCombinedresults extends AdminController { + /** + * The prefix to use with controller messages. + * + * @var string + * @since 1.6 + */ protected $text_prefix = 'COM_COSTBENEFITPROJECTION_COMBINEDRESULTS'; + /** * Proxy for getModel. * @since 2.5 @@ -39,7 +47,7 @@ class CostbenefitprojectionControllerCombinedresults extends JControllerAdmin return $model; } - public function dashboard() + public function dashboard() { $this->setRedirect(JRoute::_('index.php?option=com_costbenefitprojection', false)); return; diff --git a/admin/controllers/companies.php b/admin/controllers/companies.php index 94393e53..2ed616fb 100644 --- a/admin/controllers/companies.php +++ b/admin/controllers/companies.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companies.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Companies Controller + * Companies Admin Controller */ -class CostbenefitprojectionControllerCompanies extends JControllerAdmin +class CostbenefitprojectionControllerCompanies extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/company.php b/admin/controllers/company.php index bed34609..b77b3576 100644 --- a/admin/controllers/company.php +++ b/admin/controllers/company.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Company Controller + * Company Form Controller */ -class CostbenefitprojectionControllerCompany extends JControllerForm +class CostbenefitprojectionControllerCompany extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/companyresults.php b/admin/controllers/companyresults.php index 89bb8193..62dc086c 100644 --- a/admin/controllers/companyresults.php +++ b/admin/controllers/companyresults.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companyresults.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\BaseController; use Joomla\Utilities\ArrayHelper; /** - * Costbenefitprojection Companyresults Controller + * Costbenefitprojection Companyresults Base Controller */ -class CostbenefitprojectionControllerCompanyresults extends JControllerLegacy +class CostbenefitprojectionControllerCompanyresults extends BaseController { public function __construct($config) { diff --git a/admin/controllers/costbenefitprojection.php b/admin/controllers/costbenefitprojection.php index 33d662c2..af22dae7 100644 --- a/admin/controllers/costbenefitprojection.php +++ b/admin/controllers/costbenefitprojection.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage costbenefitprojection.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); - +use Joomla\CMS\MVC\Controller\AdminController; +use Joomla\Utilities\ArrayHelper; /** - * Costbenefitprojection Controller + * Costbenefitprojection Admin Controller */ -class CostbenefitprojectionControllerCostbenefitprojection extends JControllerAdmin +class CostbenefitprojectionControllerCostbenefitprojection extends AdminController { } diff --git a/admin/controllers/countries.php b/admin/controllers/countries.php index ae297c46..3fb073d5 100644 --- a/admin/controllers/countries.php +++ b/admin/controllers/countries.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage countries.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Countries Controller + * Countries Admin Controller */ -class CostbenefitprojectionControllerCountries extends JControllerAdmin +class CostbenefitprojectionControllerCountries extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/country.php b/admin/controllers/country.php index b8999e7d..c63831d5 100644 --- a/admin/controllers/country.php +++ b/admin/controllers/country.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage country.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Country Controller + * Country Form Controller */ -class CostbenefitprojectionControllerCountry extends JControllerForm +class CostbenefitprojectionControllerCountry extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/currencies.php b/admin/controllers/currencies.php index 4cb0e5f8..8cc205f7 100644 --- a/admin/controllers/currencies.php +++ b/admin/controllers/currencies.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currencies.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Currencies Controller + * Currencies Admin Controller */ -class CostbenefitprojectionControllerCurrencies extends JControllerAdmin +class CostbenefitprojectionControllerCurrencies extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/currency.php b/admin/controllers/currency.php index 4234344a..ee01bc27 100644 --- a/admin/controllers/currency.php +++ b/admin/controllers/currency.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currency.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Currency Controller + * Currency Form Controller */ -class CostbenefitprojectionControllerCurrency extends JControllerForm +class CostbenefitprojectionControllerCurrency extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/health_data.php b/admin/controllers/health_data.php index 7bfc48e7..82699448 100644 --- a/admin/controllers/health_data.php +++ b/admin/controllers/health_data.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Health_data Controller + * Health_data Form Controller */ -class CostbenefitprojectionControllerHealth_data extends JControllerForm +class CostbenefitprojectionControllerHealth_data extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/health_data_sets.php b/admin/controllers/health_data_sets.php index 5f45922f..9cea2345 100644 --- a/admin/controllers/health_data_sets.php +++ b/admin/controllers/health_data_sets.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data_sets.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Health_data_sets Controller + * Health_data_sets Admin Controller */ -class CostbenefitprojectionControllerHealth_data_sets extends JControllerAdmin +class CostbenefitprojectionControllerHealth_data_sets extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/help.php b/admin/controllers/help.php index 044c73f9..5e313b1b 100644 --- a/admin/controllers/help.php +++ b/admin/controllers/help.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\BaseController; use Joomla\Utilities\ArrayHelper; /** - * Costbenefitprojection Help Controller + * Costbenefitprojection Help Base Controller */ -class CostbenefitprojectionControllerHelp extends JControllerLegacy +class CostbenefitprojectionControllerHelp extends BaseController { public function __construct($config) { diff --git a/admin/controllers/help_document.php b/admin/controllers/help_document.php index 8922e935..9377cc7c 100644 --- a/admin/controllers/help_document.php +++ b/admin/controllers/help_document.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help_document.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Help_document Controller + * Help_document Form Controller */ -class CostbenefitprojectionControllerHelp_document extends JControllerForm +class CostbenefitprojectionControllerHelp_document extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/help_documents.php b/admin/controllers/help_documents.php index a1ec03dc..a8fee9bf 100644 --- a/admin/controllers/help_documents.php +++ b/admin/controllers/help_documents.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help_documents.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Help_documents Controller + * Help_documents Admin Controller */ -class CostbenefitprojectionControllerHelp_documents extends JControllerAdmin +class CostbenefitprojectionControllerHelp_documents extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/import.php b/admin/controllers/import.php index 729e0052..6f7fd53d 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage import.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\BaseController; use Joomla\Utilities\ArrayHelper; /** - * Costbenefitprojection Import Controller + * Costbenefitprojection Import Base Controller */ -class CostbenefitprojectionControllerImport extends JControllerLegacy +class CostbenefitprojectionControllerImport extends BaseController { /** * Import an spreadsheet. diff --git a/admin/controllers/import_health_data_sets.php b/admin/controllers/import_health_data_sets.php index 1fb3c0ca..921b8692 100644 --- a/admin/controllers/import_health_data_sets.php +++ b/admin/controllers/import_health_data_sets.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage import_health_data_sets.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\BaseController; use Joomla\Utilities\ArrayHelper; /** - * Costbenefitprojection Import_health_data_sets Controller + * Costbenefitprojection Import_health_data_sets Base Controller */ -class CostbenefitprojectionControllerImport_health_data_sets extends JControllerLegacy +class CostbenefitprojectionControllerImport_health_data_sets extends BaseController { /** * Import an spreadsheet. diff --git a/admin/controllers/intervention.php b/admin/controllers/intervention.php index 4ffab043..7d28b566 100644 --- a/admin/controllers/intervention.php +++ b/admin/controllers/intervention.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage intervention.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Intervention Controller + * Intervention Form Controller */ -class CostbenefitprojectionControllerIntervention extends JControllerForm +class CostbenefitprojectionControllerIntervention extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/interventions.php b/admin/controllers/interventions.php index b7976928..9cb0a6e7 100644 --- a/admin/controllers/interventions.php +++ b/admin/controllers/interventions.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage interventions.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Interventions Controller + * Interventions Admin Controller */ -class CostbenefitprojectionControllerInterventions extends JControllerAdmin +class CostbenefitprojectionControllerInterventions extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/scaling_factor.php b/admin/controllers/scaling_factor.php index 2c54a613..897bff77 100644 --- a/admin/controllers/scaling_factor.php +++ b/admin/controllers/scaling_factor.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factor.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Scaling_factor Controller + * Scaling_factor Form Controller */ -class CostbenefitprojectionControllerScaling_factor extends JControllerForm +class CostbenefitprojectionControllerScaling_factor extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/scaling_factors.php b/admin/controllers/scaling_factors.php index ece6ad87..d7d3d80f 100644 --- a/admin/controllers/scaling_factors.php +++ b/admin/controllers/scaling_factors.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factors.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Scaling_factors Controller + * Scaling_factors Admin Controller */ -class CostbenefitprojectionControllerScaling_factors extends JControllerAdmin +class CostbenefitprojectionControllerScaling_factors extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/service_provider.php b/admin/controllers/service_provider.php index 4752041f..fbdf7fe4 100644 --- a/admin/controllers/service_provider.php +++ b/admin/controllers/service_provider.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_provider.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Service_provider Controller + * Service_provider Form Controller */ -class CostbenefitprojectionControllerService_provider extends JControllerForm +class CostbenefitprojectionControllerService_provider extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/service_providers.php b/admin/controllers/service_providers.php index c62daa7f..ac3e0ef2 100644 --- a/admin/controllers/service_providers.php +++ b/admin/controllers/service_providers.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_providers.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Service_providers Controller + * Service_providers Admin Controller */ -class CostbenefitprojectionControllerService_providers extends JControllerAdmin +class CostbenefitprojectionControllerService_providers extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/costbenefitprojection.php b/admin/costbenefitprojection.php index 833a681d..4e8944c3 100644 --- a/admin/costbenefitprojection.php +++ b/admin/costbenefitprojection.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage costbenefitprojection.php diff --git a/admin/helpers/costbenefitprojection.php b/admin/helpers/costbenefitprojection.php index 468f3b33..27056b85 100644 --- a/admin/helpers/costbenefitprojection.php +++ b/admin/helpers/costbenefitprojection.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage costbenefitprojection.php @@ -2754,3 +2754,4 @@ abstract class CostbenefitprojectionHelper return $default; } } + diff --git a/admin/helpers/headercheck.php b/admin/helpers/headercheck.php index 9ac56654..3663e742 100644 --- a/admin/helpers/headercheck.php +++ b/admin/helpers/headercheck.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage headercheck.php diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php index a68729e2..7bf474f4 100644 --- a/admin/helpers/html/batch_.php +++ b/admin/helpers/html/batch_.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage batch_.php diff --git a/admin/helpers/sum.php b/admin/helpers/sum.php index 333050b2..5539adcf 100644 --- a/admin/helpers/sum.php +++ b/admin/helpers/sum.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage sum.php diff --git a/admin/helpers/sumcombine.php b/admin/helpers/sumcombine.php index cc0d350e..9dddf72d 100644 --- a/admin/helpers/sumcombine.php +++ b/admin/helpers/sumcombine.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage sumcombine.php diff --git a/admin/language/en-GB/en-GB.com_costbenefitprojection.ini b/admin/language/en-GB/en-GB.com_costbenefitprojection.ini index 16a00572..6164ccbf 100644 --- a/admin/language/en-GB/en-GB.com_costbenefitprojection.ini +++ b/admin/language/en-GB/en-GB.com_costbenefitprojection.ini @@ -424,7 +424,7 @@ COM_COSTBENEFITPROJECTION_CONFIG_VAXISTEXTSTYLEFONTCOLOR_DESC="Select the vertic COM_COSTBENEFITPROJECTION_CONFIG_VAXISTEXTSTYLEFONTCOLOR_LABEL="vAxis Font Color" COM_COSTBENEFITPROJECTION_CONFIG_WHMCS_KEY_DESC="Add the key you recieved from Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb here." COM_COSTBENEFITPROJECTION_CONFIG_WHMCS_KEY_LABEL="Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Key" -COM_COSTBENEFITPROJECTION_CONFIG_WHMCS_KEY_NOTE_DESC="You need to get this key from Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb.
When using the Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb field encryption you can never change this key once it is set! DATA WILL GET CORRUPTED IF YOU DO!" +COM_COSTBENEFITPROJECTION_CONFIG_WHMCS_KEY_NOTE_DESC="You need to get this key from Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb.
When using the Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb field encryption you can never change this key once it is set! DATA WILL GET CORRUPTED IF YOU DO!" COM_COSTBENEFITPROJECTION_CONFIG_WHMCS_KEY_NOTE_LABEL="Your Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Field Encryption Key" COM_COSTBENEFITPROJECTION_CONFIG_YES="Yes" COM_COSTBENEFITPROJECTION_CONTRIBUTION_TO_COSTS="Contribution to Costs" diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php index 682d087c..87f5039c 100644 --- a/admin/layouts/batchselection.php +++ b/admin/layouts/batchselection.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage batchselection.php diff --git a/admin/layouts/causerisk/details_above.php b/admin/layouts/causerisk/details_above.php index 7be9d6c2..82062d6a 100644 --- a/admin/layouts/causerisk/details_above.php +++ b/admin/layouts/causerisk/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/causerisk/details_fullwidth.php b/admin/layouts/causerisk/details_fullwidth.php index 53fbe952..1b75c4b1 100644 --- a/admin/layouts/causerisk/details_fullwidth.php +++ b/admin/layouts/causerisk/details_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_fullwidth.php diff --git a/admin/layouts/causerisk/details_left.php b/admin/layouts/causerisk/details_left.php index 170991ab..29178d68 100644 --- a/admin/layouts/causerisk/details_left.php +++ b/admin/layouts/causerisk/details_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/admin/layouts/causerisk/details_right.php b/admin/layouts/causerisk/details_right.php index 6fa6d23c..6de656cc 100644 --- a/admin/layouts/causerisk/details_right.php +++ b/admin/layouts/causerisk/details_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php diff --git a/admin/layouts/causerisk/publishing.php b/admin/layouts/causerisk/publishing.php index 60f93718..f9a261d7 100644 --- a/admin/layouts/causerisk/publishing.php +++ b/admin/layouts/causerisk/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/causerisk/publlshing.php b/admin/layouts/causerisk/publlshing.php index f6aa269c..28ccaf12 100644 --- a/admin/layouts/causerisk/publlshing.php +++ b/admin/layouts/causerisk/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/layouts/company/age_groups_percentages_fullwidth.php b/admin/layouts/company/age_groups_percentages_fullwidth.php index b2487b7c..aed7b475 100644 --- a/admin/layouts/company/age_groups_percentages_fullwidth.php +++ b/admin/layouts/company/age_groups_percentages_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_fullwidth.php diff --git a/admin/layouts/company/age_groups_percentages_left.php b/admin/layouts/company/age_groups_percentages_left.php index aada4c4d..597945d6 100644 --- a/admin/layouts/company/age_groups_percentages_left.php +++ b/admin/layouts/company/age_groups_percentages_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_left.php diff --git a/admin/layouts/company/age_groups_percentages_right.php b/admin/layouts/company/age_groups_percentages_right.php index 13345fe1..e474a245 100644 --- a/admin/layouts/company/age_groups_percentages_right.php +++ b/admin/layouts/company/age_groups_percentages_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_right.php diff --git a/admin/layouts/company/causerisk_selection_fullwidth.php b/admin/layouts/company/causerisk_selection_fullwidth.php index 0d16678d..9f21e423 100644 --- a/admin/layouts/company/causerisk_selection_fullwidth.php +++ b/admin/layouts/company/causerisk_selection_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk_selection_fullwidth.php diff --git a/admin/layouts/company/details_above.php b/admin/layouts/company/details_above.php index b0b1e402..51018b73 100644 --- a/admin/layouts/company/details_above.php +++ b/admin/layouts/company/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/company/details_left.php b/admin/layouts/company/details_left.php index f706d39d..1afabb75 100644 --- a/admin/layouts/company/details_left.php +++ b/admin/layouts/company/details_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/admin/layouts/company/details_right.php b/admin/layouts/company/details_right.php index 32aa6b18..e021e9d0 100644 --- a/admin/layouts/company/details_right.php +++ b/admin/layouts/company/details_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php diff --git a/admin/layouts/company/details_under.php b/admin/layouts/company/details_under.php index d83e7a0a..84a583be 100644 --- a/admin/layouts/company/details_under.php +++ b/admin/layouts/company/details_under.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_under.php diff --git a/admin/layouts/company/interventions_fullwidth.php b/admin/layouts/company/interventions_fullwidth.php index 5f37c923..e8ee55e8 100644 --- a/admin/layouts/company/interventions_fullwidth.php +++ b/admin/layouts/company/interventions_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage interventions_fullwidth.php diff --git a/admin/layouts/company/publishing.php b/admin/layouts/company/publishing.php index 60f93718..f9a261d7 100644 --- a/admin/layouts/company/publishing.php +++ b/admin/layouts/company/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/company/publlshing.php b/admin/layouts/company/publlshing.php index f6aa269c..28ccaf12 100644 --- a/admin/layouts/company/publlshing.php +++ b/admin/layouts/company/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/layouts/company/scaling_factors_fullwidth.php b/admin/layouts/company/scaling_factors_fullwidth.php index 12ab7506..1740e8c9 100644 --- a/admin/layouts/company/scaling_factors_fullwidth.php +++ b/admin/layouts/company/scaling_factors_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factors_fullwidth.php diff --git a/admin/layouts/country/age_groups_percentages_left.php b/admin/layouts/country/age_groups_percentages_left.php index aada4c4d..597945d6 100644 --- a/admin/layouts/country/age_groups_percentages_left.php +++ b/admin/layouts/country/age_groups_percentages_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_left.php diff --git a/admin/layouts/country/age_groups_percentages_right.php b/admin/layouts/country/age_groups_percentages_right.php index 13345fe1..e474a245 100644 --- a/admin/layouts/country/age_groups_percentages_right.php +++ b/admin/layouts/country/age_groups_percentages_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_right.php diff --git a/admin/layouts/country/causerisk_selection_fullwidth.php b/admin/layouts/country/causerisk_selection_fullwidth.php index d13855fc..96833d88 100644 --- a/admin/layouts/country/causerisk_selection_fullwidth.php +++ b/admin/layouts/country/causerisk_selection_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk_selection_fullwidth.php diff --git a/admin/layouts/country/companies_fullwidth.php b/admin/layouts/country/companies_fullwidth.php index 928728b0..7c347aa0 100644 --- a/admin/layouts/country/companies_fullwidth.php +++ b/admin/layouts/country/companies_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companies_fullwidth.php @@ -123,7 +123,7 @@ $can = CostbenefitprojectionHelper::getActions('company'); escape($item->country_name); ?> - authorise('service_provider.edit', 'com_costbenefitprojection.service_provider.' . (int)$item->service_provider)): ?> + authorise('service_provider.edit', 'com_costbenefitprojection.service_provider.' . (int) $item->service_provider)): ?> service_provider_user)->name; ?> service_provider_user)->name; ?> diff --git a/admin/layouts/country/details_above.php b/admin/layouts/country/details_above.php index 1a29e406..a48b5549 100644 --- a/admin/layouts/country/details_above.php +++ b/admin/layouts/country/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/country/details_left.php b/admin/layouts/country/details_left.php index b48a759d..bb272d04 100644 --- a/admin/layouts/country/details_left.php +++ b/admin/layouts/country/details_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/admin/layouts/country/details_right.php b/admin/layouts/country/details_right.php index fb38bc3d..4aa75182 100644 --- a/admin/layouts/country/details_right.php +++ b/admin/layouts/country/details_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php diff --git a/admin/layouts/country/health_data_totals_left.php b/admin/layouts/country/health_data_totals_left.php index 19d4760e..a25913d0 100644 --- a/admin/layouts/country/health_data_totals_left.php +++ b/admin/layouts/country/health_data_totals_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data_totals_left.php diff --git a/admin/layouts/country/health_data_totals_right.php b/admin/layouts/country/health_data_totals_right.php index 3abc64d5..12634f5d 100644 --- a/admin/layouts/country/health_data_totals_right.php +++ b/admin/layouts/country/health_data_totals_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data_totals_right.php diff --git a/admin/layouts/country/interventions_fullwidth.php b/admin/layouts/country/interventions_fullwidth.php index d1802f81..987bbe1a 100644 --- a/admin/layouts/country/interventions_fullwidth.php +++ b/admin/layouts/country/interventions_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage interventions_fullwidth.php @@ -103,7 +103,7 @@ $can = CostbenefitprojectionHelper::getActions('intervention'); - authorise('company.edit', 'com_costbenefitprojection.company.' . (int)$item->company)): ?> + authorise('company.edit', 'com_costbenefitprojection.company.' . (int) $item->company)): ?> escape($item->company_name); ?> escape($item->company_name); ?> diff --git a/admin/layouts/country/public_details_fullwidth.php b/admin/layouts/country/public_details_fullwidth.php index 5153f5a5..ef7c9552 100644 --- a/admin/layouts/country/public_details_fullwidth.php +++ b/admin/layouts/country/public_details_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage public_details_fullwidth.php diff --git a/admin/layouts/country/publishing.php b/admin/layouts/country/publishing.php index 60f93718..f9a261d7 100644 --- a/admin/layouts/country/publishing.php +++ b/admin/layouts/country/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/country/publlshing.php b/admin/layouts/country/publlshing.php index f6aa269c..28ccaf12 100644 --- a/admin/layouts/country/publlshing.php +++ b/admin/layouts/country/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/layouts/country/service_providers_fullwidth.php b/admin/layouts/country/service_providers_fullwidth.php index 38a7c45f..83c142a7 100644 --- a/admin/layouts/country/service_providers_fullwidth.php +++ b/admin/layouts/country/service_providers_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_providers_fullwidth.php diff --git a/admin/layouts/currency/details_above.php b/admin/layouts/currency/details_above.php index 81939fef..4c979568 100644 --- a/admin/layouts/currency/details_above.php +++ b/admin/layouts/currency/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/currency/details_left.php b/admin/layouts/currency/details_left.php index 9b92245c..5b134687 100644 --- a/admin/layouts/currency/details_left.php +++ b/admin/layouts/currency/details_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/admin/layouts/currency/details_right.php b/admin/layouts/currency/details_right.php index 24ddbb12..2533d61f 100644 --- a/admin/layouts/currency/details_right.php +++ b/admin/layouts/currency/details_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php diff --git a/admin/layouts/currency/publishing.php b/admin/layouts/currency/publishing.php index 60f93718..f9a261d7 100644 --- a/admin/layouts/currency/publishing.php +++ b/admin/layouts/currency/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/currency/publlshing.php b/admin/layouts/currency/publlshing.php index f6aa269c..28ccaf12 100644 --- a/admin/layouts/currency/publlshing.php +++ b/admin/layouts/currency/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/layouts/databreakdownmalefemale.php b/admin/layouts/databreakdownmalefemale.php index 01815f22..6db4db16 100644 --- a/admin/layouts/databreakdownmalefemale.php +++ b/admin/layouts/databreakdownmalefemale.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage databreakdownmalefemale.php diff --git a/admin/layouts/health_data/details_above.php b/admin/layouts/health_data/details_above.php index ea230624..d264233e 100644 --- a/admin/layouts/health_data/details_above.php +++ b/admin/layouts/health_data/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/health_data/details_left.php b/admin/layouts/health_data/details_left.php index f7591d00..1aa549ee 100644 --- a/admin/layouts/health_data/details_left.php +++ b/admin/layouts/health_data/details_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/admin/layouts/health_data/details_right.php b/admin/layouts/health_data/details_right.php index 50caa358..c322bf3e 100644 --- a/admin/layouts/health_data/details_right.php +++ b/admin/layouts/health_data/details_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php diff --git a/admin/layouts/health_data/details_rightside.php b/admin/layouts/health_data/details_rightside.php index 0b3c0c4b..3f9640d7 100644 --- a/admin/layouts/health_data/details_rightside.php +++ b/admin/layouts/health_data/details_rightside.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_rightside.php diff --git a/admin/layouts/health_data/publishing.php b/admin/layouts/health_data/publishing.php index 60f93718..f9a261d7 100644 --- a/admin/layouts/health_data/publishing.php +++ b/admin/layouts/health_data/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/health_data/publlshing.php b/admin/layouts/health_data/publlshing.php index f6aa269c..28ccaf12 100644 --- a/admin/layouts/health_data/publlshing.php +++ b/admin/layouts/health_data/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/layouts/help_document/details_above.php b/admin/layouts/help_document/details_above.php index 252a2b6f..52911530 100644 --- a/admin/layouts/help_document/details_above.php +++ b/admin/layouts/help_document/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/help_document/details_fullwidth.php b/admin/layouts/help_document/details_fullwidth.php index 7d25ec6a..aaed2dc7 100644 --- a/admin/layouts/help_document/details_fullwidth.php +++ b/admin/layouts/help_document/details_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_fullwidth.php diff --git a/admin/layouts/help_document/details_left.php b/admin/layouts/help_document/details_left.php index 7a159885..db2fec5d 100644 --- a/admin/layouts/help_document/details_left.php +++ b/admin/layouts/help_document/details_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/admin/layouts/help_document/details_right.php b/admin/layouts/help_document/details_right.php index 9c4d3bae..ce4f58f7 100644 --- a/admin/layouts/help_document/details_right.php +++ b/admin/layouts/help_document/details_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php diff --git a/admin/layouts/help_document/details_under.php b/admin/layouts/help_document/details_under.php index d83e7a0a..84a583be 100644 --- a/admin/layouts/help_document/details_under.php +++ b/admin/layouts/help_document/details_under.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_under.php diff --git a/admin/layouts/help_document/publishing.php b/admin/layouts/help_document/publishing.php index cad86927..0ae62f7e 100644 --- a/admin/layouts/help_document/publishing.php +++ b/admin/layouts/help_document/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/help_document/publlshing.php b/admin/layouts/help_document/publlshing.php index 70767966..5d0911cc 100644 --- a/admin/layouts/help_document/publlshing.php +++ b/admin/layouts/help_document/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/layouts/intervention/details_above.php b/admin/layouts/intervention/details_above.php index 4fd4982b..d6780006 100644 --- a/admin/layouts/intervention/details_above.php +++ b/admin/layouts/intervention/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/intervention/details_fullwidth.php b/admin/layouts/intervention/details_fullwidth.php index 1da69d74..9c648997 100644 --- a/admin/layouts/intervention/details_fullwidth.php +++ b/admin/layouts/intervention/details_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_fullwidth.php diff --git a/admin/layouts/intervention/details_under.php b/admin/layouts/intervention/details_under.php index d83e7a0a..84a583be 100644 --- a/admin/layouts/intervention/details_under.php +++ b/admin/layouts/intervention/details_under.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_under.php diff --git a/admin/layouts/intervention/publishing.php b/admin/layouts/intervention/publishing.php index 60f93718..f9a261d7 100644 --- a/admin/layouts/intervention/publishing.php +++ b/admin/layouts/intervention/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/intervention/publlshing.php b/admin/layouts/intervention/publlshing.php index 70767966..5d0911cc 100644 --- a/admin/layouts/intervention/publlshing.php +++ b/admin/layouts/intervention/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/layouts/intervention/settings_fullwidth.php b/admin/layouts/intervention/settings_fullwidth.php index 00abf78b..367278fe 100644 --- a/admin/layouts/intervention/settings_fullwidth.php +++ b/admin/layouts/intervention/settings_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage settings_fullwidth.php diff --git a/admin/layouts/intervention/settings_left.php b/admin/layouts/intervention/settings_left.php index e0c44f35..994d8f2d 100644 --- a/admin/layouts/intervention/settings_left.php +++ b/admin/layouts/intervention/settings_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage settings_left.php diff --git a/admin/layouts/scaling_factor/details_above.php b/admin/layouts/scaling_factor/details_above.php index 182fcc27..3fcf849c 100644 --- a/admin/layouts/scaling_factor/details_above.php +++ b/admin/layouts/scaling_factor/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/scaling_factor/details_left.php b/admin/layouts/scaling_factor/details_left.php index 9d2b2280..6e57bc86 100644 --- a/admin/layouts/scaling_factor/details_left.php +++ b/admin/layouts/scaling_factor/details_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/admin/layouts/scaling_factor/details_right.php b/admin/layouts/scaling_factor/details_right.php index 0a3d8695..0ee5581c 100644 --- a/admin/layouts/scaling_factor/details_right.php +++ b/admin/layouts/scaling_factor/details_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php diff --git a/admin/layouts/scaling_factor/publishing.php b/admin/layouts/scaling_factor/publishing.php index 60f93718..f9a261d7 100644 --- a/admin/layouts/scaling_factor/publishing.php +++ b/admin/layouts/scaling_factor/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/scaling_factor/publlshing.php b/admin/layouts/scaling_factor/publlshing.php index 70767966..5d0911cc 100644 --- a/admin/layouts/scaling_factor/publlshing.php +++ b/admin/layouts/scaling_factor/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/layouts/service_provider/companies_fullwidth.php b/admin/layouts/service_provider/companies_fullwidth.php index 81fd8c1e..f20af428 100644 --- a/admin/layouts/service_provider/companies_fullwidth.php +++ b/admin/layouts/service_provider/companies_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companies_fullwidth.php @@ -120,7 +120,7 @@ $can = CostbenefitprojectionHelper::getActions('company'); department); ?> - authorise('country.edit', 'com_costbenefitprojection.country.' . (int)$item->country)): ?> + authorise('country.edit', 'com_costbenefitprojection.country.' . (int) $item->country)): ?> escape($item->country_name); ?> escape($item->country_name); ?> diff --git a/admin/layouts/service_provider/details_above.php b/admin/layouts/service_provider/details_above.php index c1edb5e0..16572a0f 100644 --- a/admin/layouts/service_provider/details_above.php +++ b/admin/layouts/service_provider/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/service_provider/details_left.php b/admin/layouts/service_provider/details_left.php index 338b1a85..6711f9bf 100644 --- a/admin/layouts/service_provider/details_left.php +++ b/admin/layouts/service_provider/details_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/admin/layouts/service_provider/details_right.php b/admin/layouts/service_provider/details_right.php index 84687939..41c6ea33 100644 --- a/admin/layouts/service_provider/details_right.php +++ b/admin/layouts/service_provider/details_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php diff --git a/admin/layouts/service_provider/publishing.php b/admin/layouts/service_provider/publishing.php index 60f93718..f9a261d7 100644 --- a/admin/layouts/service_provider/publishing.php +++ b/admin/layouts/service_provider/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/service_provider/publlshing.php b/admin/layouts/service_provider/publlshing.php index 70767966..5d0911cc 100644 --- a/admin/layouts/service_provider/publlshing.php +++ b/admin/layouts/service_provider/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/models/ajax.php b/admin/models/ajax.php index a9082b1b..66f195a4 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage ajax.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Costbenefitprojection Ajax Model + * Costbenefitprojection Ajax List Model */ -class CostbenefitprojectionModelAjax extends JModelList +class CostbenefitprojectionModelAjax extends ListModel { protected $app_params; diff --git a/admin/models/causerisk.php b/admin/models/causerisk.php index 29f7a4d3..365d040b 100644 --- a/admin/models/causerisk.php +++ b/admin/models/causerisk.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk.php @@ -20,14 +20,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Costbenefitprojection Causerisk Model + * Costbenefitprojection Causerisk Admin Model */ -class CostbenefitprojectionModelCauserisk extends JModelAdmin +class CostbenefitprojectionModelCauserisk extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/causesrisks.php b/admin/models/causesrisks.php index 6b8ace22..2d5bb5d0 100644 --- a/admin/models/causesrisks.php +++ b/admin/models/causesrisks.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causesrisks.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Causesrisks Model + * Causesrisks List Model */ -class CostbenefitprojectionModelCausesrisks extends JModelList +class CostbenefitprojectionModelCausesrisks extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/combinedresults.php b/admin/models/combinedresults.php index 11016553..6a71c0c4 100644 --- a/admin/models/combinedresults.php +++ b/admin/models/combinedresults.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage combinedresults.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Costbenefitprojection Model for Combinedresults + * Costbenefitprojection List Model for Combinedresults */ -class CostbenefitprojectionModelCombinedresults extends JModelList +class CostbenefitprojectionModelCombinedresults extends ListModel { /** * Model user data. diff --git a/admin/models/companies.php b/admin/models/companies.php index 9cdcfb3f..8baf6744 100644 --- a/admin/models/companies.php +++ b/admin/models/companies.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companies.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Companies Model + * Companies List Model */ -class CostbenefitprojectionModelCompanies extends JModelList +class CostbenefitprojectionModelCompanies extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/company.php b/admin/models/company.php index d701e184..049a6c40 100644 --- a/admin/models/company.php +++ b/admin/models/company.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.php @@ -20,14 +20,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Costbenefitprojection Company Model + * Costbenefitprojection Company Admin Model */ -class CostbenefitprojectionModelCompany extends JModelAdmin +class CostbenefitprojectionModelCompany extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/companyresults.php b/admin/models/companyresults.php index 8e3ed486..0af4e1f9 100644 --- a/admin/models/companyresults.php +++ b/admin/models/companyresults.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companyresults.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ItemModel; use Joomla\Utilities\ArrayHelper; /** - * Costbenefitprojection Companyresults Model + * Costbenefitprojection Companyresults Item Model */ -class CostbenefitprojectionModelCompanyresults extends JModelItem +class CostbenefitprojectionModelCompanyresults extends ItemModel { /** * Model context string. diff --git a/admin/models/costbenefitprojection.php b/admin/models/costbenefitprojection.php index ce3ecbf9..0f5b03f6 100644 --- a/admin/models/costbenefitprojection.php +++ b/admin/models/costbenefitprojection.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage costbenefitprojection.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); - +use Joomla\CMS\MVC\Model\ListModel; +use Joomla\Utilities\ArrayHelper; /** - * Costbenefitprojection Model + * Costbenefitprojection List Model */ -class CostbenefitprojectionModelCostbenefitprojection extends JModelList +class CostbenefitprojectionModelCostbenefitprojection extends ListModel { public function getIcons() { @@ -783,7 +784,7 @@ jQuery(document).ready( function($) { jQuery(document).ready(function () { jQuery.get(getreadme) .success(function(readme) { - jQuery("#readme-md").html(marked(readme)); + jQuery("#readme-md").html(marked.parse(readme)); }) .error(function(jqXHR, textStatus, errorThrown) { jQuery("#readme-md").html("'.JText::_('COM_COSTBENEFITPROJECTION_PLEASE_CHECK_AGAIN_LATTER').'"); diff --git a/admin/models/countries.php b/admin/models/countries.php index 162e2714..aa1e6323 100644 --- a/admin/models/countries.php +++ b/admin/models/countries.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage countries.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Countries Model + * Countries List Model */ -class CostbenefitprojectionModelCountries extends JModelList +class CostbenefitprojectionModelCountries extends ListModel { public function __construct($config = array()) { @@ -189,7 +190,7 @@ class CostbenefitprojectionModelCountries extends JModelList $query->join('LEFT', $db->quoteName('#__users', 'g') . ' ON (' . $db->quoteName('a.user') . ' = ' . $db->quoteName('g.id') . ')'); // From the costbenefitprojection_currency table. - $query->select($db->quoteName('h.name','currency_name')); + $query->select($db->quoteName(['h.name','h.id'],['currency_name','currency_id'])); $query->join('LEFT', $db->quoteName('#__costbenefitprojection_currency', 'h') . ' ON (' . $db->quoteName('a.currency') . ' = ' . $db->quoteName('h.codethree') . ')'); // Filter by published state diff --git a/admin/models/country.php b/admin/models/country.php index 6971fa8a..891dd020 100644 --- a/admin/models/country.php +++ b/admin/models/country.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage country.php @@ -20,14 +20,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Costbenefitprojection Country Model + * Costbenefitprojection Country Admin Model */ -class CostbenefitprojectionModelCountry extends JModelAdmin +class CostbenefitprojectionModelCountry extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/currencies.php b/admin/models/currencies.php index f1575304..907ccf4b 100644 --- a/admin/models/currencies.php +++ b/admin/models/currencies.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currencies.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Currencies Model + * Currencies List Model */ -class CostbenefitprojectionModelCurrencies extends JModelList +class CostbenefitprojectionModelCurrencies extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/currency.php b/admin/models/currency.php index dc55fe7d..f3f01c39 100644 --- a/admin/models/currency.php +++ b/admin/models/currency.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currency.php @@ -20,14 +20,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Costbenefitprojection Currency Model + * Costbenefitprojection Currency Admin Model */ -class CostbenefitprojectionModelCurrency extends JModelAdmin +class CostbenefitprojectionModelCurrency extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/fields/adminviewfolderlist.php b/admin/models/fields/adminviewfolderlist.php index 6997bc77..1a983166 100644 --- a/admin/models/fields/adminviewfolderlist.php +++ b/admin/models/fields/adminviewfolderlist.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage adminviewfolderlist.php diff --git a/admin/models/fields/articles.php b/admin/models/fields/articles.php index 22c054da..61e3886d 100644 --- a/admin/models/fields/articles.php +++ b/admin/models/fields/articles.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage articles.php diff --git a/admin/models/fields/causesrisks.php b/admin/models/fields/causesrisks.php index 96e258c9..8fa95888 100644 --- a/admin/models/fields/causesrisks.php +++ b/admin/models/fields/causesrisks.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causesrisks.php diff --git a/admin/models/fields/causesriskscheck.php b/admin/models/fields/causesriskscheck.php index c5fb4f4e..4bca81a6 100644 --- a/admin/models/fields/causesriskscheck.php +++ b/admin/models/fields/causesriskscheck.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causesriskscheck.php diff --git a/admin/models/fields/company.php b/admin/models/fields/company.php index 5d450c0e..2649d5de 100644 --- a/admin/models/fields/company.php +++ b/admin/models/fields/company.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.php diff --git a/admin/models/fields/companycheck.php b/admin/models/fields/companycheck.php index 07aa014c..ed43f103 100644 --- a/admin/models/fields/companycheck.php +++ b/admin/models/fields/companycheck.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companycheck.php diff --git a/admin/models/fields/countries.php b/admin/models/fields/countries.php index 4e14a2c4..5a18e25a 100644 --- a/admin/models/fields/countries.php +++ b/admin/models/fields/countries.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage countries.php diff --git a/admin/models/fields/countryuser.php b/admin/models/fields/countryuser.php index d380142e..f7d04ede 100644 --- a/admin/models/fields/countryuser.php +++ b/admin/models/fields/countryuser.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage countryuser.php diff --git a/admin/models/fields/currency.php b/admin/models/fields/currency.php index bb69d5e0..cf7e1ddb 100644 --- a/admin/models/fields/currency.php +++ b/admin/models/fields/currency.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currency.php diff --git a/admin/models/fields/datayear.php b/admin/models/fields/datayear.php index c5adc392..8cf6748c 100644 --- a/admin/models/fields/datayear.php +++ b/admin/models/fields/datayear.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage datayear.php diff --git a/admin/models/fields/interventions.php b/admin/models/fields/interventions.php index a5e1e73d..800a3528 100644 --- a/admin/models/fields/interventions.php +++ b/admin/models/fields/interventions.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage interventions.php diff --git a/admin/models/fields/memberuser.php b/admin/models/fields/memberuser.php index 4b912aa1..8970be12 100644 --- a/admin/models/fields/memberuser.php +++ b/admin/models/fields/memberuser.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage memberuser.php diff --git a/admin/models/fields/serviceprovider.php b/admin/models/fields/serviceprovider.php index 5ac8720d..b7d4da87 100644 --- a/admin/models/fields/serviceprovider.php +++ b/admin/models/fields/serviceprovider.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage serviceprovider.php diff --git a/admin/models/fields/serviceprovideruser.php b/admin/models/fields/serviceprovideruser.php index 9839bcfc..5c5f695e 100644 --- a/admin/models/fields/serviceprovideruser.php +++ b/admin/models/fields/serviceprovideruser.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage serviceprovideruser.php diff --git a/admin/models/fields/siteviewfolderlist.php b/admin/models/fields/siteviewfolderlist.php index 0e526840..e64db7f8 100644 --- a/admin/models/fields/siteviewfolderlist.php +++ b/admin/models/fields/siteviewfolderlist.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage siteviewfolderlist.php diff --git a/admin/models/health_data.php b/admin/models/health_data.php index ef2edb6a..956a90d3 100644 --- a/admin/models/health_data.php +++ b/admin/models/health_data.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data.php @@ -20,14 +20,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Costbenefitprojection Health_data Model + * Costbenefitprojection Health_data Admin Model */ -class CostbenefitprojectionModelHealth_data extends JModelAdmin +class CostbenefitprojectionModelHealth_data extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/health_data_sets.php b/admin/models/health_data_sets.php index c6db5b70..bd093dcb 100644 --- a/admin/models/health_data_sets.php +++ b/admin/models/health_data_sets.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data_sets.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Health_data_sets Model + * Health_data_sets List Model */ -class CostbenefitprojectionModelHealth_data_sets extends JModelList +class CostbenefitprojectionModelHealth_data_sets extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/help_document.php b/admin/models/help_document.php index 45d8dd2f..7f84deda 100644 --- a/admin/models/help_document.php +++ b/admin/models/help_document.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help_document.php @@ -20,14 +20,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Costbenefitprojection Help_document Model + * Costbenefitprojection Help_document Admin Model */ -class CostbenefitprojectionModelHelp_document extends JModelAdmin +class CostbenefitprojectionModelHelp_document extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/help_documents.php b/admin/models/help_documents.php index 85adaad9..5302ae36 100644 --- a/admin/models/help_documents.php +++ b/admin/models/help_documents.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help_documents.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Help_documents Model + * Help_documents List Model */ -class CostbenefitprojectionModelHelp_documents extends JModelList +class CostbenefitprojectionModelHelp_documents extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/import.php b/admin/models/import.php index cb3b9d6e..41700247 100644 --- a/admin/models/import.php +++ b/admin/models/import.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage import.php @@ -20,15 +20,16 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\BaseDatabaseModel; use Joomla\CMS\Filesystem\File; use Joomla\CMS\Filesystem\Folder; use Joomla\Utilities\ArrayHelper; use PhpOffice\PhpSpreadsheet\IOFactory; /** - * Costbenefitprojection Import Model + * Costbenefitprojection Import Base Database Model */ -class CostbenefitprojectionModelImport extends JModelLegacy +class CostbenefitprojectionModelImport extends BaseDatabaseModel { // set uploading values protected $use_streams = false; diff --git a/admin/models/import_health_data_sets.php b/admin/models/import_health_data_sets.php index 6980d116..05971b81 100644 --- a/admin/models/import_health_data_sets.php +++ b/admin/models/import_health_data_sets.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage import_health_data_sets.php @@ -20,15 +20,16 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\BaseDatabaseModel; use Joomla\CMS\Filesystem\File; use Joomla\CMS\Filesystem\Folder; use Joomla\Utilities\ArrayHelper; use PhpOffice\PhpSpreadsheet\IOFactory; /** - * Costbenefitprojection Import_health_data_sets Model + * Costbenefitprojection Import_health_data_sets Base Database Model */ -class CostbenefitprojectionModelImport_health_data_sets extends JModelLegacy +class CostbenefitprojectionModelImport_health_data_sets extends BaseDatabaseModel { // set uploading values protected $use_streams = false; diff --git a/admin/models/intervention.php b/admin/models/intervention.php index c6f760bf..6fc7e5d0 100644 --- a/admin/models/intervention.php +++ b/admin/models/intervention.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage intervention.php @@ -20,14 +20,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Costbenefitprojection Intervention Model + * Costbenefitprojection Intervention Admin Model */ -class CostbenefitprojectionModelIntervention extends JModelAdmin +class CostbenefitprojectionModelIntervention extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/interventions.php b/admin/models/interventions.php index 3f03f472..25e5ae2c 100644 --- a/admin/models/interventions.php +++ b/admin/models/interventions.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage interventions.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Interventions Model + * Interventions List Model */ -class CostbenefitprojectionModelInterventions extends JModelList +class CostbenefitprojectionModelInterventions extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/scaling_factor.php b/admin/models/scaling_factor.php index ad8a0005..ca895196 100644 --- a/admin/models/scaling_factor.php +++ b/admin/models/scaling_factor.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factor.php @@ -20,14 +20,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Costbenefitprojection Scaling_factor Model + * Costbenefitprojection Scaling_factor Admin Model */ -class CostbenefitprojectionModelScaling_factor extends JModelAdmin +class CostbenefitprojectionModelScaling_factor extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/scaling_factors.php b/admin/models/scaling_factors.php index c7a832a4..1b82d6ba 100644 --- a/admin/models/scaling_factors.php +++ b/admin/models/scaling_factors.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factors.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Scaling_factors Model + * Scaling_factors List Model */ -class CostbenefitprojectionModelScaling_factors extends JModelList +class CostbenefitprojectionModelScaling_factors extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/service_provider.php b/admin/models/service_provider.php index 20d1d56b..afa1b955 100644 --- a/admin/models/service_provider.php +++ b/admin/models/service_provider.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_provider.php @@ -20,14 +20,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Costbenefitprojection Service_provider Model + * Costbenefitprojection Service_provider Admin Model */ -class CostbenefitprojectionModelService_provider extends JModelAdmin +class CostbenefitprojectionModelService_provider extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/service_providers.php b/admin/models/service_providers.php index ee239987..8067a644 100644 --- a/admin/models/service_providers.php +++ b/admin/models/service_providers.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_providers.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Service_providers Model + * Service_providers List Model */ -class CostbenefitprojectionModelService_providers extends JModelList +class CostbenefitprojectionModelService_providers extends ListModel { public function __construct($config = array()) { diff --git a/admin/sql/updates/mysql/3.4.6.sql b/admin/sql/updates/mysql/3.4.6.sql index 7878b610..4dc9ca37 100644 --- a/admin/sql/updates/mysql/3.4.6.sql +++ b/admin/sql/updates/mysql/3.4.6.sql @@ -1,3 +1,3 @@ -ALTER TABLE `#__costbenefitprojection_intervention` ENGINE = InnoDB; - +ALTER TABLE `#__costbenefitprojection_intervention` ENGINE = InnoDB; + ALTER TABLE `#__costbenefitprojection_intervention` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; diff --git a/admin/sql/updates/mysql/3.4.7.sql b/admin/sql/updates/mysql/3.4.7.sql new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/admin/sql/updates/mysql/3.4.7.sql @@ -0,0 +1 @@ + diff --git a/admin/tables/causerisk.php b/admin/tables/causerisk.php index ae4bfc2f..4077cc8c 100644 --- a/admin/tables/causerisk.php +++ b/admin/tables/causerisk.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk.php @@ -20,6 +20,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -27,7 +28,7 @@ use Joomla\Utilities\ArrayHelper; /** * Causesrisks Table class */ -class CostbenefitprojectionTableCauserisk extends JTable +class CostbenefitprojectionTableCauserisk extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/company.php b/admin/tables/company.php index b62647a3..5ab13d99 100644 --- a/admin/tables/company.php +++ b/admin/tables/company.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.php @@ -20,6 +20,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -27,7 +28,7 @@ use Joomla\Utilities\ArrayHelper; /** * Companies Table class */ -class CostbenefitprojectionTableCompany extends JTable +class CostbenefitprojectionTableCompany extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/country.php b/admin/tables/country.php index 85f2955a..e6179c38 100644 --- a/admin/tables/country.php +++ b/admin/tables/country.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage country.php @@ -20,6 +20,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -27,7 +28,7 @@ use Joomla\Utilities\ArrayHelper; /** * Countries Table class */ -class CostbenefitprojectionTableCountry extends JTable +class CostbenefitprojectionTableCountry extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/currency.php b/admin/tables/currency.php index 430c3f58..2c54333f 100644 --- a/admin/tables/currency.php +++ b/admin/tables/currency.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currency.php @@ -20,6 +20,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -27,7 +28,7 @@ use Joomla\Utilities\ArrayHelper; /** * Currencies Table class */ -class CostbenefitprojectionTableCurrency extends JTable +class CostbenefitprojectionTableCurrency extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/health_data.php b/admin/tables/health_data.php index a2839d16..cf915fb3 100644 --- a/admin/tables/health_data.php +++ b/admin/tables/health_data.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data.php @@ -20,6 +20,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -27,7 +28,7 @@ use Joomla\Utilities\ArrayHelper; /** * Health_data_sets Table class */ -class CostbenefitprojectionTableHealth_data extends JTable +class CostbenefitprojectionTableHealth_data extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/help_document.php b/admin/tables/help_document.php index 6699a41b..6ebf75c6 100644 --- a/admin/tables/help_document.php +++ b/admin/tables/help_document.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help_document.php @@ -20,6 +20,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -27,7 +28,7 @@ use Joomla\Utilities\ArrayHelper; /** * Help_documents Table class */ -class CostbenefitprojectionTableHelp_document extends JTable +class CostbenefitprojectionTableHelp_document extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/intervention.php b/admin/tables/intervention.php index 8374506e..260594a0 100644 --- a/admin/tables/intervention.php +++ b/admin/tables/intervention.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage intervention.php @@ -20,6 +20,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -27,7 +28,7 @@ use Joomla\Utilities\ArrayHelper; /** * Interventions Table class */ -class CostbenefitprojectionTableIntervention extends JTable +class CostbenefitprojectionTableIntervention extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/scaling_factor.php b/admin/tables/scaling_factor.php index 22160638..3060c613 100644 --- a/admin/tables/scaling_factor.php +++ b/admin/tables/scaling_factor.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factor.php @@ -20,6 +20,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -27,7 +28,7 @@ use Joomla\Utilities\ArrayHelper; /** * Scaling_factors Table class */ -class CostbenefitprojectionTableScaling_factor extends JTable +class CostbenefitprojectionTableScaling_factor extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/service_provider.php b/admin/tables/service_provider.php index 4de03455..c0dd79e3 100644 --- a/admin/tables/service_provider.php +++ b/admin/tables/service_provider.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_provider.php @@ -20,6 +20,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -27,7 +28,7 @@ use Joomla\Utilities\ArrayHelper; /** * Service_providers Table class */ -class CostbenefitprojectionTableService_provider extends JTable +class CostbenefitprojectionTableService_provider extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/views/causerisk/submitbutton.js b/admin/views/causerisk/submitbutton.js index ca1f04ab..22a6b94f 100644 --- a/admin/views/causerisk/submitbutton.js +++ b/admin/views/causerisk/submitbutton.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/admin/views/causerisk/tmpl/edit.php b/admin/views/causerisk/tmpl/edit.php index ddac60dc..7a3bb0eb 100644 --- a/admin/views/causerisk/tmpl/edit.php +++ b/admin/views/causerisk/tmpl/edit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/admin/views/causerisk/view.html.php b/admin/views/causerisk/view.html.php index 8b2c658c..a0b15aa3 100644 --- a/admin/views/causerisk/view.html.php +++ b/admin/views/causerisk/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php @@ -20,10 +20,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Causerisk View class + * Causerisk Html View class */ -class CostbenefitprojectionViewCauserisk extends JViewLegacy +class CostbenefitprojectionViewCauserisk extends HtmlView { /** * display method of View diff --git a/admin/views/causesrisks/tmpl/default.php b/admin/views/causesrisks/tmpl/default.php index c86d723b..49564af0 100644 --- a/admin/views/causesrisks/tmpl/default.php +++ b/admin/views/causesrisks/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/causesrisks/tmpl/default_batch_body.php b/admin/views/causesrisks/tmpl/default_batch_body.php index e56c45bb..25880e10 100644 --- a/admin/views/causesrisks/tmpl/default_batch_body.php +++ b/admin/views/causesrisks/tmpl/default_batch_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_body.php diff --git a/admin/views/causesrisks/tmpl/default_batch_footer.php b/admin/views/causesrisks/tmpl/default_batch_footer.php index 22f583e5..199b8eb7 100644 --- a/admin/views/causesrisks/tmpl/default_batch_footer.php +++ b/admin/views/causesrisks/tmpl/default_batch_footer.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_footer.php diff --git a/admin/views/causesrisks/tmpl/default_body.php b/admin/views/causesrisks/tmpl/default_body.php index 698fac14..5294cf38 100644 --- a/admin/views/causesrisks/tmpl/default_body.php +++ b/admin/views/causesrisks/tmpl/default_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_body.php diff --git a/admin/views/causesrisks/tmpl/default_foot.php b/admin/views/causesrisks/tmpl/default_foot.php index 02c3b7b2..13eae20b 100644 --- a/admin/views/causesrisks/tmpl/default_foot.php +++ b/admin/views/causesrisks/tmpl/default_foot.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_foot.php diff --git a/admin/views/causesrisks/tmpl/default_head.php b/admin/views/causesrisks/tmpl/default_head.php index e12dfef7..2b158672 100644 --- a/admin/views/causesrisks/tmpl/default_head.php +++ b/admin/views/causesrisks/tmpl/default_head.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_head.php diff --git a/admin/views/causesrisks/tmpl/default_toolbar.php b/admin/views/causesrisks/tmpl/default_toolbar.php index 36d596f7..8afbb19f 100644 --- a/admin/views/causesrisks/tmpl/default_toolbar.php +++ b/admin/views/causesrisks/tmpl/default_toolbar.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_toolbar.php diff --git a/admin/views/causesrisks/view.html.php b/admin/views/causesrisks/view.html.php index ca5ddd87..53873ad1 100644 --- a/admin/views/causesrisks/view.html.php +++ b/admin/views/causesrisks/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php @@ -20,10 +20,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Costbenefitprojection View class for the Causesrisks + * Costbenefitprojection Html View class for the Causesrisks */ -class CostbenefitprojectionViewCausesrisks extends JViewLegacy +class CostbenefitprojectionViewCausesrisks extends HtmlView { /** * Causesrisks view display method diff --git a/admin/views/combinedresults/tmpl/default.php b/admin/views/combinedresults/tmpl/default.php index 3814dee8..35cc2398 100644 --- a/admin/views/combinedresults/tmpl/default.php +++ b/admin/views/combinedresults/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/combinedresults/tmpl/default_chart_cost.php b/admin/views/combinedresults/tmpl/default_chart_cost.php index 3aa54a29..3cf1ccff 100644 --- a/admin/views/combinedresults/tmpl/default_chart_cost.php +++ b/admin/views/combinedresults/tmpl/default_chart_cost.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_cost.php diff --git a/admin/views/combinedresults/tmpl/default_chart_cost_percent.php b/admin/views/combinedresults/tmpl/default_chart_cost_percent.php index fa2dde6a..b035a304 100644 --- a/admin/views/combinedresults/tmpl/default_chart_cost_percent.php +++ b/admin/views/combinedresults/tmpl/default_chart_cost_percent.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_cost_percent.php diff --git a/admin/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php b/admin/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php index 0e240752..f41b9999 100644 --- a/admin/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php +++ b/admin/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_intervention_cost_benefit.php diff --git a/admin/views/combinedresults/tmpl/default_chart_work_days_lost.php b/admin/views/combinedresults/tmpl/default_chart_work_days_lost.php index 0f0e31f4..90f83956 100644 --- a/admin/views/combinedresults/tmpl/default_chart_work_days_lost.php +++ b/admin/views/combinedresults/tmpl/default_chart_work_days_lost.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_work_days_lost.php diff --git a/admin/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php b/admin/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php index 6725bfbb..bf49ebf0 100644 --- a/admin/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php +++ b/admin/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_work_days_lost_percent.php diff --git a/admin/views/combinedresults/tmpl/default_main.php b/admin/views/combinedresults/tmpl/default_main.php index da134fd2..2cdab10e 100644 --- a/admin/views/combinedresults/tmpl/default_main.php +++ b/admin/views/combinedresults/tmpl/default_main.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_main.php diff --git a/admin/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php b/admin/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php index b5e10139..4fbc6748 100644 --- a/admin/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php +++ b/admin/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_calculated_cost_in_detail.php diff --git a/admin/views/combinedresults/tmpl/default_table_cost_summary.php b/admin/views/combinedresults/tmpl/default_table_cost_summary.php index e39882d2..6ec70b09 100644 --- a/admin/views/combinedresults/tmpl/default_table_cost_summary.php +++ b/admin/views/combinedresults/tmpl/default_table_cost_summary.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_cost_summary.php diff --git a/admin/views/combinedresults/tmpl/default_table_intervention_net_benefit.php b/admin/views/combinedresults/tmpl/default_table_intervention_net_benefit.php index 8494bbea..b1c6bd50 100644 --- a/admin/views/combinedresults/tmpl/default_table_intervention_net_benefit.php +++ b/admin/views/combinedresults/tmpl/default_table_intervention_net_benefit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_intervention_net_benefit.php diff --git a/admin/views/combinedresults/tmpl/default_table_work_days_lost_summary.php b/admin/views/combinedresults/tmpl/default_table_work_days_lost_summary.php index 01c3df21..0b0f8b3f 100644 --- a/admin/views/combinedresults/tmpl/default_table_work_days_lost_summary.php +++ b/admin/views/combinedresults/tmpl/default_table_work_days_lost_summary.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_work_days_lost_summary.php diff --git a/admin/views/combinedresults/view.html.php b/admin/views/combinedresults/view.html.php index 607d73aa..7c1331d4 100644 --- a/admin/views/combinedresults/view.html.php +++ b/admin/views/combinedresults/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php @@ -20,10 +20,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Costbenefitprojection View class for the Combinedresults + * Costbenefitprojection Html View class for the Combinedresults */ -class CostbenefitprojectionViewCombinedresults extends JViewLegacy +class CostbenefitprojectionViewCombinedresults extends HtmlView { // Overwriting JView display method function display($tpl = null) @@ -143,12 +145,12 @@ class CostbenefitprojectionViewCombinedresults extends JViewLegacy // The uikit css. if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addStyleSheet(JURI::root(true) .'/media/com_costbenefitprojection/uikit-v2/css/uikit'.$style.$size.'.css', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_costbenefitprojection/uikit-v2/css/uikit'.$style.$size.'.css', ['version' => 'auto']); } // The uikit js. if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addScript(JURI::root(true) .'/media/com_costbenefitprojection/uikit-v2/js/uikit'.$size.'.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + JHtml::_('script', 'media/com_costbenefitprojection/uikit-v2/js/uikit'.$size.'.js', ['version' => 'auto']); } // Load the needed uikit components in this view. @@ -164,13 +166,13 @@ class CostbenefitprojectionViewCombinedresults extends JViewLegacy if (File::exists(JPATH_ROOT.'/media/com_costbenefitprojection/uikit-v2/css/components/'.$name.$style.$size.'.css')) { // load the css. - $this->document->addStyleSheet(JURI::root(true) .'/media/com_costbenefitprojection/uikit-v2/css/components/'.$name.$style.$size.'.css', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_costbenefitprojection/uikit-v2/css/components/'.$name.$style.$size.'.css', ['version' => 'auto']); } // check if the JavaScript file exists. if (File::exists(JPATH_ROOT.'/media/com_costbenefitprojection/uikit-v2/js/components/'.$name.$size.'.js')) { // load the js. - $this->document->addScript(JURI::root(true) .'/media/com_costbenefitprojection/uikit-v2/js/components/'.$name.$size.'.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('type' => 'text/javascript', 'async' => 'async') : true); + JHtml::_('script', 'media/com_costbenefitprojection/uikit-v2/js/components/'.$name.$size.'.js', ['version' => 'auto'], ['type' => 'text/javascript', 'async' => 'async']); } } } @@ -179,29 +181,29 @@ class CostbenefitprojectionViewCombinedresults extends JViewLegacy // add the google chart builder class. require_once JPATH_COMPONENT_ADMINISTRATOR.'/helpers/chartbuilder.php'; // load the google chart js. - $this->document->addScript(JURI::root(true) .'/media/com_costbenefitprojection/js/google.jsapi.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript('https://canvg.googlecode.com/svn/trunk/rgbcolor.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript('https://canvg.googlecode.com/svn/trunk/canvg.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + JHtml::_('script', 'media/com_costbenefitprojection/js/google.jsapi.js', ['version' => 'auto']); + $this->document->addScript('https://canvg.googlecode.com/svn/trunk/rgbcolor.js', ['version' => 'auto']); + $this->document->addScript('https://canvg.googlecode.com/svn/trunk/canvg.js', ['version' => 'auto']); // Add the CSS for Footable. - $this->document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable-v2/css/footable.core.min.css', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_costbenefitprojection/footable-v2/css/footable.core.min.css', ['version' => 'auto']); // Use the Metro Style if (!isset($this->fooTableStyle) || 0 == $this->fooTableStyle) { - $this->document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable-v2/css/footable.metro.min.css', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_costbenefitprojection/footable-v2/css/footable.metro.min.css', ['version' => 'auto']); } // Use the Legacy Style. elseif (isset($this->fooTableStyle) && 1 == $this->fooTableStyle) { - $this->document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable-v2/css/footable.standalone.min.css', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_costbenefitprojection/footable-v2/css/footable.standalone.min.css', ['version' => 'auto']); } // Add the JavaScript for Footable - $this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable-v2/js/footable.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable-v2/js/footable.sort.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable-v2/js/footable.filter.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable-v2/js/footable.paginate.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + JHtml::_('script', 'media/com_costbenefitprojection/footable-v2/js/footable.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_costbenefitprojection/footable-v2/js/footable.sort.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_costbenefitprojection/footable-v2/js/footable.filter.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_costbenefitprojection/footable-v2/js/footable.paginate.js', ['version' => 'auto']); // set header JToolbarHelper::title(JText::_('COM_COSTBENEFITPROJECTION_COMBINED_RESULTS_OF').' ('.$this->names.')','cogs'); // add custom css diff --git a/admin/views/companies/tmpl/default.php b/admin/views/companies/tmpl/default.php index 92164ff1..2f2d34bb 100644 --- a/admin/views/companies/tmpl/default.php +++ b/admin/views/companies/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/companies/tmpl/default_batch_body.php b/admin/views/companies/tmpl/default_batch_body.php index 4e97ad99..96149c61 100644 --- a/admin/views/companies/tmpl/default_batch_body.php +++ b/admin/views/companies/tmpl/default_batch_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_body.php diff --git a/admin/views/companies/tmpl/default_batch_footer.php b/admin/views/companies/tmpl/default_batch_footer.php index e0ca28b2..42eafb19 100644 --- a/admin/views/companies/tmpl/default_batch_footer.php +++ b/admin/views/companies/tmpl/default_batch_footer.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_footer.php diff --git a/admin/views/companies/tmpl/default_body.php b/admin/views/companies/tmpl/default_body.php index 2d7a62d1..bce7c2b6 100644 --- a/admin/views/companies/tmpl/default_body.php +++ b/admin/views/companies/tmpl/default_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_body.php @@ -98,7 +98,7 @@ $edit = "index.php?option=com_costbenefitprojection&view=companies&task=company.
- user->authorise('country.edit', 'com_costbenefitprojection.country.' . (int)$item->country)): ?> + user->authorise('country.edit', 'com_costbenefitprojection.country.' . (int) $item->country)): ?> escape($item->country_name); ?> escape($item->country_name); ?> @@ -107,7 +107,7 @@ $edit = "index.php?option=com_costbenefitprojection&view=companies&task=company.
- user->authorise('service_provider.edit', 'com_costbenefitprojection.service_provider.' . (int)$item->service_provider)): ?> + user->authorise('service_provider.edit', 'com_costbenefitprojection.service_provider.' . (int) $item->service_provider)): ?> service_provider_user)->name; ?> service_provider_user)->name; ?> diff --git a/admin/views/companies/tmpl/default_foot.php b/admin/views/companies/tmpl/default_foot.php index 7a74d690..ac349e67 100644 --- a/admin/views/companies/tmpl/default_foot.php +++ b/admin/views/companies/tmpl/default_foot.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_foot.php diff --git a/admin/views/companies/tmpl/default_head.php b/admin/views/companies/tmpl/default_head.php index fa205095..9156afe9 100644 --- a/admin/views/companies/tmpl/default_head.php +++ b/admin/views/companies/tmpl/default_head.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_head.php diff --git a/admin/views/companies/tmpl/default_toolbar.php b/admin/views/companies/tmpl/default_toolbar.php index d6d641ab..6c797aca 100644 --- a/admin/views/companies/tmpl/default_toolbar.php +++ b/admin/views/companies/tmpl/default_toolbar.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_toolbar.php diff --git a/admin/views/companies/view.html.php b/admin/views/companies/view.html.php index 3f1a8a28..099a36f7 100644 --- a/admin/views/companies/view.html.php +++ b/admin/views/companies/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php @@ -20,10 +20,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Costbenefitprojection View class for the Companies + * Costbenefitprojection Html View class for the Companies */ -class CostbenefitprojectionViewCompanies extends JViewLegacy +class CostbenefitprojectionViewCompanies extends HtmlView { /** * Companies view display method diff --git a/admin/views/company/submitbutton.js b/admin/views/company/submitbutton.js index 589f1f7f..273fe568 100644 --- a/admin/views/company/submitbutton.js +++ b/admin/views/company/submitbutton.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/admin/views/company/tmpl/edit.php b/admin/views/company/tmpl/edit.php index 83aa3c89..55809e5b 100644 --- a/admin/views/company/tmpl/edit.php +++ b/admin/views/company/tmpl/edit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/admin/views/company/view.html.php b/admin/views/company/view.html.php index bbc41041..006e488c 100644 --- a/admin/views/company/view.html.php +++ b/admin/views/company/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php @@ -20,10 +20,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Company View class + * Company Html View class */ -class CostbenefitprojectionViewCompany extends JViewLegacy +class CostbenefitprojectionViewCompany extends HtmlView { /** * display method of View @@ -206,24 +208,24 @@ class CostbenefitprojectionViewCompany extends JViewLegacy $this->document->addScriptDeclaration("var token = '".JSession::getFormToken()."';"); // Add the CSS for Footable. - $this->document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable-v2/css/footable.core.min.css', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_costbenefitprojection/footable-v2/css/footable.core.min.css', ['version' => 'auto']); // Use the Metro Style if (!isset($this->fooTableStyle) || 0 == $this->fooTableStyle) { - $this->document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable-v2/css/footable.metro.min.css', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_costbenefitprojection/footable-v2/css/footable.metro.min.css', ['version' => 'auto']); } // Use the Legacy Style. elseif (isset($this->fooTableStyle) && 1 == $this->fooTableStyle) { - $this->document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable-v2/css/footable.standalone.min.css', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_costbenefitprojection/footable-v2/css/footable.standalone.min.css', ['version' => 'auto']); } // Add the JavaScript for Footable - $this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable-v2/js/footable.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable-v2/js/footable.sort.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable-v2/js/footable.filter.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable-v2/js/footable.paginate.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + JHtml::_('script', 'media/com_costbenefitprojection/footable-v2/js/footable.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_costbenefitprojection/footable-v2/js/footable.sort.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_costbenefitprojection/footable-v2/js/footable.filter.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_costbenefitprojection/footable-v2/js/footable.paginate.js', ['version' => 'auto']); $footable = "jQuery(document).ready(function() { jQuery(function () { jQuery('.footable').footable(); }); jQuery('.nav-tabs').on('click', 'li', function() { setTimeout(tableFix, 10); }); }); function tableFix() { jQuery('.footable').trigger('footable_resize'); }"; $this->document->addScriptDeclaration($footable); diff --git a/admin/views/companyresults/tmpl/default.php b/admin/views/companyresults/tmpl/default.php index 7aa8b07f..66f72179 100644 --- a/admin/views/companyresults/tmpl/default.php +++ b/admin/views/companyresults/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/companyresults/tmpl/default_chart_cost.php b/admin/views/companyresults/tmpl/default_chart_cost.php index 3aa54a29..3cf1ccff 100644 --- a/admin/views/companyresults/tmpl/default_chart_cost.php +++ b/admin/views/companyresults/tmpl/default_chart_cost.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_cost.php diff --git a/admin/views/companyresults/tmpl/default_chart_cost_percent.php b/admin/views/companyresults/tmpl/default_chart_cost_percent.php index fa2dde6a..b035a304 100644 --- a/admin/views/companyresults/tmpl/default_chart_cost_percent.php +++ b/admin/views/companyresults/tmpl/default_chart_cost_percent.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_cost_percent.php diff --git a/admin/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php b/admin/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php index 0e240752..f41b9999 100644 --- a/admin/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php +++ b/admin/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_intervention_cost_benefit.php diff --git a/admin/views/companyresults/tmpl/default_chart_work_days_lost.php b/admin/views/companyresults/tmpl/default_chart_work_days_lost.php index 0f0e31f4..90f83956 100644 --- a/admin/views/companyresults/tmpl/default_chart_work_days_lost.php +++ b/admin/views/companyresults/tmpl/default_chart_work_days_lost.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_work_days_lost.php diff --git a/admin/views/companyresults/tmpl/default_chart_work_days_lost_percent.php b/admin/views/companyresults/tmpl/default_chart_work_days_lost_percent.php index 6725bfbb..bf49ebf0 100644 --- a/admin/views/companyresults/tmpl/default_chart_work_days_lost_percent.php +++ b/admin/views/companyresults/tmpl/default_chart_work_days_lost_percent.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_work_days_lost_percent.php diff --git a/admin/views/companyresults/tmpl/default_main.php b/admin/views/companyresults/tmpl/default_main.php index da134fd2..2cdab10e 100644 --- a/admin/views/companyresults/tmpl/default_main.php +++ b/admin/views/companyresults/tmpl/default_main.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_main.php diff --git a/admin/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php b/admin/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php index b5e10139..4fbc6748 100644 --- a/admin/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php +++ b/admin/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_calculated_cost_in_detail.php diff --git a/admin/views/companyresults/tmpl/default_table_cost_summary.php b/admin/views/companyresults/tmpl/default_table_cost_summary.php index e39882d2..6ec70b09 100644 --- a/admin/views/companyresults/tmpl/default_table_cost_summary.php +++ b/admin/views/companyresults/tmpl/default_table_cost_summary.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_cost_summary.php diff --git a/admin/views/companyresults/tmpl/default_table_intervention_net_benefit.php b/admin/views/companyresults/tmpl/default_table_intervention_net_benefit.php index 8494bbea..b1c6bd50 100644 --- a/admin/views/companyresults/tmpl/default_table_intervention_net_benefit.php +++ b/admin/views/companyresults/tmpl/default_table_intervention_net_benefit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_intervention_net_benefit.php diff --git a/admin/views/companyresults/tmpl/default_table_work_days_lost_summary.php b/admin/views/companyresults/tmpl/default_table_work_days_lost_summary.php index 01c3df21..0b0f8b3f 100644 --- a/admin/views/companyresults/tmpl/default_table_work_days_lost_summary.php +++ b/admin/views/companyresults/tmpl/default_table_work_days_lost_summary.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_work_days_lost_summary.php diff --git a/admin/views/companyresults/tmpl/default_variables.php b/admin/views/companyresults/tmpl/default_variables.php index 80a2a1f8..e3e8b11c 100644 --- a/admin/views/companyresults/tmpl/default_variables.php +++ b/admin/views/companyresults/tmpl/default_variables.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_variables.php diff --git a/admin/views/companyresults/view.html.php b/admin/views/companyresults/view.html.php index 1d547920..b79e7f09 100644 --- a/admin/views/companyresults/view.html.php +++ b/admin/views/companyresults/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php @@ -20,10 +20,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Costbenefitprojection View class for the Companyresults + * Costbenefitprojection Html View class for the Companyresults */ -class CostbenefitprojectionViewCompanyresults extends JViewLegacy +class CostbenefitprojectionViewCompanyresults extends HtmlView { // Overwriting JView display method function display($tpl = null) @@ -180,12 +182,12 @@ class CostbenefitprojectionViewCompanyresults extends JViewLegacy // The uikit css. if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addStyleSheet(JURI::root(true) .'/media/com_costbenefitprojection/uikit-v2/css/uikit'.$style.$size.'.css', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_costbenefitprojection/uikit-v2/css/uikit'.$style.$size.'.css', ['version' => 'auto']); } // The uikit js. if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addScript(JURI::root(true) .'/media/com_costbenefitprojection/uikit-v2/js/uikit'.$size.'.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + JHtml::_('script', 'media/com_costbenefitprojection/uikit-v2/js/uikit'.$size.'.js', ['version' => 'auto']); } // Load the needed uikit components in this view. @@ -201,13 +203,13 @@ class CostbenefitprojectionViewCompanyresults extends JViewLegacy if (File::exists(JPATH_ROOT.'/media/com_costbenefitprojection/uikit-v2/css/components/'.$name.$style.$size.'.css')) { // load the css. - $this->document->addStyleSheet(JURI::root(true) .'/media/com_costbenefitprojection/uikit-v2/css/components/'.$name.$style.$size.'.css', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_costbenefitprojection/uikit-v2/css/components/'.$name.$style.$size.'.css', ['version' => 'auto']); } // check if the JavaScript file exists. if (File::exists(JPATH_ROOT.'/media/com_costbenefitprojection/uikit-v2/js/components/'.$name.$size.'.js')) { // load the js. - $this->document->addScript(JURI::root(true) .'/media/com_costbenefitprojection/uikit-v2/js/components/'.$name.$size.'.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('type' => 'text/javascript', 'async' => 'async') : true); + JHtml::_('script', 'media/com_costbenefitprojection/uikit-v2/js/components/'.$name.$size.'.js', ['version' => 'auto'], ['type' => 'text/javascript', 'async' => 'async']); } } } @@ -216,29 +218,29 @@ class CostbenefitprojectionViewCompanyresults extends JViewLegacy // add the google chart builder class. require_once JPATH_COMPONENT_ADMINISTRATOR.'/helpers/chartbuilder.php'; // load the google chart js. - $this->document->addScript(JURI::root(true) .'/media/com_costbenefitprojection/js/google.jsapi.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript('https://canvg.googlecode.com/svn/trunk/rgbcolor.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript('https://canvg.googlecode.com/svn/trunk/canvg.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + JHtml::_('script', 'media/com_costbenefitprojection/js/google.jsapi.js', ['version' => 'auto']); + $this->document->addScript('https://canvg.googlecode.com/svn/trunk/rgbcolor.js', ['version' => 'auto']); + $this->document->addScript('https://canvg.googlecode.com/svn/trunk/canvg.js', ['version' => 'auto']); // Add the CSS for Footable. - $this->document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable-v2/css/footable.core.min.css', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_costbenefitprojection/footable-v2/css/footable.core.min.css', ['version' => 'auto']); // Use the Metro Style if (!isset($this->fooTableStyle) || 0 == $this->fooTableStyle) { - $this->document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable-v2/css/footable.metro.min.css', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_costbenefitprojection/footable-v2/css/footable.metro.min.css', ['version' => 'auto']); } // Use the Legacy Style. elseif (isset($this->fooTableStyle) && 1 == $this->fooTableStyle) { - $this->document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable-v2/css/footable.standalone.min.css', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_costbenefitprojection/footable-v2/css/footable.standalone.min.css', ['version' => 'auto']); } // Add the JavaScript for Footable - $this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable-v2/js/footable.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable-v2/js/footable.sort.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable-v2/js/footable.filter.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable-v2/js/footable.paginate.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + JHtml::_('script', 'media/com_costbenefitprojection/footable-v2/js/footable.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_costbenefitprojection/footable-v2/js/footable.sort.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_costbenefitprojection/footable-v2/js/footable.filter.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_costbenefitprojection/footable-v2/js/footable.paginate.js', ['version' => 'auto']); // add custom css $this->document->addStyleSheet(JURI::root(true) ."/administrator/components/com_costbenefitprojection/assets/css/dashboard.css"); // add custom js diff --git a/admin/views/costbenefitprojection/tmpl/default.php b/admin/views/costbenefitprojection/tmpl/default.php index d8912a0f..a36043e1 100644 --- a/admin/views/costbenefitprojection/tmpl/default.php +++ b/admin/views/costbenefitprojection/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/costbenefitprojection/tmpl/default_closed_issues_the_closed_issues_on_github.php b/admin/views/costbenefitprojection/tmpl/default_closed_issues_the_closed_issues_on_github.php index 92ea2828..4b9bbbd0 100644 --- a/admin/views/costbenefitprojection/tmpl/default_closed_issues_the_closed_issues_on_github.php +++ b/admin/views/costbenefitprojection/tmpl/default_closed_issues_the_closed_issues_on_github.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_closed_issues_the_closed_issues_on_github.php diff --git a/admin/views/costbenefitprojection/tmpl/default_main.php b/admin/views/costbenefitprojection/tmpl/default_main.php index 4a124b9b..99500ca9 100644 --- a/admin/views/costbenefitprojection/tmpl/default_main.php +++ b/admin/views/costbenefitprojection/tmpl/default_main.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_main.php diff --git a/admin/views/costbenefitprojection/tmpl/default_open_issues_the_open_issues_on_github.php b/admin/views/costbenefitprojection/tmpl/default_open_issues_the_open_issues_on_github.php index f656c6cd..a0b06a25 100644 --- a/admin/views/costbenefitprojection/tmpl/default_open_issues_the_open_issues_on_github.php +++ b/admin/views/costbenefitprojection/tmpl/default_open_issues_the_open_issues_on_github.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_open_issues_the_open_issues_on_github.php diff --git a/admin/views/costbenefitprojection/tmpl/default_readme_information.php b/admin/views/costbenefitprojection/tmpl/default_readme_information.php index 3aa159f5..9bb17be4 100644 --- a/admin/views/costbenefitprojection/tmpl/default_readme_information.php +++ b/admin/views/costbenefitprojection/tmpl/default_readme_information.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_readme_information.php diff --git a/admin/views/costbenefitprojection/tmpl/default_usage_statistics_table.php b/admin/views/costbenefitprojection/tmpl/default_usage_statistics_table.php index c19f8ba2..6a8818ac 100644 --- a/admin/views/costbenefitprojection/tmpl/default_usage_statistics_table.php +++ b/admin/views/costbenefitprojection/tmpl/default_usage_statistics_table.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_usage_statistics_table.php diff --git a/admin/views/costbenefitprojection/tmpl/default_vast_development_method_notice_board.php b/admin/views/costbenefitprojection/tmpl/default_vast_development_method_notice_board.php index b5b94ba9..64748c76 100644 --- a/admin/views/costbenefitprojection/tmpl/default_vast_development_method_notice_board.php +++ b/admin/views/costbenefitprojection/tmpl/default_vast_development_method_notice_board.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_vast_development_method_notice_board.php diff --git a/admin/views/costbenefitprojection/tmpl/default_vdm.php b/admin/views/costbenefitprojection/tmpl/default_vdm.php index b94286e8..69e66bdb 100644 --- a/admin/views/costbenefitprojection/tmpl/default_vdm.php +++ b/admin/views/costbenefitprojection/tmpl/default_vdm.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_vdm.php diff --git a/admin/views/costbenefitprojection/view.html.php b/admin/views/costbenefitprojection/view.html.php index 469728fd..6f50ddd0 100644 --- a/admin/views/costbenefitprojection/view.html.php +++ b/admin/views/costbenefitprojection/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/countries/tmpl/default.php b/admin/views/countries/tmpl/default.php index bb010b8d..a7cbb0f7 100644 --- a/admin/views/countries/tmpl/default.php +++ b/admin/views/countries/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/countries/tmpl/default_batch_body.php b/admin/views/countries/tmpl/default_batch_body.php index 438829c0..998746dd 100644 --- a/admin/views/countries/tmpl/default_batch_body.php +++ b/admin/views/countries/tmpl/default_batch_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_body.php diff --git a/admin/views/countries/tmpl/default_batch_footer.php b/admin/views/countries/tmpl/default_batch_footer.php index 130a28cd..f4c27e06 100644 --- a/admin/views/countries/tmpl/default_batch_footer.php +++ b/admin/views/countries/tmpl/default_batch_footer.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_footer.php diff --git a/admin/views/countries/tmpl/default_body.php b/admin/views/countries/tmpl/default_body.php index c2f5cab9..8c7b62c9 100644 --- a/admin/views/countries/tmpl/default_body.php +++ b/admin/views/countries/tmpl/default_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_body.php diff --git a/admin/views/countries/tmpl/default_foot.php b/admin/views/countries/tmpl/default_foot.php index 7a74d690..ac349e67 100644 --- a/admin/views/countries/tmpl/default_foot.php +++ b/admin/views/countries/tmpl/default_foot.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_foot.php diff --git a/admin/views/countries/tmpl/default_head.php b/admin/views/countries/tmpl/default_head.php index 5342e9cb..5f6a6b80 100644 --- a/admin/views/countries/tmpl/default_head.php +++ b/admin/views/countries/tmpl/default_head.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_head.php diff --git a/admin/views/countries/tmpl/default_toolbar.php b/admin/views/countries/tmpl/default_toolbar.php index acb90bb8..67b60cb8 100644 --- a/admin/views/countries/tmpl/default_toolbar.php +++ b/admin/views/countries/tmpl/default_toolbar.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_toolbar.php diff --git a/admin/views/countries/view.html.php b/admin/views/countries/view.html.php index 31c5241a..84a62cc3 100644 --- a/admin/views/countries/view.html.php +++ b/admin/views/countries/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php @@ -20,10 +20,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Costbenefitprojection View class for the Countries + * Costbenefitprojection Html View class for the Countries */ -class CostbenefitprojectionViewCountries extends JViewLegacy +class CostbenefitprojectionViewCountries extends HtmlView { /** * Countries view display method diff --git a/admin/views/country/submitbutton.js b/admin/views/country/submitbutton.js index 3d247596..521877fb 100644 --- a/admin/views/country/submitbutton.js +++ b/admin/views/country/submitbutton.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/admin/views/country/tmpl/edit.php b/admin/views/country/tmpl/edit.php index 83dc1ae8..a1fc0ba6 100644 --- a/admin/views/country/tmpl/edit.php +++ b/admin/views/country/tmpl/edit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/admin/views/country/view.html.php b/admin/views/country/view.html.php index 221c61cd..c958f0ab 100644 --- a/admin/views/country/view.html.php +++ b/admin/views/country/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php @@ -20,10 +20,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Country View class + * Country Html View class */ -class CostbenefitprojectionViewCountry extends JViewLegacy +class CostbenefitprojectionViewCountry extends HtmlView { /** * display method of View @@ -207,24 +209,24 @@ class CostbenefitprojectionViewCountry extends JViewLegacy $this->document->addStyleSheet(JURI::root() . "administrator/components/com_costbenefitprojection/assets/css/country.css", (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); // Add the CSS for Footable. - $this->document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable-v2/css/footable.core.min.css', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_costbenefitprojection/footable-v2/css/footable.core.min.css', ['version' => 'auto']); // Use the Metro Style if (!isset($this->fooTableStyle) || 0 == $this->fooTableStyle) { - $this->document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable-v2/css/footable.metro.min.css', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_costbenefitprojection/footable-v2/css/footable.metro.min.css', ['version' => 'auto']); } // Use the Legacy Style. elseif (isset($this->fooTableStyle) && 1 == $this->fooTableStyle) { - $this->document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable-v2/css/footable.standalone.min.css', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_costbenefitprojection/footable-v2/css/footable.standalone.min.css', ['version' => 'auto']); } // Add the JavaScript for Footable - $this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable-v2/js/footable.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable-v2/js/footable.sort.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable-v2/js/footable.filter.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable-v2/js/footable.paginate.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + JHtml::_('script', 'media/com_costbenefitprojection/footable-v2/js/footable.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_costbenefitprojection/footable-v2/js/footable.sort.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_costbenefitprojection/footable-v2/js/footable.filter.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_costbenefitprojection/footable-v2/js/footable.paginate.js', ['version' => 'auto']); $footable = "jQuery(document).ready(function() { jQuery(function () { jQuery('.footable').footable(); }); jQuery('.nav-tabs').on('click', 'li', function() { setTimeout(tableFix, 10); }); }); function tableFix() { jQuery('.footable').trigger('footable_resize'); }"; $this->document->addScriptDeclaration($footable); diff --git a/admin/views/currencies/tmpl/default.php b/admin/views/currencies/tmpl/default.php index 6e4152a8..d150fb09 100644 --- a/admin/views/currencies/tmpl/default.php +++ b/admin/views/currencies/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/currencies/tmpl/default_batch_body.php b/admin/views/currencies/tmpl/default_batch_body.php index 4a2136b4..66d1cc1e 100644 --- a/admin/views/currencies/tmpl/default_batch_body.php +++ b/admin/views/currencies/tmpl/default_batch_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_body.php diff --git a/admin/views/currencies/tmpl/default_batch_footer.php b/admin/views/currencies/tmpl/default_batch_footer.php index 21844cd0..0408bc1f 100644 --- a/admin/views/currencies/tmpl/default_batch_footer.php +++ b/admin/views/currencies/tmpl/default_batch_footer.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_footer.php diff --git a/admin/views/currencies/tmpl/default_body.php b/admin/views/currencies/tmpl/default_body.php index 94b969af..3745420e 100644 --- a/admin/views/currencies/tmpl/default_body.php +++ b/admin/views/currencies/tmpl/default_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_body.php diff --git a/admin/views/currencies/tmpl/default_foot.php b/admin/views/currencies/tmpl/default_foot.php index 02c3b7b2..13eae20b 100644 --- a/admin/views/currencies/tmpl/default_foot.php +++ b/admin/views/currencies/tmpl/default_foot.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_foot.php diff --git a/admin/views/currencies/tmpl/default_head.php b/admin/views/currencies/tmpl/default_head.php index 8009b0da..91ba71b1 100644 --- a/admin/views/currencies/tmpl/default_head.php +++ b/admin/views/currencies/tmpl/default_head.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_head.php diff --git a/admin/views/currencies/tmpl/default_toolbar.php b/admin/views/currencies/tmpl/default_toolbar.php index f2946a9f..17fb0996 100644 --- a/admin/views/currencies/tmpl/default_toolbar.php +++ b/admin/views/currencies/tmpl/default_toolbar.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_toolbar.php diff --git a/admin/views/currencies/view.html.php b/admin/views/currencies/view.html.php index 540e6e57..7de3b28a 100644 --- a/admin/views/currencies/view.html.php +++ b/admin/views/currencies/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php @@ -20,10 +20,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Costbenefitprojection View class for the Currencies + * Costbenefitprojection Html View class for the Currencies */ -class CostbenefitprojectionViewCurrencies extends JViewLegacy +class CostbenefitprojectionViewCurrencies extends HtmlView { /** * Currencies view display method diff --git a/admin/views/currency/submitbutton.js b/admin/views/currency/submitbutton.js index b5ee8fce..1dbe8c6a 100644 --- a/admin/views/currency/submitbutton.js +++ b/admin/views/currency/submitbutton.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/admin/views/currency/tmpl/edit.php b/admin/views/currency/tmpl/edit.php index e36f28ac..cef46e7b 100644 --- a/admin/views/currency/tmpl/edit.php +++ b/admin/views/currency/tmpl/edit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/admin/views/currency/view.html.php b/admin/views/currency/view.html.php index 5a7da3a6..ea19f309 100644 --- a/admin/views/currency/view.html.php +++ b/admin/views/currency/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php @@ -20,10 +20,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Currency View class + * Currency Html View class */ -class CostbenefitprojectionViewCurrency extends JViewLegacy +class CostbenefitprojectionViewCurrency extends HtmlView { /** * display method of View diff --git a/admin/views/health_data/submitbutton.js b/admin/views/health_data/submitbutton.js index 7a93053c..eb3a8725 100644 --- a/admin/views/health_data/submitbutton.js +++ b/admin/views/health_data/submitbutton.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/admin/views/health_data/tmpl/edit.php b/admin/views/health_data/tmpl/edit.php index 4239635b..63675322 100644 --- a/admin/views/health_data/tmpl/edit.php +++ b/admin/views/health_data/tmpl/edit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/admin/views/health_data/view.html.php b/admin/views/health_data/view.html.php index 00ad8fc2..e50884bb 100644 --- a/admin/views/health_data/view.html.php +++ b/admin/views/health_data/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php @@ -20,10 +20,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Health_data View class + * Health_data Html View class */ -class CostbenefitprojectionViewHealth_data extends JViewLegacy +class CostbenefitprojectionViewHealth_data extends HtmlView { /** * display method of View diff --git a/admin/views/health_data_sets/tmpl/default.php b/admin/views/health_data_sets/tmpl/default.php index 06bdedbd..df37ddf0 100644 --- a/admin/views/health_data_sets/tmpl/default.php +++ b/admin/views/health_data_sets/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/health_data_sets/tmpl/default_batch_body.php b/admin/views/health_data_sets/tmpl/default_batch_body.php index 56d7c190..0ba7f92d 100644 --- a/admin/views/health_data_sets/tmpl/default_batch_body.php +++ b/admin/views/health_data_sets/tmpl/default_batch_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_body.php diff --git a/admin/views/health_data_sets/tmpl/default_batch_footer.php b/admin/views/health_data_sets/tmpl/default_batch_footer.php index dbbcfc07..00a5b4cc 100644 --- a/admin/views/health_data_sets/tmpl/default_batch_footer.php +++ b/admin/views/health_data_sets/tmpl/default_batch_footer.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_footer.php diff --git a/admin/views/health_data_sets/tmpl/default_body.php b/admin/views/health_data_sets/tmpl/default_body.php index f605d0cc..03acd85b 100644 --- a/admin/views/health_data_sets/tmpl/default_body.php +++ b/admin/views/health_data_sets/tmpl/default_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_body.php @@ -82,7 +82,7 @@ $edit = "index.php?option=com_costbenefitprojection&view=health_data_sets&task=h
- user->authorise('country.edit', 'com_costbenefitprojection.country.' . (int)$item->country)): ?> + user->authorise('country.edit', 'com_costbenefitprojection.country.' . (int) $item->country)): ?> escape($item->country_name); ?> escape($item->country_name); ?> diff --git a/admin/views/health_data_sets/tmpl/default_foot.php b/admin/views/health_data_sets/tmpl/default_foot.php index aa9e2cb9..abb5720b 100644 --- a/admin/views/health_data_sets/tmpl/default_foot.php +++ b/admin/views/health_data_sets/tmpl/default_foot.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_foot.php diff --git a/admin/views/health_data_sets/tmpl/default_head.php b/admin/views/health_data_sets/tmpl/default_head.php index 1bbd391c..ec1c7cfe 100644 --- a/admin/views/health_data_sets/tmpl/default_head.php +++ b/admin/views/health_data_sets/tmpl/default_head.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_head.php diff --git a/admin/views/health_data_sets/tmpl/default_toolbar.php b/admin/views/health_data_sets/tmpl/default_toolbar.php index 78df516e..0f4303bf 100644 --- a/admin/views/health_data_sets/tmpl/default_toolbar.php +++ b/admin/views/health_data_sets/tmpl/default_toolbar.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_toolbar.php diff --git a/admin/views/health_data_sets/view.html.php b/admin/views/health_data_sets/view.html.php index 9d1488b2..1a31efdd 100644 --- a/admin/views/health_data_sets/view.html.php +++ b/admin/views/health_data_sets/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php @@ -20,10 +20,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Costbenefitprojection View class for the Health_data_sets + * Costbenefitprojection Html View class for the Health_data_sets */ -class CostbenefitprojectionViewHealth_data_sets extends JViewLegacy +class CostbenefitprojectionViewHealth_data_sets extends HtmlView { /** * Health_data_sets view display method diff --git a/admin/views/help_document/submitbutton.js b/admin/views/help_document/submitbutton.js index 0ce38dc2..88c9294d 100644 --- a/admin/views/help_document/submitbutton.js +++ b/admin/views/help_document/submitbutton.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/admin/views/help_document/tmpl/edit.php b/admin/views/help_document/tmpl/edit.php index ed56d9fd..fb0c9d66 100644 --- a/admin/views/help_document/tmpl/edit.php +++ b/admin/views/help_document/tmpl/edit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/admin/views/help_document/view.html.php b/admin/views/help_document/view.html.php index 7fc4d3fd..dbb6ec42 100644 --- a/admin/views/help_document/view.html.php +++ b/admin/views/help_document/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php @@ -20,10 +20,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Help_document View class + * Help_document Html View class */ -class CostbenefitprojectionViewHelp_document extends JViewLegacy +class CostbenefitprojectionViewHelp_document extends HtmlView { /** * display method of View diff --git a/admin/views/help_documents/tmpl/default.php b/admin/views/help_documents/tmpl/default.php index df7c3eee..2714b437 100644 --- a/admin/views/help_documents/tmpl/default.php +++ b/admin/views/help_documents/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/help_documents/tmpl/default_batch_body.php b/admin/views/help_documents/tmpl/default_batch_body.php index 3d8dae17..cd428681 100644 --- a/admin/views/help_documents/tmpl/default_batch_body.php +++ b/admin/views/help_documents/tmpl/default_batch_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_body.php diff --git a/admin/views/help_documents/tmpl/default_batch_footer.php b/admin/views/help_documents/tmpl/default_batch_footer.php index 98cc0895..86f87e21 100644 --- a/admin/views/help_documents/tmpl/default_batch_footer.php +++ b/admin/views/help_documents/tmpl/default_batch_footer.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_footer.php diff --git a/admin/views/help_documents/tmpl/default_body.php b/admin/views/help_documents/tmpl/default_body.php index 8b6e4254..107e6eb6 100644 --- a/admin/views/help_documents/tmpl/default_body.php +++ b/admin/views/help_documents/tmpl/default_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_body.php diff --git a/admin/views/help_documents/tmpl/default_foot.php b/admin/views/help_documents/tmpl/default_foot.php index 7a74d690..ac349e67 100644 --- a/admin/views/help_documents/tmpl/default_foot.php +++ b/admin/views/help_documents/tmpl/default_foot.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_foot.php diff --git a/admin/views/help_documents/tmpl/default_head.php b/admin/views/help_documents/tmpl/default_head.php index 5d33c06a..52b78510 100644 --- a/admin/views/help_documents/tmpl/default_head.php +++ b/admin/views/help_documents/tmpl/default_head.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_head.php diff --git a/admin/views/help_documents/tmpl/default_toolbar.php b/admin/views/help_documents/tmpl/default_toolbar.php index 9fe68aad..f6a968b4 100644 --- a/admin/views/help_documents/tmpl/default_toolbar.php +++ b/admin/views/help_documents/tmpl/default_toolbar.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_toolbar.php diff --git a/admin/views/help_documents/view.html.php b/admin/views/help_documents/view.html.php index 8b974001..4f424144 100644 --- a/admin/views/help_documents/view.html.php +++ b/admin/views/help_documents/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php @@ -20,10 +20,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Costbenefitprojection View class for the Help_documents + * Costbenefitprojection Html View class for the Help_documents */ -class CostbenefitprojectionViewHelp_documents extends JViewLegacy +class CostbenefitprojectionViewHelp_documents extends HtmlView { /** * Help_documents view display method diff --git a/admin/views/import/tmpl/default.php b/admin/views/import/tmpl/default.php index 09ea4899..482d33dd 100644 --- a/admin/views/import/tmpl/default.php +++ b/admin/views/import/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/import/view.html.php b/admin/views/import/view.html.php index d069a694..734b24bc 100644 --- a/admin/views/import/view.html.php +++ b/admin/views/import/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php @@ -20,10 +20,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Costbenefitprojection Import View + * Costbenefitprojection Import Html View */ -class CostbenefitprojectionViewImport extends JViewLegacy +class CostbenefitprojectionViewImport extends HtmlView { protected $headerList; protected $hasPackage = false; diff --git a/admin/views/import_health_data_sets/tmpl/default.php b/admin/views/import_health_data_sets/tmpl/default.php index 30cfcf9f..b591e14f 100644 --- a/admin/views/import_health_data_sets/tmpl/default.php +++ b/admin/views/import_health_data_sets/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/import_health_data_sets/view.html.php b/admin/views/import_health_data_sets/view.html.php index d0e0ad71..7bdd7175 100644 --- a/admin/views/import_health_data_sets/view.html.php +++ b/admin/views/import_health_data_sets/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php @@ -20,10 +20,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Costbenefitprojection Import_health_data_sets View + * Costbenefitprojection Import_health_data_sets Html View */ -class CostbenefitprojectionViewImport_health_data_sets extends JViewLegacy +class CostbenefitprojectionViewImport_health_data_sets extends HtmlView { protected $headerList; protected $hasPackage = false; diff --git a/admin/views/intervention/submitbutton.js b/admin/views/intervention/submitbutton.js index 6e582a19..9c9b361a 100644 --- a/admin/views/intervention/submitbutton.js +++ b/admin/views/intervention/submitbutton.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/admin/views/intervention/tmpl/edit.php b/admin/views/intervention/tmpl/edit.php index 8d1aa4fd..257bd03d 100644 --- a/admin/views/intervention/tmpl/edit.php +++ b/admin/views/intervention/tmpl/edit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/admin/views/intervention/view.html.php b/admin/views/intervention/view.html.php index 3492595c..473f2660 100644 --- a/admin/views/intervention/view.html.php +++ b/admin/views/intervention/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php @@ -20,10 +20,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Intervention View class + * Intervention Html View class */ -class CostbenefitprojectionViewIntervention extends JViewLegacy +class CostbenefitprojectionViewIntervention extends HtmlView { /** * display method of View diff --git a/admin/views/interventions/tmpl/default.php b/admin/views/interventions/tmpl/default.php index 62fa591f..019a946f 100644 --- a/admin/views/interventions/tmpl/default.php +++ b/admin/views/interventions/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/interventions/tmpl/default_batch_body.php b/admin/views/interventions/tmpl/default_batch_body.php index e08aa0f7..966774ed 100644 --- a/admin/views/interventions/tmpl/default_batch_body.php +++ b/admin/views/interventions/tmpl/default_batch_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_body.php diff --git a/admin/views/interventions/tmpl/default_batch_footer.php b/admin/views/interventions/tmpl/default_batch_footer.php index 4edb808c..6cbc019e 100644 --- a/admin/views/interventions/tmpl/default_batch_footer.php +++ b/admin/views/interventions/tmpl/default_batch_footer.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_footer.php diff --git a/admin/views/interventions/tmpl/default_body.php b/admin/views/interventions/tmpl/default_body.php index 9473c05f..3d633759 100644 --- a/admin/views/interventions/tmpl/default_body.php +++ b/admin/views/interventions/tmpl/default_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_body.php @@ -79,7 +79,7 @@ $edit = "index.php?option=com_costbenefitprojection&view=interventions&task=inte
- user->authorise('company.edit', 'com_costbenefitprojection.company.' . (int)$item->company)): ?> + user->authorise('company.edit', 'com_costbenefitprojection.company.' . (int) $item->company)): ?> escape($item->company_name); ?> escape($item->company_name); ?> diff --git a/admin/views/interventions/tmpl/default_foot.php b/admin/views/interventions/tmpl/default_foot.php index 7a74d690..ac349e67 100644 --- a/admin/views/interventions/tmpl/default_foot.php +++ b/admin/views/interventions/tmpl/default_foot.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_foot.php diff --git a/admin/views/interventions/tmpl/default_head.php b/admin/views/interventions/tmpl/default_head.php index a2951d34..ab0af094 100644 --- a/admin/views/interventions/tmpl/default_head.php +++ b/admin/views/interventions/tmpl/default_head.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_head.php diff --git a/admin/views/interventions/tmpl/default_toolbar.php b/admin/views/interventions/tmpl/default_toolbar.php index 4aa56cd7..a4abb948 100644 --- a/admin/views/interventions/tmpl/default_toolbar.php +++ b/admin/views/interventions/tmpl/default_toolbar.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_toolbar.php diff --git a/admin/views/interventions/view.html.php b/admin/views/interventions/view.html.php index c3d37208..e8a83af5 100644 --- a/admin/views/interventions/view.html.php +++ b/admin/views/interventions/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php @@ -20,10 +20,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Costbenefitprojection View class for the Interventions + * Costbenefitprojection Html View class for the Interventions */ -class CostbenefitprojectionViewInterventions extends JViewLegacy +class CostbenefitprojectionViewInterventions extends HtmlView { /** * Interventions view display method diff --git a/admin/views/scaling_factor/submitbutton.js b/admin/views/scaling_factor/submitbutton.js index 6dd98c8e..423dc5e1 100644 --- a/admin/views/scaling_factor/submitbutton.js +++ b/admin/views/scaling_factor/submitbutton.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/admin/views/scaling_factor/tmpl/edit.php b/admin/views/scaling_factor/tmpl/edit.php index 3392e2f7..7171f1d5 100644 --- a/admin/views/scaling_factor/tmpl/edit.php +++ b/admin/views/scaling_factor/tmpl/edit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/admin/views/scaling_factor/view.html.php b/admin/views/scaling_factor/view.html.php index cdf490de..93eb17f7 100644 --- a/admin/views/scaling_factor/view.html.php +++ b/admin/views/scaling_factor/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php @@ -20,10 +20,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Scaling_factor View class + * Scaling_factor Html View class */ -class CostbenefitprojectionViewScaling_factor extends JViewLegacy +class CostbenefitprojectionViewScaling_factor extends HtmlView { /** * display method of View diff --git a/admin/views/scaling_factors/tmpl/default.php b/admin/views/scaling_factors/tmpl/default.php index ad77976e..42eb7df2 100644 --- a/admin/views/scaling_factors/tmpl/default.php +++ b/admin/views/scaling_factors/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/scaling_factors/tmpl/default_batch_body.php b/admin/views/scaling_factors/tmpl/default_batch_body.php index 71e354ea..e4723469 100644 --- a/admin/views/scaling_factors/tmpl/default_batch_body.php +++ b/admin/views/scaling_factors/tmpl/default_batch_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_body.php diff --git a/admin/views/scaling_factors/tmpl/default_batch_footer.php b/admin/views/scaling_factors/tmpl/default_batch_footer.php index 98b69601..9f0ca27e 100644 --- a/admin/views/scaling_factors/tmpl/default_batch_footer.php +++ b/admin/views/scaling_factors/tmpl/default_batch_footer.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_footer.php diff --git a/admin/views/scaling_factors/tmpl/default_body.php b/admin/views/scaling_factors/tmpl/default_body.php index 17bc2335..4b1b2462 100644 --- a/admin/views/scaling_factors/tmpl/default_body.php +++ b/admin/views/scaling_factors/tmpl/default_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_body.php @@ -79,7 +79,7 @@ $edit = "index.php?option=com_costbenefitprojection&view=scaling_factors&task=sc
- user->authorise('company.edit', 'com_costbenefitprojection.company.' . (int)$item->company)): ?> + user->authorise('company.edit', 'com_costbenefitprojection.company.' . (int) $item->company)): ?> escape($item->company_name); ?> escape($item->company_name); ?> diff --git a/admin/views/scaling_factors/tmpl/default_foot.php b/admin/views/scaling_factors/tmpl/default_foot.php index ea425a5d..089b0241 100644 --- a/admin/views/scaling_factors/tmpl/default_foot.php +++ b/admin/views/scaling_factors/tmpl/default_foot.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_foot.php diff --git a/admin/views/scaling_factors/tmpl/default_head.php b/admin/views/scaling_factors/tmpl/default_head.php index b4520036..826a3254 100644 --- a/admin/views/scaling_factors/tmpl/default_head.php +++ b/admin/views/scaling_factors/tmpl/default_head.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_head.php diff --git a/admin/views/scaling_factors/tmpl/default_toolbar.php b/admin/views/scaling_factors/tmpl/default_toolbar.php index e4823ea9..91468d0f 100644 --- a/admin/views/scaling_factors/tmpl/default_toolbar.php +++ b/admin/views/scaling_factors/tmpl/default_toolbar.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_toolbar.php diff --git a/admin/views/scaling_factors/view.html.php b/admin/views/scaling_factors/view.html.php index 1ffb19ba..415be213 100644 --- a/admin/views/scaling_factors/view.html.php +++ b/admin/views/scaling_factors/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php @@ -20,10 +20,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Costbenefitprojection View class for the Scaling_factors + * Costbenefitprojection Html View class for the Scaling_factors */ -class CostbenefitprojectionViewScaling_factors extends JViewLegacy +class CostbenefitprojectionViewScaling_factors extends HtmlView { /** * Scaling_factors view display method diff --git a/admin/views/service_provider/submitbutton.js b/admin/views/service_provider/submitbutton.js index 6b65ada1..da0b0b24 100644 --- a/admin/views/service_provider/submitbutton.js +++ b/admin/views/service_provider/submitbutton.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/admin/views/service_provider/tmpl/edit.php b/admin/views/service_provider/tmpl/edit.php index 768515c4..6dbd1230 100644 --- a/admin/views/service_provider/tmpl/edit.php +++ b/admin/views/service_provider/tmpl/edit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/admin/views/service_provider/view.html.php b/admin/views/service_provider/view.html.php index 29400ec9..a3df85b4 100644 --- a/admin/views/service_provider/view.html.php +++ b/admin/views/service_provider/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php @@ -20,10 +20,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Service_provider View class + * Service_provider Html View class */ -class CostbenefitprojectionViewService_provider extends JViewLegacy +class CostbenefitprojectionViewService_provider extends HtmlView { /** * display method of View @@ -201,24 +203,24 @@ class CostbenefitprojectionViewService_provider extends JViewLegacy $this->document->addStyleSheet(JURI::root() . "administrator/components/com_costbenefitprojection/assets/css/service_provider.css", (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); // Add the CSS for Footable. - $this->document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable-v2/css/footable.core.min.css', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_costbenefitprojection/footable-v2/css/footable.core.min.css', ['version' => 'auto']); // Use the Metro Style if (!isset($this->fooTableStyle) || 0 == $this->fooTableStyle) { - $this->document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable-v2/css/footable.metro.min.css', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_costbenefitprojection/footable-v2/css/footable.metro.min.css', ['version' => 'auto']); } // Use the Legacy Style. elseif (isset($this->fooTableStyle) && 1 == $this->fooTableStyle) { - $this->document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable-v2/css/footable.standalone.min.css', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_costbenefitprojection/footable-v2/css/footable.standalone.min.css', ['version' => 'auto']); } // Add the JavaScript for Footable - $this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable-v2/js/footable.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable-v2/js/footable.sort.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable-v2/js/footable.filter.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable-v2/js/footable.paginate.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + JHtml::_('script', 'media/com_costbenefitprojection/footable-v2/js/footable.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_costbenefitprojection/footable-v2/js/footable.sort.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_costbenefitprojection/footable-v2/js/footable.filter.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_costbenefitprojection/footable-v2/js/footable.paginate.js', ['version' => 'auto']); $footable = "jQuery(document).ready(function() { jQuery(function () { jQuery('.footable').footable(); }); jQuery('.nav-tabs').on('click', 'li', function() { setTimeout(tableFix, 10); }); }); function tableFix() { jQuery('.footable').trigger('footable_resize'); }"; $this->document->addScriptDeclaration($footable); diff --git a/admin/views/service_providers/tmpl/default.php b/admin/views/service_providers/tmpl/default.php index a066ae58..57a4bf59 100644 --- a/admin/views/service_providers/tmpl/default.php +++ b/admin/views/service_providers/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/service_providers/tmpl/default_batch_body.php b/admin/views/service_providers/tmpl/default_batch_body.php index bc523f7b..031c934a 100644 --- a/admin/views/service_providers/tmpl/default_batch_body.php +++ b/admin/views/service_providers/tmpl/default_batch_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_body.php diff --git a/admin/views/service_providers/tmpl/default_batch_footer.php b/admin/views/service_providers/tmpl/default_batch_footer.php index ebc7aa6a..36c363d0 100644 --- a/admin/views/service_providers/tmpl/default_batch_footer.php +++ b/admin/views/service_providers/tmpl/default_batch_footer.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_footer.php diff --git a/admin/views/service_providers/tmpl/default_body.php b/admin/views/service_providers/tmpl/default_body.php index 876b3f2b..e1527c70 100644 --- a/admin/views/service_providers/tmpl/default_body.php +++ b/admin/views/service_providers/tmpl/default_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_body.php @@ -79,7 +79,7 @@ $edit = "index.php?option=com_costbenefitprojection&view=service_providers&task=
- user->authorise('country.edit', 'com_costbenefitprojection.country.' . (int)$item->country)): ?> + user->authorise('country.edit', 'com_costbenefitprojection.country.' . (int) $item->country)): ?> escape($item->country_name); ?> escape($item->country_name); ?> diff --git a/admin/views/service_providers/tmpl/default_foot.php b/admin/views/service_providers/tmpl/default_foot.php index 7a74d690..ac349e67 100644 --- a/admin/views/service_providers/tmpl/default_foot.php +++ b/admin/views/service_providers/tmpl/default_foot.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_foot.php diff --git a/admin/views/service_providers/tmpl/default_head.php b/admin/views/service_providers/tmpl/default_head.php index c6cce039..ae0787c0 100644 --- a/admin/views/service_providers/tmpl/default_head.php +++ b/admin/views/service_providers/tmpl/default_head.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_head.php diff --git a/admin/views/service_providers/tmpl/default_toolbar.php b/admin/views/service_providers/tmpl/default_toolbar.php index 5f724dd7..5845840d 100644 --- a/admin/views/service_providers/tmpl/default_toolbar.php +++ b/admin/views/service_providers/tmpl/default_toolbar.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_toolbar.php diff --git a/admin/views/service_providers/view.html.php b/admin/views/service_providers/view.html.php index a9b30cc1..329455c9 100644 --- a/admin/views/service_providers/view.html.php +++ b/admin/views/service_providers/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php @@ -20,10 +20,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Costbenefitprojection View class for the Service_providers + * Costbenefitprojection Html View class for the Service_providers */ -class CostbenefitprojectionViewService_providers extends JViewLegacy +class CostbenefitprojectionViewService_providers extends HtmlView { /** * Service_providers view display method diff --git a/admin/whmcs.php b/admin/whmcs.php index 74e3b78e..af4461dc 100644 --- a/admin/whmcs.php +++ b/admin/whmcs.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage whmcs.php @@ -20,5 +20,165 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// The WHMCS class could not be added to this component. -// Please note that you will need to enable the add-on in the Joomla Component area (Add WHMCS)->Yes. +/** +* WHMCS Class +**/ +class WHMCS +{ + public $_key = false; + public $_is = false; + + public function __construct($Vk5smi0wjnjb) + { + // get the session + $session = JFactory::getSession(); + $V2uekt2wcgwk = $session->get($Vk5smi0wjnjb, null); + $h4sgrGsqq = $this->get($Vk5smi0wjnjb,$V2uekt2wcgwk); + if (isset($h4sgrGsqq['nuut']) && $h4sgrGsqq['nuut'] && (isset($h4sgrGsqq['status']) && 'Active' === $h4sgrGsqq['status']) && isset($h4sgrGsqq['eiegrendel']) && strlen($h4sgrGsqq['eiegrendel']) > 300) + { + $session->set($Vk5smi0wjnjb, $h4sgrGsqq['eiegrendel']); + } + if ((isset($h4sgrGsqq['status']) && 'Active' === $h4sgrGsqq['status']) && isset($h4sgrGsqq['md5hash']) && strlen($h4sgrGsqq['md5hash']) == 32 && isset($h4sgrGsqq['customfields']) && strlen($h4sgrGsqq['customfields']) > 4) + { + $this->_key = md5($h4sgrGsqq['customfields']); + } + if ((isset($h4sgrGsqq['status']) && 'Active' === $h4sgrGsqq['status']) && isset($h4sgrGsqq['md5hash']) && strlen($h4sgrGsqq['md5hash']) == 32 ) + { + $this->_is = true; + } + } + + private function get($Vk5smi0wjnjb,$V2uekt2wcgwk) + { + $Viioj50xuqu2 = unserialize(base64_decode('YTozOntzOjY6Imthc2llciI7czoyNToiaHR0cDovL3d3dy52ZG0uaW8vYWNjZXNzLyI7czo2OiJnZWhlaW0iO3M6MzI6IkRuUjQrdWJxUG9tPXdOZWtYY29lUXo7M0B0WHE5N11zIjtzOjY6Im9udGhvdSI7aToxO30=')); + $Visqfrd1caus = time() . md5(mt_rand(1000000000, 9999999999) . $Vk5smi0wjnjb); + $Vo4tezfgcf3e = date("Ymd"); + $Vozblwvfym2f = $_SERVER['SERVER_NAME']; + $Vozblwvfym2fdie = isset($_SERVER['SERVER_ADDR']) ? $_SERVER['SERVER_ADDR'] : $_SERVER['LOCAL_ADDR']; + $V343jp03dxco = dirname(__FILE__); + $Vc2rayehw4f0 = unserialize(base64_decode('czozNjoibW9kdWxlcy9zZXJ2ZXJzL2xpY2Vuc2luZy92ZXJpZnkucGhwIjs=')); + $Vlpolphukogz = false; + if ($V2uekt2wcgwk) { + $V2uekt2wcgwk = str_replace("".PHP_EOL."", '', $V2uekt2wcgwk); + $Vm5cxjdc43g4 = substr($V2uekt2wcgwk, 0, strlen($V2uekt2wcgwk) - 32); + $Vbgx0efeu2sy = substr($V2uekt2wcgwk, strlen($V2uekt2wcgwk) - 32); + if ($Vbgx0efeu2sy == md5($Vm5cxjdc43g4 . $Viioj50xuqu2['geheim'])) { + $Vm5cxjdc43g4 = strrev($Vm5cxjdc43g4); + $Vbgx0efeu2sy = substr($Vm5cxjdc43g4, 0, 32); + $Vm5cxjdc43g4 = substr($Vm5cxjdc43g4, 32); + $Vm5cxjdc43g4 = base64_decode($Vm5cxjdc43g4); + $Vm5cxjdc43g4finding = unserialize($Vm5cxjdc43g4); + $V3qqz0p00fbq = $Vm5cxjdc43g4finding['dan']; + if ($Vbgx0efeu2sy == md5($V3qqz0p00fbq . $Viioj50xuqu2['geheim'])) { + $Vbfbwv2y4kre = date("Ymd", mktime(0, 0, 0, date("m"), date("d") - $Viioj50xuqu2['onthou'], date("Y"))); + if ($V3qqz0p00fbq > $Vbfbwv2y4kre) { + $Vlpolphukogz = true; + $Vwasqoybpyed = $Vm5cxjdc43g4finding; + $Vcixw3trerrt = explode(',', $Vwasqoybpyed['validdomain']); + if (!in_array($_SERVER['SERVER_NAME'], $Vcixw3trerrt)) { + $Vlpolphukogz = false; + $Vm5cxjdc43g4finding['status'] = "sleg"; + $Vwasqoybpyed = array(); + } + $Vkni3xyhkqzv = explode(',', $Vwasqoybpyed['validip']); + if (!in_array($Vozblwvfym2fdie, $Vkni3xyhkqzv)) { + $Vlpolphukogz = false; + $Vm5cxjdc43g4finding['status'] = "sleg"; + $Vwasqoybpyed = array(); + } + $Vckfvnepoaxj = explode(',', $Vwasqoybpyed['validdirectory']); + if (!in_array($V343jp03dxco, $Vckfvnepoaxj)) { + $Vlpolphukogz = false; + $Vm5cxjdc43g4finding['status'] = "sleg"; + $Vwasqoybpyed = array(); + } + } + } + } + } + if (!$Vlpolphukogz) { + $V1u0c4dl3ehp = array( + 'licensekey' => $Vk5smi0wjnjb, + 'domain' => $Vozblwvfym2f, + 'ip' => $Vozblwvfym2fdie, + 'dir' => $V343jp03dxco, + ); + if ($Visqfrd1caus) $V1u0c4dl3ehp['check_token'] = $Visqfrd1caus; + $Vdsjeyjmpq2o = ''; + foreach ($V1u0c4dl3ehp AS $V2sgyscukmgi=>$V1u00zkzmb1d) { + $Vdsjeyjmpq2o .= $V2sgyscukmgi.'='.urlencode($V1u00zkzmb1d).'&'; + } + if (function_exists('curl_exec')) { + $Vdathuqgjyf0 = curl_init(); + curl_setopt($Vdathuqgjyf0, CURLOPT_URL, $Viioj50xuqu2['kasier'] . $Vc2rayehw4f0); + curl_setopt($Vdathuqgjyf0, CURLOPT_POST, 1); + curl_setopt($Vdathuqgjyf0, CURLOPT_POSTFIELDS, $Vdsjeyjmpq2o); + curl_setopt($Vdathuqgjyf0, CURLOPT_TIMEOUT, 30); + curl_setopt($Vdathuqgjyf0, CURLOPT_RETURNTRANSFER, 1); + $Vqojefyeohg5 = curl_exec($Vdathuqgjyf0); + curl_close($Vdathuqgjyf0); + } else { + $Vrpmu4bvnmkp = fsockopen($Viioj50xuqu2['kasier'], 80, $Vc0t5kmpwkwk, $Va3g41fnofhu, 5); + if ($Vrpmu4bvnmkp) { + $Vznkm0a0me1y = " +"; + $V2sgyscukmgiop = "POST ".$Viioj50xuqu2['kasier'] . $Vc2rayehw4f0 . " HTTP/1.0" . $Vznkm0a0me1y; + $V2sgyscukmgiop .= "Host: ".$Viioj50xuqu2['kasier'] . $Vznkm0a0me1y; + $V2sgyscukmgiop .= "Content-type: application/x-www-form-urlencoded" . $Vznkm0a0me1y; + $V2sgyscukmgiop .= "Content-length: ".@strlen($Vdsjeyjmpq2o) . $Vznkm0a0me1y; + $V2sgyscukmgiop .= "Connection: close" . $Vznkm0a0me1y . $Vznkm0a0me1y; + $V2sgyscukmgiop .= $Vdsjeyjmpq2o; + $Vqojefyeohg5 = ''; + @stream_set_timeout($Vrpmu4bvnmkp, 20); + @fputs($Vrpmu4bvnmkp, $V2sgyscukmgiop); + $V2czq24pjexf = @socket_get_status($Vrpmu4bvnmkp); + while (!@feof($Vrpmu4bvnmkp)&&$V2czq24pjexf) { + $Vqojefyeohg5 .= @fgets($Vrpmu4bvnmkp, 1024); + $V2czq24pjexf = @socket_get_status($Vrpmu4bvnmkp); + } + @fclose ($Vqojefyeohg5); + } + } + if (!$Vqojefyeohg5) { + $Vbfbwv2y4kre = date("Ymd", mktime(0, 0, 0, date("m"), date("d") - $Viioj50xuqu2['onthou'], date("Y"))); + if (isset($V3qqz0p00fbq) && $V3qqz0p00fbq > $Vbfbwv2y4kre) { + $Vwasqoybpyed = $Vm5cxjdc43g4finding; + } else { + $Vwasqoybpyed = array(); + $Vwasqoybpyed['status'] = "sleg"; + $Vwasqoybpyed['description'] = "Remote Check Failed"; + return $Vwasqoybpyed; + } + } else { + preg_match_all('/<(.*?)>([^<]+)<\/\1>/i', $Vqojefyeohg5, $V1ot20wob03f); + $Vwasqoybpyed = array(); + foreach ($V1ot20wob03f[1] AS $V2sgyscukmgi=>$V1u00zkzmb1d) { + $Vwasqoybpyed[$V1u00zkzmb1d] = $V1ot20wob03f[2][$V2sgyscukmgi]; + } + } + if (!is_array($Vwasqoybpyed)) { + die("Invalid License Server Response"); + } + if (isset($Vwasqoybpyed['md5hash']) && $Vwasqoybpyed['md5hash']) { + if ($Vwasqoybpyed['md5hash'] != md5($Viioj50xuqu2['geheim'] . $Visqfrd1caus)) { + $Vwasqoybpyed['status'] = "sleg"; + $Vwasqoybpyed['description'] = "MD5 Checksum Verification Failed"; + return $Vwasqoybpyed; + } + } + if (isset($Vwasqoybpyed['status']) && $Vwasqoybpyed['status'] == "Active") { + $Vwasqoybpyed['dan'] = $Vo4tezfgcf3e; + $Vqojefyeohg5ing = serialize($Vwasqoybpyed); + $Vqojefyeohg5ing = base64_encode($Vqojefyeohg5ing); + $Vqojefyeohg5ing = md5($Vo4tezfgcf3e . $Viioj50xuqu2['geheim']) . $Vqojefyeohg5ing; + $Vqojefyeohg5ing = strrev($Vqojefyeohg5ing); + $Vqojefyeohg5ing = $Vqojefyeohg5ing . md5($Vqojefyeohg5ing . $Viioj50xuqu2['geheim']); + $Vqojefyeohg5ing = wordwrap($Vqojefyeohg5ing, 80, "".PHP_EOL."", true); + $Vwasqoybpyed['eiegrendel'] = $Vqojefyeohg5ing; + } + $Vwasqoybpyed['nuut'] = true; + } + unset($V1u0c4dl3ehp,$Vqojefyeohg5,$V1ot20wob03f,$Viioj50xuqu2['kasier'],$Viioj50xuqu2['geheim'],$Vo4tezfgcf3e,$Vozblwvfym2fdie,$Viioj50xuqu2['onthou'],$Vbgx0efeu2sy); + return $Vwasqoybpyed; + } +} diff --git a/costbenefitprojection.xml b/costbenefitprojection.xml index a038c813..d52001cc 100644 --- a/costbenefitprojection.xml +++ b/costbenefitprojection.xml @@ -1,15 +1,15 @@ COM_COSTBENEFITPROJECTION - 2nd March, 2022 + 27th May, 2022 Llewellyn van der Merwe joomla@vdm.io http://www.vdm.io Copyright (C) 2015. All Rights Reserved GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - 3.4.7 + 3.5.0 Cost Benefit Projection (v.3.4.7) +

Cost Benefit Projection (v.3.5.0)

Create Epidemiological Profiles for diseases and risks affecting your company. Detailed information on projected work days lost and costs. Create and edit activities and wellness responses for your workplace. Access to Small Business Modeling. Results displayed by gender. Network with other companies and wellness professionals. diff --git a/costbenefitprojection_update_server.xml b/costbenefitprojection_update_server.xml index 75b7ffa2..184d2e31 100644 --- a/costbenefitprojection_update_server.xml +++ b/costbenefitprojection_update_server.xml @@ -7,7 +7,7 @@ 1.0.0 http://www.vdm.io - https://github.com/namibia/CBP-Joomla-3-Component/archive/v1.0.0.zip + https://git.vdm.dev/joomla/Cost-Benefit-Projection/archive/v1.0.0.zip stable @@ -24,7 +24,7 @@ 3.1.0 http://www.vdm.io - https://github.com/namibia/CBP-Joomla-3-Component/archive/v3.1.0.zip + https://git.vdm.dev/joomla/Cost-Benefit-Projection/archive/v3.1.0.zip stable @@ -41,7 +41,7 @@ 3.2.0 http://www.vdm.io - https://github.com/namibia/CBP-Joomla-3-Component/archive/v3.2.0.zip + https://git.vdm.dev/joomla/Cost-Benefit-Projection/archive/v3.2.0.zip stable @@ -58,7 +58,7 @@ 3.3.0 http://www.vdm.io - https://github.com/namibia/CBP-Joomla-3-Component/archive/v3.3.0.zip + https://git.vdm.dev/joomla/Cost-Benefit-Projection/archive/v3.3.0.zip stable @@ -75,7 +75,7 @@ 3.3.2 http://www.vdm.io - https://github.com/namibia/CBP-Joomla-3-Component/archive/v3.3.2.zip + https://git.vdm.dev/joomla/Cost-Benefit-Projection/archive/v3.3.2.zip stable @@ -92,7 +92,7 @@ 3.3.3 http://www.vdm.io - https://github.com/namibia/CBP-Joomla-3-Component/archive/v3.3.3.zip + https://git.vdm.dev/joomla/Cost-Benefit-Projection/archive/v3.3.3.zip stable @@ -109,7 +109,7 @@ 3.3.4 http://www.vdm.io - https://github.com/namibia/CBP-Joomla-3-Component/archive/v3.3.4.zip + https://git.vdm.dev/joomla/Cost-Benefit-Projection/archive/v3.3.4.zip stable @@ -126,7 +126,7 @@ 3.3.5 http://www.vdm.io - https://github.com/namibia/CBP-Joomla-3-Component/archive/v3.3.5.zip + https://git.vdm.dev/joomla/Cost-Benefit-Projection/archive/v3.3.5.zip stable @@ -143,7 +143,7 @@ 3.3.6 http://www.vdm.io - https://github.com/namibia/CBP-Joomla-3-Component/archive/v3.3.6.zip + https://git.vdm.dev/joomla/Cost-Benefit-Projection/archive/v3.3.6.zip stable @@ -160,7 +160,7 @@ 3.3.7 http://www.vdm.io - https://github.com/namibia/CBP-Joomla-3-Component/archive/v3.3.7.zip + https://git.vdm.dev/joomla/Cost-Benefit-Projection/archive/v3.3.7.zip stable @@ -177,7 +177,7 @@ 3.3.8 http://www.vdm.io - https://github.com/namibia/CBP-Joomla-3-Component/archive/v3.3.8.zip + https://git.vdm.dev/joomla/Cost-Benefit-Projection/archive/v3.3.8.zip stable @@ -194,7 +194,7 @@ 3.3.9 http://www.vdm.io - https://github.com/namibia/CBP-Joomla-3-Component/archive/v3.3.9.zip + https://git.vdm.dev/joomla/Cost-Benefit-Projection/archive/v3.3.9.zip stable @@ -211,7 +211,7 @@ 3.3.10 http://www.vdm.io - https://github.com/namibia/CBP-Joomla-3-Component/archive/v3.3.10.zip + https://git.vdm.dev/joomla/Cost-Benefit-Projection/archive/v3.3.10.zip stable @@ -228,7 +228,7 @@ 3.3.11 http://www.vdm.io - https://github.com/namibia/CBP-Joomla-3-Component/archive/v3.3.11.zip + https://git.vdm.dev/joomla/Cost-Benefit-Projection/archive/v3.3.11.zip stable @@ -245,7 +245,7 @@ 3.3.12 http://www.vdm.io - https://github.com/namibia/CBP-Joomla-3-Component/archive/v3.3.12.zip + https://git.vdm.dev/joomla/Cost-Benefit-Projection/archive/v3.3.12.zip stable @@ -262,7 +262,7 @@ 3.4.0 http://www.vdm.io - https://github.com/namibia/CBP-Joomla-3-Component/archive/v3.4.0.zip + https://git.vdm.dev/joomla/Cost-Benefit-Projection/archive/v3.4.0.zip stable @@ -279,7 +279,7 @@ 3.4.1 http://www.vdm.io - https://github.com/namibia/CBP-Joomla-3-Component/archive/v3.4.1.zip + https://git.vdm.dev/joomla/Cost-Benefit-Projection/archive/v3.4.1.zip stable @@ -296,7 +296,7 @@ 3.4.2 http://www.vdm.io - https://github.com/namibia/CBP-Joomla-3-Component/archive/v3.4.2.zip + https://git.vdm.dev/joomla/Cost-Benefit-Projection/archive/v3.4.2.zip stable @@ -313,7 +313,7 @@ 3.4.3 http://www.vdm.io - https://github.com/namibia/CBP-Joomla-3-Component/releases/download/v3.4.3/CBP_v3.4.3.zip + https://git.vdm.dev/joomla/Cost-Benefit-Projection/archive/v3.4.3.zip stable @@ -330,7 +330,7 @@ 3.4.4 http://www.vdm.io - https://github.com/namibia/CBP-Joomla-3-Component/archive/master.zip + https://git.vdm.dev/joomla/Cost-Benefit-Projection/archive/v3.4.7.zip stable @@ -347,7 +347,7 @@ 3.4.6 http://www.vdm.io - https://github.com/namibia/CBP-Joomla-3-Component/archive/master.zip + https://git.vdm.dev/joomla/Cost-Benefit-Projection/archive/v3.4.7.zip stable @@ -364,7 +364,24 @@ 3.4.7 http://www.vdm.io - http://domain.com/demo.zip + https://git.vdm.dev/joomla/Cost-Benefit-Projection/archive/v3.4.7.zip + + + stable + + Llewellyn van der Merwe + http://www.vdm.io + + + + Cost Benefit Projection + Cost Benefit Projection Tool. + com_costbenefitprojection + component + 3.5.0 + http://www.vdm.io + + https://git.vdm.dev/joomla/Cost-Benefit-Projection/archive/v3.5.0.zip stable diff --git a/media/js/causerisk.js b/media/js/causerisk.js index bc94e304..5bc27cbb 100644 --- a/media/js/causerisk.js +++ b/media/js/causerisk.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk.js diff --git a/media/js/company.js b/media/js/company.js index b32b8603..1caac046 100644 --- a/media/js/company.js +++ b/media/js/company.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.js diff --git a/media/js/country.js b/media/js/country.js index 82668231..1511b701 100644 --- a/media/js/country.js +++ b/media/js/country.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage country.js diff --git a/media/js/currency.js b/media/js/currency.js index ecf068e6..950a79a6 100644 --- a/media/js/currency.js +++ b/media/js/currency.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currency.js diff --git a/media/js/health_data.js b/media/js/health_data.js index edba813c..06159948 100644 --- a/media/js/health_data.js +++ b/media/js/health_data.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data.js diff --git a/media/js/help_document.js b/media/js/help_document.js index 08c2c0d6..36a20d1a 100644 --- a/media/js/help_document.js +++ b/media/js/help_document.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help_document.js diff --git a/media/js/intervention.js b/media/js/intervention.js index 7f86d178..55424f31 100644 --- a/media/js/intervention.js +++ b/media/js/intervention.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage intervention.js diff --git a/media/js/scaling_factor.js b/media/js/scaling_factor.js index 03e4d7bb..5626d287 100644 --- a/media/js/scaling_factor.js +++ b/media/js/scaling_factor.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factor.js diff --git a/media/js/service_provider.js b/media/js/service_provider.js index af2dd884..e4664748 100644 --- a/media/js/service_provider.js +++ b/media/js/service_provider.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_provider.js diff --git a/media/js/table2excel.js b/media/js/table2excel.js index 106a63ff..7809e548 100644 --- a/media/js/table2excel.js +++ b/media/js/table2excel.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage table2excel.js diff --git a/script.php b/script.php index 392851f8..f485b60e 100644 --- a/script.php +++ b/script.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage script.php @@ -1784,7 +1784,7 @@ class com_costbenefitprojectionInstallerScript echo ' -

Upgrade to Version 3.4.7 Was Successful! Let us know if anything is not working as expected.

'; +

Upgrade to Version 3.5.0 Was Successful! Let us know if anything is not working as expected.

'; // Set db if not set already. if (!isset($db)) diff --git a/site/assets/css/combinedresults.css b/site/assets/css/combinedresults.css index 89819991..6caa79bc 100644 --- a/site/assets/css/combinedresults.css +++ b/site/assets/css/combinedresults.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage combinedresults.css diff --git a/site/assets/css/company.css b/site/assets/css/company.css index 89d749e7..40bad298 100644 --- a/site/assets/css/company.css +++ b/site/assets/css/company.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.css diff --git a/site/assets/css/companyresults.css b/site/assets/css/companyresults.css index 4f784196..a4db0639 100644 --- a/site/assets/css/companyresults.css +++ b/site/assets/css/companyresults.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companyresults.css diff --git a/site/assets/css/cpanel.css b/site/assets/css/cpanel.css index 01344be5..4ffce9b0 100644 --- a/site/assets/css/cpanel.css +++ b/site/assets/css/cpanel.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage cpanel.css diff --git a/site/assets/css/createaccount.css b/site/assets/css/createaccount.css index 92ad92a6..152b6bff 100644 --- a/site/assets/css/createaccount.css +++ b/site/assets/css/createaccount.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage createaccount.css diff --git a/site/assets/css/intervention.css b/site/assets/css/intervention.css index a6298fc2..93a71ef5 100644 --- a/site/assets/css/intervention.css +++ b/site/assets/css/intervention.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage intervention.css diff --git a/site/assets/css/publicresults.css b/site/assets/css/publicresults.css index 87e02dec..f1d35868 100644 --- a/site/assets/css/publicresults.css +++ b/site/assets/css/publicresults.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publicresults.css diff --git a/site/assets/css/scaling_factor.css b/site/assets/css/scaling_factor.css index 3cd52af3..a192514a 100644 --- a/site/assets/css/scaling_factor.css +++ b/site/assets/css/scaling_factor.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factor.css diff --git a/site/assets/css/site.css b/site/assets/css/site.css index e2a9db08..1c0b5a0a 100644 --- a/site/assets/css/site.css +++ b/site/assets/css/site.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage site.css diff --git a/site/assets/js/site.js b/site/assets/js/site.js index 676fa2f9..a598f559 100644 --- a/site/assets/js/site.js +++ b/site/assets/js/site.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage site.js diff --git a/site/controller.php b/site/controller.php index 2a497518..5b70c39b 100644 --- a/site/controller.php +++ b/site/controller.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage controller.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\BaseController; use Joomla\Utilities\ArrayHelper; /** - * Costbenefitprojection Component Controller + * Costbenefitprojection Component Base Controller */ -class CostbenefitprojectionController extends JControllerLegacy +class CostbenefitprojectionController extends BaseController { /** * Method to display a view. diff --git a/site/controllers/ajax.json.php b/site/controllers/ajax.json.php index 59778218..9fe332d4 100644 --- a/site/controllers/ajax.json.php +++ b/site/controllers/ajax.json.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage ajax.json.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\BaseController; use Joomla\Utilities\ArrayHelper; /** - * Costbenefitprojection Ajax Controller + * Costbenefitprojection Ajax Base Controller */ -class CostbenefitprojectionControllerAjax extends JControllerLegacy +class CostbenefitprojectionControllerAjax extends BaseController { public function __construct($config) { diff --git a/site/controllers/company.php b/site/controllers/company.php index 37aa8184..9bbfff46 100644 --- a/site/controllers/company.php +++ b/site/controllers/company.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Company Controller + * Company Form Controller */ -class CostbenefitprojectionControllerCompany extends JControllerForm +class CostbenefitprojectionControllerCompany extends FormController { /** * Current or most recently performed task. diff --git a/site/controllers/help.php b/site/controllers/help.php index 591a8ac4..2417b98f 100644 --- a/site/controllers/help.php +++ b/site/controllers/help.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\BaseController; use Joomla\Utilities\ArrayHelper; /** - * Costbenefitprojection Help Controller + * Costbenefitprojection Help Base Controller */ -class CostbenefitprojectionControllerHelp extends JControllerLegacy +class CostbenefitprojectionControllerHelp extends BaseController { public function __construct($config) { diff --git a/site/controllers/intervention.php b/site/controllers/intervention.php index 0cb8ca6a..b25d4606 100644 --- a/site/controllers/intervention.php +++ b/site/controllers/intervention.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage intervention.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Intervention Controller + * Intervention Form Controller */ -class CostbenefitprojectionControllerIntervention extends JControllerForm +class CostbenefitprojectionControllerIntervention extends FormController { /** * Current or most recently performed task. diff --git a/site/controllers/scaling_factor.php b/site/controllers/scaling_factor.php index c736eb95..d4e5e14c 100644 --- a/site/controllers/scaling_factor.php +++ b/site/controllers/scaling_factor.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factor.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Scaling_factor Controller + * Scaling_factor Form Controller */ -class CostbenefitprojectionControllerScaling_factor extends JControllerForm +class CostbenefitprojectionControllerScaling_factor extends FormController { /** * Current or most recently performed task. diff --git a/site/costbenefitprojection.php b/site/costbenefitprojection.php index 01c34ca8..0e959ab8 100644 --- a/site/costbenefitprojection.php +++ b/site/costbenefitprojection.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage costbenefitprojection.php diff --git a/site/helpers/category.php b/site/helpers/category.php index ea44058e..217e5c89 100644 --- a/site/helpers/category.php +++ b/site/helpers/category.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage category.php diff --git a/site/helpers/costbenefitprojection.php b/site/helpers/costbenefitprojection.php index 13dcac02..26256460 100644 --- a/site/helpers/costbenefitprojection.php +++ b/site/helpers/costbenefitprojection.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage costbenefitprojection.php @@ -2320,3 +2320,4 @@ abstract class CostbenefitprojectionHelper return $default; } } + diff --git a/site/helpers/headercheck.php b/site/helpers/headercheck.php index 9ac56654..3663e742 100644 --- a/site/helpers/headercheck.php +++ b/site/helpers/headercheck.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage headercheck.php diff --git a/site/helpers/route.php b/site/helpers/route.php index edfef481..da231671 100644 --- a/site/helpers/route.php +++ b/site/helpers/route.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage route.php diff --git a/site/layouts/appnotice.php b/site/layouts/appnotice.php index 75648b71..63ec74b3 100644 --- a/site/layouts/appnotice.php +++ b/site/layouts/appnotice.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage appnotice.php diff --git a/site/layouts/company/age_groups_percentages_fullwidth.php b/site/layouts/company/age_groups_percentages_fullwidth.php index b2487b7c..aed7b475 100644 --- a/site/layouts/company/age_groups_percentages_fullwidth.php +++ b/site/layouts/company/age_groups_percentages_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_fullwidth.php diff --git a/site/layouts/company/age_groups_percentages_left.php b/site/layouts/company/age_groups_percentages_left.php index aada4c4d..597945d6 100644 --- a/site/layouts/company/age_groups_percentages_left.php +++ b/site/layouts/company/age_groups_percentages_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_left.php diff --git a/site/layouts/company/age_groups_percentages_right.php b/site/layouts/company/age_groups_percentages_right.php index 13345fe1..e474a245 100644 --- a/site/layouts/company/age_groups_percentages_right.php +++ b/site/layouts/company/age_groups_percentages_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_right.php diff --git a/site/layouts/company/causerisk_selection_fullwidth.php b/site/layouts/company/causerisk_selection_fullwidth.php index 0d16678d..9f21e423 100644 --- a/site/layouts/company/causerisk_selection_fullwidth.php +++ b/site/layouts/company/causerisk_selection_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk_selection_fullwidth.php diff --git a/site/layouts/company/details_above.php b/site/layouts/company/details_above.php index b0b1e402..51018b73 100644 --- a/site/layouts/company/details_above.php +++ b/site/layouts/company/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/site/layouts/company/details_left.php b/site/layouts/company/details_left.php index f706d39d..1afabb75 100644 --- a/site/layouts/company/details_left.php +++ b/site/layouts/company/details_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/site/layouts/company/details_right.php b/site/layouts/company/details_right.php index 32aa6b18..e021e9d0 100644 --- a/site/layouts/company/details_right.php +++ b/site/layouts/company/details_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php diff --git a/site/layouts/company/details_under.php b/site/layouts/company/details_under.php index d83e7a0a..84a583be 100644 --- a/site/layouts/company/details_under.php +++ b/site/layouts/company/details_under.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_under.php diff --git a/site/layouts/company/interventions_fullwidth.php b/site/layouts/company/interventions_fullwidth.php index 5f37c923..e8ee55e8 100644 --- a/site/layouts/company/interventions_fullwidth.php +++ b/site/layouts/company/interventions_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage interventions_fullwidth.php diff --git a/site/layouts/company/publishing.php b/site/layouts/company/publishing.php index 60f93718..f9a261d7 100644 --- a/site/layouts/company/publishing.php +++ b/site/layouts/company/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/site/layouts/company/publlshing.php b/site/layouts/company/publlshing.php index f6aa269c..28ccaf12 100644 --- a/site/layouts/company/publlshing.php +++ b/site/layouts/company/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/site/layouts/company/scaling_factors_fullwidth.php b/site/layouts/company/scaling_factors_fullwidth.php index 12ab7506..1740e8c9 100644 --- a/site/layouts/company/scaling_factors_fullwidth.php +++ b/site/layouts/company/scaling_factors_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factors_fullwidth.php diff --git a/site/layouts/companydetails.php b/site/layouts/companydetails.php index a5ceff1f..3266314a 100644 --- a/site/layouts/companydetails.php +++ b/site/layouts/companydetails.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companydetails.php diff --git a/site/layouts/databreakdownmalefemale.php b/site/layouts/databreakdownmalefemale.php index 01815f22..6db4db16 100644 --- a/site/layouts/databreakdownmalefemale.php +++ b/site/layouts/databreakdownmalefemale.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage databreakdownmalefemale.php diff --git a/site/layouts/intervention/details_above.php b/site/layouts/intervention/details_above.php index 4fd4982b..d6780006 100644 --- a/site/layouts/intervention/details_above.php +++ b/site/layouts/intervention/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/site/layouts/intervention/details_fullwidth.php b/site/layouts/intervention/details_fullwidth.php index 1da69d74..9c648997 100644 --- a/site/layouts/intervention/details_fullwidth.php +++ b/site/layouts/intervention/details_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_fullwidth.php diff --git a/site/layouts/intervention/details_under.php b/site/layouts/intervention/details_under.php index d83e7a0a..84a583be 100644 --- a/site/layouts/intervention/details_under.php +++ b/site/layouts/intervention/details_under.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_under.php diff --git a/site/layouts/intervention/publishing.php b/site/layouts/intervention/publishing.php index 60f93718..f9a261d7 100644 --- a/site/layouts/intervention/publishing.php +++ b/site/layouts/intervention/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/site/layouts/intervention/publlshing.php b/site/layouts/intervention/publlshing.php index 70767966..5d0911cc 100644 --- a/site/layouts/intervention/publlshing.php +++ b/site/layouts/intervention/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/site/layouts/intervention/settings_fullwidth.php b/site/layouts/intervention/settings_fullwidth.php index 00abf78b..367278fe 100644 --- a/site/layouts/intervention/settings_fullwidth.php +++ b/site/layouts/intervention/settings_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage settings_fullwidth.php diff --git a/site/layouts/intervention/settings_left.php b/site/layouts/intervention/settings_left.php index e0c44f35..994d8f2d 100644 --- a/site/layouts/intervention/settings_left.php +++ b/site/layouts/intervention/settings_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage settings_left.php diff --git a/site/layouts/scaling_factor/details_above.php b/site/layouts/scaling_factor/details_above.php index 182fcc27..3fcf849c 100644 --- a/site/layouts/scaling_factor/details_above.php +++ b/site/layouts/scaling_factor/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/site/layouts/scaling_factor/details_left.php b/site/layouts/scaling_factor/details_left.php index 9d2b2280..6e57bc86 100644 --- a/site/layouts/scaling_factor/details_left.php +++ b/site/layouts/scaling_factor/details_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/site/layouts/scaling_factor/details_right.php b/site/layouts/scaling_factor/details_right.php index 0a3d8695..0ee5581c 100644 --- a/site/layouts/scaling_factor/details_right.php +++ b/site/layouts/scaling_factor/details_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php diff --git a/site/layouts/scaling_factor/publishing.php b/site/layouts/scaling_factor/publishing.php index 60f93718..f9a261d7 100644 --- a/site/layouts/scaling_factor/publishing.php +++ b/site/layouts/scaling_factor/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/site/layouts/scaling_factor/publlshing.php b/site/layouts/scaling_factor/publlshing.php index 70767966..5d0911cc 100644 --- a/site/layouts/scaling_factor/publlshing.php +++ b/site/layouts/scaling_factor/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/site/models/ajax.php b/site/models/ajax.php index 366168c7..736c1e70 100644 --- a/site/models/ajax.php +++ b/site/models/ajax.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage ajax.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Costbenefitprojection Ajax Model + * Costbenefitprojection Ajax List Model */ -class CostbenefitprojectionModelAjax extends JModelList +class CostbenefitprojectionModelAjax extends ListModel { protected $app_params; diff --git a/site/models/combinedresults.php b/site/models/combinedresults.php index d2f76781..5f3b50b5 100644 --- a/site/models/combinedresults.php +++ b/site/models/combinedresults.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage combinedresults.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Costbenefitprojection Model for Combinedresults + * Costbenefitprojection List Model for Combinedresults */ -class CostbenefitprojectionModelCombinedresults extends JModelList +class CostbenefitprojectionModelCombinedresults extends ListModel { /** * Model user data. diff --git a/site/models/company.php b/site/models/company.php index d701e184..049a6c40 100644 --- a/site/models/company.php +++ b/site/models/company.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.php @@ -20,14 +20,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Costbenefitprojection Company Model + * Costbenefitprojection Company Admin Model */ -class CostbenefitprojectionModelCompany extends JModelAdmin +class CostbenefitprojectionModelCompany extends AdminModel { /** * The tab layout fields array. diff --git a/site/models/companyresults.php b/site/models/companyresults.php index 61289b6e..0b2e6a84 100644 --- a/site/models/companyresults.php +++ b/site/models/companyresults.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companyresults.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ItemModel; use Joomla\Utilities\ArrayHelper; /** - * Costbenefitprojection Companyresults Model + * Costbenefitprojection Companyresults Item Model */ -class CostbenefitprojectionModelCompanyresults extends JModelItem +class CostbenefitprojectionModelCompanyresults extends ItemModel { /** * Model context string. diff --git a/site/models/cpanel.php b/site/models/cpanel.php index 722fbfb5..fa6bfc4d 100644 --- a/site/models/cpanel.php +++ b/site/models/cpanel.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage cpanel.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Costbenefitprojection Model for Cpanel + * Costbenefitprojection List Model for Cpanel */ -class CostbenefitprojectionModelCpanel extends JModelList +class CostbenefitprojectionModelCpanel extends ListModel { /** * Model user data. diff --git a/site/models/createaccount.php b/site/models/createaccount.php index 5a37dfcb..c92168d0 100644 --- a/site/models/createaccount.php +++ b/site/models/createaccount.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage createaccount.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Costbenefitprojection Model for Createaccount + * Costbenefitprojection List Model for Createaccount */ -class CostbenefitprojectionModelCreateaccount extends JModelList +class CostbenefitprojectionModelCreateaccount extends ListModel { /** * Model user data. diff --git a/site/models/forms/company.js b/site/models/forms/company.js index b32b8603..1caac046 100644 --- a/site/models/forms/company.js +++ b/site/models/forms/company.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.js diff --git a/site/models/forms/intervention.js b/site/models/forms/intervention.js index 7f86d178..55424f31 100644 --- a/site/models/forms/intervention.js +++ b/site/models/forms/intervention.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage intervention.js diff --git a/site/models/forms/scaling_factor.js b/site/models/forms/scaling_factor.js index 03e4d7bb..5626d287 100644 --- a/site/models/forms/scaling_factor.js +++ b/site/models/forms/scaling_factor.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factor.js diff --git a/site/models/intervention.php b/site/models/intervention.php index c6f760bf..6fc7e5d0 100644 --- a/site/models/intervention.php +++ b/site/models/intervention.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage intervention.php @@ -20,14 +20,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Costbenefitprojection Intervention Model + * Costbenefitprojection Intervention Admin Model */ -class CostbenefitprojectionModelIntervention extends JModelAdmin +class CostbenefitprojectionModelIntervention extends AdminModel { /** * The tab layout fields array. diff --git a/site/models/publicresults.php b/site/models/publicresults.php index e5ec4d44..e69bda9d 100644 --- a/site/models/publicresults.php +++ b/site/models/publicresults.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publicresults.php @@ -20,12 +20,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ItemModel; use Joomla\Utilities\ArrayHelper; /** - * Costbenefitprojection Publicresults Model + * Costbenefitprojection Publicresults Item Model */ -class CostbenefitprojectionModelPublicresults extends JModelItem +class CostbenefitprojectionModelPublicresults extends ItemModel { /** * Model context string. diff --git a/site/models/scaling_factor.php b/site/models/scaling_factor.php index ad8a0005..ca895196 100644 --- a/site/models/scaling_factor.php +++ b/site/models/scaling_factor.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factor.php @@ -20,14 +20,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Costbenefitprojection Scaling_factor Model + * Costbenefitprojection Scaling_factor Admin Model */ -class CostbenefitprojectionModelScaling_factor extends JModelAdmin +class CostbenefitprojectionModelScaling_factor extends AdminModel { /** * The tab layout fields array. diff --git a/site/router.php b/site/router.php index e2b72933..573eef08 100644 --- a/site/router.php +++ b/site/router.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage router.php diff --git a/site/views/combinedresults/tmpl/default.php b/site/views/combinedresults/tmpl/default.php index dbd2a423..8aedc86f 100644 --- a/site/views/combinedresults/tmpl/default.php +++ b/site/views/combinedresults/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/site/views/combinedresults/tmpl/default_chart_cost.php b/site/views/combinedresults/tmpl/default_chart_cost.php index 3aa54a29..3cf1ccff 100644 --- a/site/views/combinedresults/tmpl/default_chart_cost.php +++ b/site/views/combinedresults/tmpl/default_chart_cost.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_cost.php diff --git a/site/views/combinedresults/tmpl/default_chart_cost_percent.php b/site/views/combinedresults/tmpl/default_chart_cost_percent.php index fa2dde6a..b035a304 100644 --- a/site/views/combinedresults/tmpl/default_chart_cost_percent.php +++ b/site/views/combinedresults/tmpl/default_chart_cost_percent.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_cost_percent.php diff --git a/site/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php b/site/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php index 0e240752..f41b9999 100644 --- a/site/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php +++ b/site/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_intervention_cost_benefit.php diff --git a/site/views/combinedresults/tmpl/default_chart_intervention_cost_benefit_save.php b/site/views/combinedresults/tmpl/default_chart_intervention_cost_benefit_save.php index bc585676..b6294ee5 100644 --- a/site/views/combinedresults/tmpl/default_chart_intervention_cost_benefit_save.php +++ b/site/views/combinedresults/tmpl/default_chart_intervention_cost_benefit_save.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_intervention_cost_benefit_save.php diff --git a/site/views/combinedresults/tmpl/default_chart_work_days_lost.php b/site/views/combinedresults/tmpl/default_chart_work_days_lost.php index 0f0e31f4..90f83956 100644 --- a/site/views/combinedresults/tmpl/default_chart_work_days_lost.php +++ b/site/views/combinedresults/tmpl/default_chart_work_days_lost.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_work_days_lost.php diff --git a/site/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php b/site/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php index 6725bfbb..bf49ebf0 100644 --- a/site/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php +++ b/site/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_work_days_lost_percent.php diff --git a/site/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php b/site/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php index b5e10139..4fbc6748 100644 --- a/site/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php +++ b/site/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_calculated_cost_in_detail.php diff --git a/site/views/combinedresults/tmpl/default_table_cost_summary.php b/site/views/combinedresults/tmpl/default_table_cost_summary.php index e39882d2..6ec70b09 100644 --- a/site/views/combinedresults/tmpl/default_table_cost_summary.php +++ b/site/views/combinedresults/tmpl/default_table_cost_summary.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_cost_summary.php diff --git a/site/views/combinedresults/tmpl/default_table_intervention_net_benefit.php b/site/views/combinedresults/tmpl/default_table_intervention_net_benefit.php index 8494bbea..b1c6bd50 100644 --- a/site/views/combinedresults/tmpl/default_table_intervention_net_benefit.php +++ b/site/views/combinedresults/tmpl/default_table_intervention_net_benefit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_intervention_net_benefit.php diff --git a/site/views/combinedresults/tmpl/default_table_work_days_lost_summary.php b/site/views/combinedresults/tmpl/default_table_work_days_lost_summary.php index 01c3df21..0b0f8b3f 100644 --- a/site/views/combinedresults/tmpl/default_table_work_days_lost_summary.php +++ b/site/views/combinedresults/tmpl/default_table_work_days_lost_summary.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_work_days_lost_summary.php diff --git a/site/views/combinedresults/view.html.php b/site/views/combinedresults/view.html.php index 6ad1b765..eb2f652f 100644 --- a/site/views/combinedresults/view.html.php +++ b/site/views/combinedresults/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php @@ -20,10 +20,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Costbenefitprojection View class for the Combinedresults + * Costbenefitprojection Html View class for the Combinedresults */ -class CostbenefitprojectionViewCombinedresults extends JViewLegacy +class CostbenefitprojectionViewCombinedresults extends HtmlView { // Overwriting JView display method function display($tpl = null) @@ -94,12 +96,12 @@ class CostbenefitprojectionViewCombinedresults extends JViewLegacy // The uikit css. if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addStyleSheet(JURI::root(true) .'/media/com_costbenefitprojection/uikit-v2/css/uikit'.$style.$size.'.css', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_costbenefitprojection/uikit-v2/css/uikit'.$style.$size.'.css', ['version' => 'auto']); } // The uikit js. if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addScript(JURI::root(true) .'/media/com_costbenefitprojection/uikit-v2/js/uikit'.$size.'.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + JHtml::_('script', 'media/com_costbenefitprojection/uikit-v2/js/uikit'.$size.'.js', ['version' => 'auto']); } // Load the needed uikit components in this view. @@ -115,13 +117,13 @@ class CostbenefitprojectionViewCombinedresults extends JViewLegacy if (File::exists(JPATH_ROOT.'/media/com_costbenefitprojection/uikit-v2/css/components/'.$name.$style.$size.'.css')) { // load the css. - $this->document->addStyleSheet(JURI::root(true) .'/media/com_costbenefitprojection/uikit-v2/css/components/'.$name.$style.$size.'.css', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_costbenefitprojection/uikit-v2/css/components/'.$name.$style.$size.'.css', ['version' => 'auto']); } // check if the JavaScript file exists. if (File::exists(JPATH_ROOT.'/media/com_costbenefitprojection/uikit-v2/js/components/'.$name.$size.'.js')) { // load the js. - $this->document->addScript(JURI::root(true) .'/media/com_costbenefitprojection/uikit-v2/js/components/'.$name.$size.'.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('type' => 'text/javascript', 'async' => 'async') : true); + JHtml::_('script', 'media/com_costbenefitprojection/uikit-v2/js/components/'.$name.$size.'.js', ['version' => 'auto'], ['type' => 'text/javascript', 'async' => 'async']); } } } @@ -130,29 +132,29 @@ class CostbenefitprojectionViewCombinedresults extends JViewLegacy // add the google chart builder class. require_once JPATH_COMPONENT_ADMINISTRATOR.'/helpers/chartbuilder.php'; // load the google chart js. - $this->document->addScript(JURI::root(true) .'/media/com_costbenefitprojection/js/google.jsapi.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript('https://canvg.googlecode.com/svn/trunk/rgbcolor.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript('https://canvg.googlecode.com/svn/trunk/canvg.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + JHtml::_('script', 'media/com_costbenefitprojection/js/google.jsapi.js', ['version' => 'auto']); + $this->document->addScript('https://canvg.googlecode.com/svn/trunk/rgbcolor.js', ['version' => 'auto']); + $this->document->addScript('https://canvg.googlecode.com/svn/trunk/canvg.js', ['version' => 'auto']); // Add the CSS for Footable. - $this->document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable-v2/css/footable.core.min.css', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_costbenefitprojection/footable-v2/css/footable.core.min.css', ['version' => 'auto']); // Use the Metro Style if (!isset($this->fooTableStyle) || 0 == $this->fooTableStyle) { - $this->document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable-v2/css/footable.metro.min.css', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_costbenefitprojection/footable-v2/css/footable.metro.min.css', ['version' => 'auto']); } // Use the Legacy Style. elseif (isset($this->fooTableStyle) && 1 == $this->fooTableStyle) { - $this->document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable-v2/css/footable.standalone.min.css', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_costbenefitprojection/footable-v2/css/footable.standalone.min.css', ['version' => 'auto']); } // Add the JavaScript for Footable - $this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable-v2/js/footable.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable-v2/js/footable.sort.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable-v2/js/footable.filter.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable-v2/js/footable.paginate.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + JHtml::_('script', 'media/com_costbenefitprojection/footable-v2/js/footable.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_costbenefitprojection/footable-v2/js/footable.sort.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_costbenefitprojection/footable-v2/js/footable.filter.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_costbenefitprojection/footable-v2/js/footable.paginate.js', ['version' => 'auto']); // add custom css $this->document->addStyleSheet(JURI::root(true) ."/administrator/components/com_costbenefitprojection/assets/css/dashboard.css"); // add custom js diff --git a/site/views/company/submitbutton.js b/site/views/company/submitbutton.js index 589f1f7f..273fe568 100644 --- a/site/views/company/submitbutton.js +++ b/site/views/company/submitbutton.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/site/views/company/tmpl/edit.php b/site/views/company/tmpl/edit.php index 4ed21180..bc71f90f 100644 --- a/site/views/company/tmpl/edit.php +++ b/site/views/company/tmpl/edit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/site/views/company/view.html.php b/site/views/company/view.html.php index 8bb7e66d..3aeca70e 100644 --- a/site/views/company/view.html.php +++ b/site/views/company/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php @@ -20,10 +20,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Company View class + * Company Html View class */ -class CostbenefitprojectionViewCompany extends JViewLegacy +class CostbenefitprojectionViewCompany extends HtmlView { /** * display method of View @@ -218,24 +220,24 @@ class CostbenefitprojectionViewCompany extends JViewLegacy $this->document->addScriptDeclaration("var token = '".JSession::getFormToken()."';"); // Add the CSS for Footable. - $this->document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable-v2/css/footable.core.min.css', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_costbenefitprojection/footable-v2/css/footable.core.min.css', ['version' => 'auto']); // Use the Metro Style if (!isset($this->fooTableStyle) || 0 == $this->fooTableStyle) { - $this->document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable-v2/css/footable.metro.min.css', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_costbenefitprojection/footable-v2/css/footable.metro.min.css', ['version' => 'auto']); } // Use the Legacy Style. elseif (isset($this->fooTableStyle) && 1 == $this->fooTableStyle) { - $this->document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable-v2/css/footable.standalone.min.css', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_costbenefitprojection/footable-v2/css/footable.standalone.min.css', ['version' => 'auto']); } // Add the JavaScript for Footable - $this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable-v2/js/footable.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable-v2/js/footable.sort.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable-v2/js/footable.filter.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable-v2/js/footable.paginate.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + JHtml::_('script', 'media/com_costbenefitprojection/footable-v2/js/footable.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_costbenefitprojection/footable-v2/js/footable.sort.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_costbenefitprojection/footable-v2/js/footable.filter.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_costbenefitprojection/footable-v2/js/footable.paginate.js', ['version' => 'auto']); $footable = "jQuery(document).ready(function() { jQuery(function () { jQuery('.footable').footable(); }); jQuery('.nav-tabs').on('click', 'li', function() { setTimeout(tableFix, 10); }); }); function tableFix() { jQuery('.footable').trigger('footable_resize'); }"; $this->document->addScriptDeclaration($footable); diff --git a/site/views/companyresults/tmpl/default.php b/site/views/companyresults/tmpl/default.php index 93e546d4..76e462b1 100644 --- a/site/views/companyresults/tmpl/default.php +++ b/site/views/companyresults/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/site/views/companyresults/tmpl/default_chart_cost.php b/site/views/companyresults/tmpl/default_chart_cost.php index 3aa54a29..3cf1ccff 100644 --- a/site/views/companyresults/tmpl/default_chart_cost.php +++ b/site/views/companyresults/tmpl/default_chart_cost.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_cost.php diff --git a/site/views/companyresults/tmpl/default_chart_cost_percent.php b/site/views/companyresults/tmpl/default_chart_cost_percent.php index fa2dde6a..b035a304 100644 --- a/site/views/companyresults/tmpl/default_chart_cost_percent.php +++ b/site/views/companyresults/tmpl/default_chart_cost_percent.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_cost_percent.php diff --git a/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php b/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php index 0e240752..f41b9999 100644 --- a/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php +++ b/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_intervention_cost_benefit.php diff --git a/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit_save.php b/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit_save.php index bc585676..b6294ee5 100644 --- a/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit_save.php +++ b/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit_save.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_intervention_cost_benefit_save.php diff --git a/site/views/companyresults/tmpl/default_chart_work_days_lost.php b/site/views/companyresults/tmpl/default_chart_work_days_lost.php index 0f0e31f4..90f83956 100644 --- a/site/views/companyresults/tmpl/default_chart_work_days_lost.php +++ b/site/views/companyresults/tmpl/default_chart_work_days_lost.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_work_days_lost.php diff --git a/site/views/companyresults/tmpl/default_chart_work_days_lost_percent.php b/site/views/companyresults/tmpl/default_chart_work_days_lost_percent.php index 6725bfbb..bf49ebf0 100644 --- a/site/views/companyresults/tmpl/default_chart_work_days_lost_percent.php +++ b/site/views/companyresults/tmpl/default_chart_work_days_lost_percent.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_work_days_lost_percent.php diff --git a/site/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php b/site/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php index b5e10139..4fbc6748 100644 --- a/site/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php +++ b/site/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_calculated_cost_in_detail.php diff --git a/site/views/companyresults/tmpl/default_table_cost_summary.php b/site/views/companyresults/tmpl/default_table_cost_summary.php index e39882d2..6ec70b09 100644 --- a/site/views/companyresults/tmpl/default_table_cost_summary.php +++ b/site/views/companyresults/tmpl/default_table_cost_summary.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_cost_summary.php diff --git a/site/views/companyresults/tmpl/default_table_intervention_net_benefit.php b/site/views/companyresults/tmpl/default_table_intervention_net_benefit.php index 8494bbea..b1c6bd50 100644 --- a/site/views/companyresults/tmpl/default_table_intervention_net_benefit.php +++ b/site/views/companyresults/tmpl/default_table_intervention_net_benefit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_intervention_net_benefit.php diff --git a/site/views/companyresults/tmpl/default_table_work_days_lost_summary.php b/site/views/companyresults/tmpl/default_table_work_days_lost_summary.php index 01c3df21..0b0f8b3f 100644 --- a/site/views/companyresults/tmpl/default_table_work_days_lost_summary.php +++ b/site/views/companyresults/tmpl/default_table_work_days_lost_summary.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_work_days_lost_summary.php diff --git a/site/views/companyresults/view.html.php b/site/views/companyresults/view.html.php index 5815885b..594af84c 100644 --- a/site/views/companyresults/view.html.php +++ b/site/views/companyresults/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php @@ -20,10 +20,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Costbenefitprojection View class for the Companyresults + * Costbenefitprojection Html View class for the Companyresults */ -class CostbenefitprojectionViewCompanyresults extends JViewLegacy +class CostbenefitprojectionViewCompanyresults extends HtmlView { // Overwriting JView display method function display($tpl = null) @@ -87,12 +89,12 @@ class CostbenefitprojectionViewCompanyresults extends JViewLegacy // The uikit css. if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addStyleSheet(JURI::root(true) .'/media/com_costbenefitprojection/uikit-v2/css/uikit'.$style.$size.'.css', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_costbenefitprojection/uikit-v2/css/uikit'.$style.$size.'.css', ['version' => 'auto']); } // The uikit js. if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addScript(JURI::root(true) .'/media/com_costbenefitprojection/uikit-v2/js/uikit'.$size.'.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + JHtml::_('script', 'media/com_costbenefitprojection/uikit-v2/js/uikit'.$size.'.js', ['version' => 'auto']); } // Load the needed uikit components in this view. @@ -108,13 +110,13 @@ class CostbenefitprojectionViewCompanyresults extends JViewLegacy if (File::exists(JPATH_ROOT.'/media/com_costbenefitprojection/uikit-v2/css/components/'.$name.$style.$size.'.css')) { // load the css. - $this->document->addStyleSheet(JURI::root(true) .'/media/com_costbenefitprojection/uikit-v2/css/components/'.$name.$style.$size.'.css', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_costbenefitprojection/uikit-v2/css/components/'.$name.$style.$size.'.css', ['version' => 'auto']); } // check if the JavaScript file exists. if (File::exists(JPATH_ROOT.'/media/com_costbenefitprojection/uikit-v2/js/components/'.$name.$size.'.js')) { // load the js. - $this->document->addScript(JURI::root(true) .'/media/com_costbenefitprojection/uikit-v2/js/components/'.$name.$size.'.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('type' => 'text/javascript', 'async' => 'async') : true); + JHtml::_('script', 'media/com_costbenefitprojection/uikit-v2/js/components/'.$name.$size.'.js', ['version' => 'auto'], ['type' => 'text/javascript', 'async' => 'async']); } } } @@ -123,29 +125,29 @@ class CostbenefitprojectionViewCompanyresults extends JViewLegacy // add the google chart builder class. require_once JPATH_COMPONENT_ADMINISTRATOR.'/helpers/chartbuilder.php'; // load the google chart js. - $this->document->addScript(JURI::root(true) .'/media/com_costbenefitprojection/js/google.jsapi.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript('https://canvg.googlecode.com/svn/trunk/rgbcolor.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript('https://canvg.googlecode.com/svn/trunk/canvg.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + JHtml::_('script', 'media/com_costbenefitprojection/js/google.jsapi.js', ['version' => 'auto']); + $this->document->addScript('https://canvg.googlecode.com/svn/trunk/rgbcolor.js', ['version' => 'auto']); + $this->document->addScript('https://canvg.googlecode.com/svn/trunk/canvg.js', ['version' => 'auto']); // Add the CSS for Footable. - $this->document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable-v2/css/footable.core.min.css', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_costbenefitprojection/footable-v2/css/footable.core.min.css', ['version' => 'auto']); // Use the Metro Style if (!isset($this->fooTableStyle) || 0 == $this->fooTableStyle) { - $this->document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable-v2/css/footable.metro.min.css', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_costbenefitprojection/footable-v2/css/footable.metro.min.css', ['version' => 'auto']); } // Use the Legacy Style. elseif (isset($this->fooTableStyle) && 1 == $this->fooTableStyle) { - $this->document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable-v2/css/footable.standalone.min.css', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_costbenefitprojection/footable-v2/css/footable.standalone.min.css', ['version' => 'auto']); } // Add the JavaScript for Footable - $this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable-v2/js/footable.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable-v2/js/footable.sort.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable-v2/js/footable.filter.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable-v2/js/footable.paginate.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + JHtml::_('script', 'media/com_costbenefitprojection/footable-v2/js/footable.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_costbenefitprojection/footable-v2/js/footable.sort.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_costbenefitprojection/footable-v2/js/footable.filter.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_costbenefitprojection/footable-v2/js/footable.paginate.js', ['version' => 'auto']); // add custom css $this->document->addStyleSheet(JURI::root(true) ."/administrator/components/com_costbenefitprojection/assets/css/dashboard.css"); // add custom js diff --git a/site/views/cpanel/tmpl/default.php b/site/views/cpanel/tmpl/default.php index 822da3a6..b8478d1b 100644 --- a/site/views/cpanel/tmpl/default.php +++ b/site/views/cpanel/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/site/views/cpanel/view.html.php b/site/views/cpanel/view.html.php index 66819bf1..7fe50a61 100644 --- a/site/views/cpanel/view.html.php +++ b/site/views/cpanel/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php @@ -21,12 +21,13 @@ defined('_JEXEC') or die('Restricted access'); jimport('joomla.application.module.helper'); +use Joomla\CMS\MVC\View\HtmlView; use Joomla\CMS\Filesystem\File; /** - * Costbenefitprojection View class for the Cpanel + * Costbenefitprojection Html View class for the Cpanel */ -class CostbenefitprojectionViewCpanel extends JViewLegacy +class CostbenefitprojectionViewCpanel extends HtmlView { // Overwriting JView display method function display($tpl = null) @@ -78,12 +79,12 @@ class CostbenefitprojectionViewCpanel extends JViewLegacy // The uikit css. if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addStyleSheet(JURI::root(true) .'/media/com_costbenefitprojection/uikit-v2/css/uikit'.$style.$size.'.css', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_costbenefitprojection/uikit-v2/css/uikit'.$style.$size.'.css', ['version' => 'auto']); } // The uikit js. if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addScript(JURI::root(true) .'/media/com_costbenefitprojection/uikit-v2/js/uikit'.$size.'.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + JHtml::_('script', 'media/com_costbenefitprojection/uikit-v2/js/uikit'.$size.'.js', ['version' => 'auto']); } // Load the script to find all uikit components needed. @@ -126,13 +127,13 @@ class CostbenefitprojectionViewCpanel extends JViewLegacy if (File::exists(JPATH_ROOT.'/media/com_costbenefitprojection/uikit-v2/css/components/'.$name.$style.$size.'.css')) { // load the css. - $this->document->addStyleSheet(JURI::root(true) .'/media/com_costbenefitprojection/uikit-v2/css/components/'.$name.$style.$size.'.css', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_costbenefitprojection/uikit-v2/css/components/'.$name.$style.$size.'.css', ['version' => 'auto']); } // check if the JavaScript file exists. if (File::exists(JPATH_ROOT.'/media/com_costbenefitprojection/uikit-v2/js/components/'.$name.$size.'.js')) { // load the js. - $this->document->addScript(JURI::root(true) .'/media/com_costbenefitprojection/uikit-v2/js/components/'.$name.$size.'.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('type' => 'text/javascript', 'async' => 'async') : true); + JHtml::_('script', 'media/com_costbenefitprojection/uikit-v2/js/components/'.$name.$size.'.js', ['version' => 'auto'], ['type' => 'text/javascript', 'async' => 'async']); } } } @@ -141,29 +142,29 @@ class CostbenefitprojectionViewCpanel extends JViewLegacy // add the google chart builder class. require_once JPATH_COMPONENT_ADMINISTRATOR.'/helpers/chartbuilder.php'; // load the google chart js. - $this->document->addScript(JURI::root(true) .'/media/com_costbenefitprojection/js/google.jsapi.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript('https://canvg.googlecode.com/svn/trunk/rgbcolor.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript('https://canvg.googlecode.com/svn/trunk/canvg.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + JHtml::_('script', 'media/com_costbenefitprojection/js/google.jsapi.js', ['version' => 'auto']); + $this->document->addScript('https://canvg.googlecode.com/svn/trunk/rgbcolor.js', ['version' => 'auto']); + $this->document->addScript('https://canvg.googlecode.com/svn/trunk/canvg.js', ['version' => 'auto']); // Add the CSS for Footable. - $this->document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable-v2/css/footable.core.min.css', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_costbenefitprojection/footable-v2/css/footable.core.min.css', ['version' => 'auto']); // Use the Metro Style if (!isset($this->fooTableStyle) || 0 == $this->fooTableStyle) { - $this->document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable-v2/css/footable.metro.min.css', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_costbenefitprojection/footable-v2/css/footable.metro.min.css', ['version' => 'auto']); } // Use the Legacy Style. elseif (isset($this->fooTableStyle) && 1 == $this->fooTableStyle) { - $this->document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable-v2/css/footable.standalone.min.css', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_costbenefitprojection/footable-v2/css/footable.standalone.min.css', ['version' => 'auto']); } // Add the JavaScript for Footable - $this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable-v2/js/footable.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable-v2/js/footable.sort.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable-v2/js/footable.filter.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable-v2/js/footable.paginate.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + JHtml::_('script', 'media/com_costbenefitprojection/footable-v2/js/footable.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_costbenefitprojection/footable-v2/js/footable.sort.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_costbenefitprojection/footable-v2/js/footable.filter.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_costbenefitprojection/footable-v2/js/footable.paginate.js', ['version' => 'auto']); // load the meta description if ($this->params->get('menu-meta_description')) { diff --git a/site/views/createaccount/tmpl/default.php b/site/views/createaccount/tmpl/default.php index 5b127680..2d209b96 100644 --- a/site/views/createaccount/tmpl/default.php +++ b/site/views/createaccount/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/site/views/createaccount/tmpl/default_cbpmenumodule.php b/site/views/createaccount/tmpl/default_cbpmenumodule.php index fb19acc2..98441bc8 100644 --- a/site/views/createaccount/tmpl/default_cbpmenumodule.php +++ b/site/views/createaccount/tmpl/default_cbpmenumodule.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_cbpmenumodule.php diff --git a/site/views/createaccount/view.html.php b/site/views/createaccount/view.html.php index 082fce98..3579ac6a 100644 --- a/site/views/createaccount/view.html.php +++ b/site/views/createaccount/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php @@ -21,12 +21,13 @@ defined('_JEXEC') or die('Restricted access'); jimport('joomla.application.module.helper'); +use Joomla\CMS\MVC\View\HtmlView; use Joomla\CMS\Filesystem\File; /** - * Costbenefitprojection View class for the Createaccount + * Costbenefitprojection Html View class for the Createaccount */ -class CostbenefitprojectionViewCreateaccount extends JViewLegacy +class CostbenefitprojectionViewCreateaccount extends HtmlView { // Overwriting JView display method function display($tpl = null) @@ -117,12 +118,12 @@ class CostbenefitprojectionViewCreateaccount extends JViewLegacy // The uikit css. if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addStyleSheet(JURI::root(true) .'/media/com_costbenefitprojection/uikit-v2/css/uikit'.$style.$size.'.css', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_costbenefitprojection/uikit-v2/css/uikit'.$style.$size.'.css', ['version' => 'auto']); } // The uikit js. if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addScript(JURI::root(true) .'/media/com_costbenefitprojection/uikit-v2/js/uikit'.$size.'.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + JHtml::_('script', 'media/com_costbenefitprojection/uikit-v2/js/uikit'.$size.'.js', ['version' => 'auto']); } // Load the script to find all uikit components needed. @@ -163,13 +164,13 @@ class CostbenefitprojectionViewCreateaccount extends JViewLegacy if (File::exists(JPATH_ROOT.'/media/com_costbenefitprojection/uikit-v2/css/components/'.$name.$style.$size.'.css')) { // load the css. - $this->document->addStyleSheet(JURI::root(true) .'/media/com_costbenefitprojection/uikit-v2/css/components/'.$name.$style.$size.'.css', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_costbenefitprojection/uikit-v2/css/components/'.$name.$style.$size.'.css', ['version' => 'auto']); } // check if the JavaScript file exists. if (File::exists(JPATH_ROOT.'/media/com_costbenefitprojection/uikit-v2/js/components/'.$name.$size.'.js')) { // load the js. - $this->document->addScript(JURI::root(true) .'/media/com_costbenefitprojection/uikit-v2/js/components/'.$name.$size.'.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('type' => 'text/javascript', 'async' => 'async') : true); + JHtml::_('script', 'media/com_costbenefitprojection/uikit-v2/js/components/'.$name.$size.'.js', ['version' => 'auto'], ['type' => 'text/javascript', 'async' => 'async']); } } } diff --git a/site/views/intervention/submitbutton.js b/site/views/intervention/submitbutton.js index 6e582a19..9c9b361a 100644 --- a/site/views/intervention/submitbutton.js +++ b/site/views/intervention/submitbutton.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/site/views/intervention/tmpl/edit.php b/site/views/intervention/tmpl/edit.php index 738276c7..ce41d3b2 100644 --- a/site/views/intervention/tmpl/edit.php +++ b/site/views/intervention/tmpl/edit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/site/views/intervention/view.html.php b/site/views/intervention/view.html.php index 69a31f53..5b7d0d6b 100644 --- a/site/views/intervention/view.html.php +++ b/site/views/intervention/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php @@ -20,10 +20,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Intervention View class + * Intervention Html View class */ -class CostbenefitprojectionViewIntervention extends JViewLegacy +class CostbenefitprojectionViewIntervention extends HtmlView { /** * display method of View diff --git a/site/views/publicresults/tmpl/default.php b/site/views/publicresults/tmpl/default.php index 804aa21c..d2ee5e97 100644 --- a/site/views/publicresults/tmpl/default.php +++ b/site/views/publicresults/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/site/views/publicresults/tmpl/default_cbpmenumodule.php b/site/views/publicresults/tmpl/default_cbpmenumodule.php index fb19acc2..98441bc8 100644 --- a/site/views/publicresults/tmpl/default_cbpmenumodule.php +++ b/site/views/publicresults/tmpl/default_cbpmenumodule.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_cbpmenumodule.php diff --git a/site/views/publicresults/tmpl/default_chart_cost_public.php b/site/views/publicresults/tmpl/default_chart_cost_public.php index b5dc5123..5fa25b16 100644 --- a/site/views/publicresults/tmpl/default_chart_cost_public.php +++ b/site/views/publicresults/tmpl/default_chart_cost_public.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_cost_public.php diff --git a/site/views/publicresults/tmpl/default_chart_intervention_cost_benefit_public.php b/site/views/publicresults/tmpl/default_chart_intervention_cost_benefit_public.php index c203ec23..7dd84aa4 100644 --- a/site/views/publicresults/tmpl/default_chart_intervention_cost_benefit_public.php +++ b/site/views/publicresults/tmpl/default_chart_intervention_cost_benefit_public.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_intervention_cost_benefit_public.php diff --git a/site/views/publicresults/tmpl/default_contact_form_public.php b/site/views/publicresults/tmpl/default_contact_form_public.php index 615a4cb8..beb7dbd0 100644 --- a/site/views/publicresults/tmpl/default_contact_form_public.php +++ b/site/views/publicresults/tmpl/default_contact_form_public.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_contact_form_public.php diff --git a/site/views/publicresults/view.html.php b/site/views/publicresults/view.html.php index 686df375..c6d5f06b 100644 --- a/site/views/publicresults/view.html.php +++ b/site/views/publicresults/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php @@ -21,12 +21,13 @@ defined('_JEXEC') or die('Restricted access'); jimport('joomla.application.module.helper'); +use Joomla\CMS\MVC\View\HtmlView; use Joomla\CMS\Filesystem\File; /** - * Costbenefitprojection View class for the Publicresults + * Costbenefitprojection Html View class for the Publicresults */ -class CostbenefitprojectionViewPublicresults extends JViewLegacy +class CostbenefitprojectionViewPublicresults extends HtmlView { // Overwriting JView display method function display($tpl = null) @@ -91,12 +92,12 @@ class CostbenefitprojectionViewPublicresults extends JViewLegacy // The uikit css. if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addStyleSheet(JURI::root(true) .'/media/com_costbenefitprojection/uikit-v2/css/uikit'.$style.$size.'.css', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_costbenefitprojection/uikit-v2/css/uikit'.$style.$size.'.css', ['version' => 'auto']); } // The uikit js. if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addScript(JURI::root(true) .'/media/com_costbenefitprojection/uikit-v2/js/uikit'.$size.'.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + JHtml::_('script', 'media/com_costbenefitprojection/uikit-v2/js/uikit'.$size.'.js', ['version' => 'auto']); } // Load the script to find all uikit components needed. @@ -136,13 +137,13 @@ class CostbenefitprojectionViewPublicresults extends JViewLegacy if (File::exists(JPATH_ROOT.'/media/com_costbenefitprojection/uikit-v2/css/components/'.$name.$style.$size.'.css')) { // load the css. - $this->document->addStyleSheet(JURI::root(true) .'/media/com_costbenefitprojection/uikit-v2/css/components/'.$name.$style.$size.'.css', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_costbenefitprojection/uikit-v2/css/components/'.$name.$style.$size.'.css', ['version' => 'auto']); } // check if the JavaScript file exists. if (File::exists(JPATH_ROOT.'/media/com_costbenefitprojection/uikit-v2/js/components/'.$name.$size.'.js')) { // load the js. - $this->document->addScript(JURI::root(true) .'/media/com_costbenefitprojection/uikit-v2/js/components/'.$name.$size.'.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('type' => 'text/javascript', 'async' => 'async') : true); + JHtml::_('script', 'media/com_costbenefitprojection/uikit-v2/js/components/'.$name.$size.'.js', ['version' => 'auto'], ['type' => 'text/javascript', 'async' => 'async']); } } } @@ -151,9 +152,9 @@ class CostbenefitprojectionViewPublicresults extends JViewLegacy // add the google chart builder class. require_once JPATH_COMPONENT_ADMINISTRATOR.'/helpers/chartbuilder.php'; // load the google chart js. - $this->document->addScript(JURI::root(true) .'/media/com_costbenefitprojection/js/google.jsapi.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript('https://canvg.googlecode.com/svn/trunk/rgbcolor.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript('https://canvg.googlecode.com/svn/trunk/canvg.js', (CostbenefitprojectionHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + JHtml::_('script', 'media/com_costbenefitprojection/js/google.jsapi.js', ['version' => 'auto']); + $this->document->addScript('https://canvg.googlecode.com/svn/trunk/rgbcolor.js', ['version' => 'auto']); + $this->document->addScript('https://canvg.googlecode.com/svn/trunk/canvg.js', ['version' => 'auto']); // add custom css $this->document->addStyleSheet(JURI::root(true) ."/administrator/components/com_costbenefitprojection/assets/css/dashboard.css"); // add custom js diff --git a/site/views/scaling_factor/submitbutton.js b/site/views/scaling_factor/submitbutton.js index 6dd98c8e..423dc5e1 100644 --- a/site/views/scaling_factor/submitbutton.js +++ b/site/views/scaling_factor/submitbutton.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/site/views/scaling_factor/tmpl/edit.php b/site/views/scaling_factor/tmpl/edit.php index 0ae641a8..b0a48655 100644 --- a/site/views/scaling_factor/tmpl/edit.php +++ b/site/views/scaling_factor/tmpl/edit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/site/views/scaling_factor/view.html.php b/site/views/scaling_factor/view.html.php index dd3fb062..e4f54a40 100644 --- a/site/views/scaling_factor/view.html.php +++ b/site/views/scaling_factor/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.4.x - @build 2nd March, 2022 + @version 3.5.x + @build 27th May, 2022 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php @@ -20,10 +20,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Scaling_factor View class + * Scaling_factor Html View class */ -class CostbenefitprojectionViewScaling_factor extends JViewLegacy +class CostbenefitprojectionViewScaling_factor extends HtmlView { /** * display method of View