diff --git a/README.md b/README.md
index fab9ee023..e9bffa865 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!
-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.7.10) with **ALL** its features and **ALL** concepts totally open-source and free!
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.7.11) with **ALL** its features and **ALL** concepts totally open-source and free!
> Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
@@ -125,14 +125,14 @@ Watch the [proposed development workflow](https://vdm.bz/proposed-development-wo
+ *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
+ *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
+ *First Build*: 30th April, 2015
-+ *Last Build*: 18th May, 2018
-+ *Version*: 2.7.10
++ *Last Build*: 22nd May, 2018
++ *Version*: 2.7.11
+ *Copyright*: Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved.
+ *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **181594**
-+ *Field count*: **1036**
-+ *File count*: **1203**
-+ *Folder count*: **193**
++ *Line count*: **185406**
++ *Field count*: **1052**
++ *File count*: **1236**
++ *Folder count*: **197**
> This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com).
> Developed by [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
diff --git a/admin/README.txt b/admin/README.txt
index fab9ee023..e9bffa865 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!
-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.7.10) with **ALL** its features and **ALL** concepts totally open-source and free!
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.7.11) with **ALL** its features and **ALL** concepts totally open-source and free!
> Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
@@ -125,14 +125,14 @@ Watch the [proposed development workflow](https://vdm.bz/proposed-development-wo
+ *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
+ *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
+ *First Build*: 30th April, 2015
-+ *Last Build*: 18th May, 2018
-+ *Version*: 2.7.10
++ *Last Build*: 22nd May, 2018
++ *Version*: 2.7.11
+ *Copyright*: Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved.
+ *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **181594**
-+ *Field count*: **1036**
-+ *File count*: **1203**
-+ *Folder count*: **193**
++ *Line count*: **185406**
++ *Field count*: **1052**
++ *File count*: **1236**
++ *Folder count*: **197**
> This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com).
> Developed by [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
diff --git a/admin/access.xml b/admin/access.xml
index eea0f6756..a18324667 100644
--- a/admin/access.xml
+++ b/admin/access.xml
@@ -50,6 +50,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -561,6 +571,17 @@
+
diff --git a/admin/assets/css/admin_fields_relations.css b/admin/assets/css/admin_fields_relations.css
new file mode 100644
index 000000000..e7aab2271
--- /dev/null
+++ b/admin/assets/css/admin_fields_relations.css
@@ -0,0 +1,13 @@
+/**
+ * @package Joomla.Component.Builder
+ *
+ * @created 30th April, 2015
+ * @author Llewellyn van der Merwe
+ * @github Joomla Component Builder
+ * @copyright Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/* CSS Document */
+
+
diff --git a/admin/assets/css/admins_fields_relations.css b/admin/assets/css/admins_fields_relations.css
new file mode 100644
index 000000000..e7aab2271
--- /dev/null
+++ b/admin/assets/css/admins_fields_relations.css
@@ -0,0 +1,13 @@
+/**
+ * @package Joomla.Component.Builder
+ *
+ * @created 30th April, 2015
+ * @author Llewellyn van der Merwe
+ * @github Joomla Component Builder
+ * @copyright Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/* CSS Document */
+
+
diff --git a/admin/controller.php b/admin/controller.php
index 1cef30223..c81cc4e70 100644
--- a/admin/controller.php
+++ b/admin/controller.php
@@ -112,6 +112,7 @@ class ComponentbuilderController extends JControllerLegacy
'help_document' => 'help_documents',
'admin_fields' => 'admins_fields',
'admin_fields_conditions' => 'admins_fields_conditions',
+ 'admin_fields_relations' => 'admins_fields_relations',
'component_admin_views' => 'components_admin_views',
'component_site_views' => 'components_site_views',
'component_custom_admin_views' => 'components_custom_admin_views',
diff --git a/admin/controllers/admin_fields_relations.php b/admin/controllers/admin_fields_relations.php
new file mode 100644
index 000000000..93fa84b5a
--- /dev/null
+++ b/admin/controllers/admin_fields_relations.php
@@ -0,0 +1,312 @@
+
+ * @github Joomla Component Builder
+ * @copyright Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import Joomla controllerform library
+jimport('joomla.application.component.controllerform');
+
+/**
+ * Admin_fields_relations Controller
+ */
+class ComponentbuilderControllerAdmin_fields_relations extends JControllerForm
+{
+ /**
+ * Current or most recently performed task.
+ *
+ * @var string
+ * @since 12.2
+ * @note Replaces _task.
+ */
+ protected $task;
+
+ public function __construct($config = array())
+ {
+ $this->view_list = 'Admins_fields_relations'; // safeguard for setting the return view listing to the main view.
+ parent::__construct($config);
+ }
+
+ /**
+ * Method override to check if you can add a new record.
+ *
+ * @param array $data An array of input data.
+ *
+ * @return boolean
+ *
+ * @since 1.6
+ */
+ protected function allowAdd($data = array())
+ {
+ // Access check.
+ $access = JFactory::getUser()->authorise('admin_fields_relations.access', 'com_componentbuilder');
+ if (!$access)
+ {
+ return false;
+ }
+ // In the absense of better information, revert to the component permissions.
+ return JFactory::getUser()->authorise('admin_fields_relations.create', $this->option);
+ }
+
+ /**
+ * Method override to check if you can edit an existing record.
+ *
+ * @param array $data An array of input data.
+ * @param string $key The name of the key for the primary key.
+ *
+ * @return boolean
+ *
+ * @since 1.6
+ */
+ protected function allowEdit($data = array(), $key = 'id')
+ {
+ // get user object.
+ $user = JFactory::getUser();
+ // get record id.
+ $recordId = (int) isset($data[$key]) ? $data[$key] : 0;
+
+
+ // Access check.
+ $access = ($user->authorise('admin_fields_relations.access', 'com_componentbuilder.admin_fields_relations.' . (int) $recordId) && $user->authorise('admin_fields_relations.access', 'com_componentbuilder'));
+ if (!$access)
+ {
+ return false;
+ }
+
+ if ($recordId)
+ {
+ // The record has been set. Check the record permissions.
+ $permission = $user->authorise('admin_fields_relations.edit', 'com_componentbuilder.admin_fields_relations.' . (int) $recordId);
+ if (!$permission)
+ {
+ if ($user->authorise('admin_fields_relations.edit.own', 'com_componentbuilder.admin_fields_relations.' . $recordId))
+ {
+ // Now test the owner is the user.
+ $ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
+ if (empty($ownerId))
+ {
+ // Need to do a lookup from the model.
+ $record = $this->getModel()->getItem($recordId);
+
+ if (empty($record))
+ {
+ return false;
+ }
+ $ownerId = $record->created_by;
+ }
+
+ // If the owner matches 'me' then allow.
+ if ($ownerId == $user->id)
+ {
+ if ($user->authorise('admin_fields_relations.edit.own', 'com_componentbuilder'))
+ {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+ }
+ // Since there is no permission, revert to the component permissions.
+ return $user->authorise('admin_fields_relations.edit', $this->option);
+ }
+
+ /**
+ * Gets the URL arguments to append to an item redirect.
+ *
+ * @param integer $recordId The primary key id for the item.
+ * @param string $urlVar The name of the URL variable for the id.
+ *
+ * @return string The arguments to append to the redirect URL.
+ *
+ * @since 12.2
+ */
+ protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
+ {
+ $tmpl = $this->input->get('tmpl');
+ $layout = $this->input->get('layout', 'edit', 'string');
+
+ $ref = $this->input->get('ref', 0, 'string');
+ $refid = $this->input->get('refid', 0, 'int');
+
+ // Setup redirect info.
+
+ $append = '';
+
+ if ($refid)
+ {
+ $append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+ }
+ elseif ($ref)
+ {
+ $append .= '&ref='.(string)$ref;
+ }
+
+ if ($tmpl)
+ {
+ $append .= '&tmpl=' . $tmpl;
+ }
+
+ if ($layout)
+ {
+ $append .= '&layout=' . $layout;
+ }
+
+ if ($recordId)
+ {
+ $append .= '&' . $urlVar . '=' . $recordId;
+ }
+
+ return $append;
+ }
+
+ /**
+ * Method to run batch operations.
+ *
+ * @param object $model The model.
+ *
+ * @return boolean True if successful, false otherwise and internal error is set.
+ *
+ * @since 2.5
+ */
+ public function batch($model = null)
+ {
+ JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+ // Set the model
+ $model = $this->getModel('Admin_fields_relations', '', array());
+
+ // Preset the redirect
+ $this->setRedirect(JRoute::_('index.php?option=com_componentbuilder&view=admins_fields_relations' . $this->getRedirectToListAppend(), false));
+
+ return parent::batch($model);
+ }
+
+ /**
+ * Method to cancel an edit.
+ *
+ * @param string $key The name of the primary key of the URL variable.
+ *
+ * @return boolean True if access level checks pass, false otherwise.
+ *
+ * @since 12.2
+ */
+ public function cancel($key = null)
+ {
+ // get the referal details
+ $this->ref = $this->input->get('ref', 0, 'word');
+ $this->refid = $this->input->get('refid', 0, 'int');
+
+ $cancel = parent::cancel($key);
+
+ if ($cancel)
+ {
+ if ($this->refid)
+ {
+ $redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+
+ // Redirect to the item screen.
+ $this->setRedirect(
+ JRoute::_(
+ 'index.php?option=' . $this->option . $redirect, false
+ )
+ );
+ }
+ elseif ($this->ref)
+ {
+ $redirect = '&view='.(string)$this->ref;
+
+ // Redirect to the list screen.
+ $this->setRedirect(
+ JRoute::_(
+ 'index.php?option=' . $this->option . $redirect, false
+ )
+ );
+ }
+ }
+ else
+ {
+ // Redirect to the items screen.
+ $this->setRedirect(
+ JRoute::_(
+ 'index.php?option=' . $this->option . '&view=' . $this->view_list, false
+ )
+ );
+ }
+ return $cancel;
+ }
+
+ /**
+ * Method to save a record.
+ *
+ * @param string $key The name of the primary key of the URL variable.
+ * @param string $urlVar The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
+ *
+ * @return boolean True if successful, false otherwise.
+ *
+ * @since 12.2
+ */
+ public function save($key = null, $urlVar = null)
+ {
+ // get the referal details
+ $this->ref = $this->input->get('ref', 0, 'word');
+ $this->refid = $this->input->get('refid', 0, 'int');
+
+ if ($this->ref || $this->refid)
+ {
+ // to make sure the item is checkedin on redirect
+ $this->task = 'save';
+ }
+
+ $saved = parent::save($key, $urlVar);
+
+ if ($this->refid && $saved)
+ {
+ $redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+
+ // Redirect to the item screen.
+ $this->setRedirect(
+ JRoute::_(
+ 'index.php?option=' . $this->option . $redirect, false
+ )
+ );
+ }
+ elseif ($this->ref && $saved)
+ {
+ $redirect = '&view='.(string)$this->ref;
+
+ // Redirect to the list screen.
+ $this->setRedirect(
+ JRoute::_(
+ 'index.php?option=' . $this->option . $redirect, false
+ )
+ );
+ }
+ return $saved;
+ }
+
+ /**
+ * Function that allows child controller access to model data
+ * after the data has been saved.
+ *
+ * @param JModel &$model The data model object.
+ * @param array $validData The validated data.
+ *
+ * @return void
+ *
+ * @since 11.1
+ */
+ protected function postSaveHook(JModelLegacy $model, $validData = array())
+ {
+ return;
+ }
+
+}
diff --git a/admin/controllers/admin_view.php b/admin/controllers/admin_view.php
index 96117fe30..80e97fbfb 100644
--- a/admin/controllers/admin_view.php
+++ b/admin/controllers/admin_view.php
@@ -318,7 +318,8 @@ class ComponentbuilderControllerAdmin_view extends JControllerForm
// linked tables to update
$_tablesArray = array(
'admin_fields',
- 'admin_fields_conditions'
+ 'admin_fields_conditions',
+ 'admin_fields_relations'
);
foreach($_tablesArray as $_updateTable)
{
diff --git a/admin/controllers/admins_fields_relations.php b/admin/controllers/admins_fields_relations.php
new file mode 100644
index 000000000..5f55e6a6d
--- /dev/null
+++ b/admin/controllers/admins_fields_relations.php
@@ -0,0 +1,34 @@
+
+ * @github Joomla Component Builder
+ * @copyright Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import Joomla controlleradmin library
+jimport('joomla.application.component.controlleradmin');
+
+/**
+ * Admins_fields_relations Controller
+ */
+class ComponentbuilderControllerAdmins_fields_relations extends JControllerAdmin
+{
+ protected $text_prefix = 'COM_COMPONENTBUILDER_ADMINS_FIELDS_RELATIONS';
+ /**
+ * Proxy for getModel.
+ * @since 2.5
+ */
+ public function getModel($name = 'Admin_fields_relations', $prefix = 'ComponentbuilderModel', $config = array())
+ {
+ $model = parent::getModel($name, $prefix, array('ignore_request' => true));
+
+ return $model;
+ }
+}
diff --git a/admin/helpers/compiler.php b/admin/helpers/compiler.php
index 2398a2093..08fa555e6 100644
--- a/admin/helpers/compiler.php
+++ b/admin/helpers/compiler.php
@@ -72,7 +72,7 @@ class Compiler extends Infusion
// first remove the files and folders
$this->removeFolder($this->componentPath . '/site');
// clear form component xml
- $xmlPath = $this->componentPath . '/' . $this->fileContentStatic['###component###'] . '.xml';
+ $xmlPath = $this->componentPath . '/' . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . '.xml';
$componentXML = ComponentbuilderHelper::getFileContents($xmlPath);
$textToSite = ComponentbuilderHelper::getBetween($componentXML, '', '');
$textToSiteLang = ComponentbuilderHelper::getBetween($componentXML, '', '');
@@ -215,16 +215,16 @@ class Compiler extends Infusion
{
if (JFile::exists($static['path']))
{
- $this->fileContentStatic['###FILENAME###'] = $static['name'];
+ $this->fileContentStatic[$this->hhh . 'FILENAME' . $this->hhh] = $static['name'];
$php = '';
if (ComponentbuilderHelper::checkFileType($static['name'], 'php'))
{
$php = "hhh . 'BOM' . $this->hhh) !== false)
{
- list($wast, $code) = explode('###BOM###', $string);
+ list($wast, $code) = explode($this->hhh . 'BOM' . $this->hhh, $string);
$string = $php . $bom . $code;
$answer = $this->setPlaceholders($string, $this->fileContentStatic, 3);
// add to zip array
@@ -250,7 +250,7 @@ class Compiler extends Infusion
{
if (JFile::exists($file['path']))
{
- $this->fileContentStatic['###FILENAME###'] = $file['name'];
+ $this->fileContentStatic[$this->hhh . 'FILENAME' . $this->hhh] = $file['name'];
// do some weird stuff to improve the verion and dates being added to the license
$this->fixLicenseValues($file);
$php = '';
@@ -259,9 +259,9 @@ class Compiler extends Infusion
$php = "hhh . 'BOM' . $this->hhh) !== false)
{
- list($bin, $code) = explode('###BOM###', $string);
+ list($bin, $code) = explode($this->hhh . 'BOM' . $this->hhh, $string);
$string = $php . $bom . $code;
$answer = $this->setPlaceholders($string, $this->fileContentStatic, 3);
$answer = $this->setPlaceholders($answer, $this->fileContentDynamic[$view], 3);
@@ -321,7 +321,7 @@ class Compiler extends Infusion
{
foreach ($data['config'] as $key => $value)
{
- if ('###VERSION###' === $key)
+ if ($this->hhh . 'VERSION' . $this->hhh === $key)
{
// hmm we sould in some way make it known that this version number
// is not in relation the the project but to the file only... any ideas?
@@ -340,9 +340,9 @@ class Compiler extends Infusion
return true;
}
// else insure to reset to global
- $this->fileContentStatic['###CREATIONDATE###'] = $this->fileContentStatic['###CREATIONDATE###GLOBAL'];
- $this->fileContentStatic['###BUILDDATE###'] = $this->fileContentStatic['###BUILDDATE###GLOBAL'];
- $this->fileContentStatic['###VERSION###'] = $this->fileContentStatic['###VERSION###GLOBAL'];
+ $this->fileContentStatic[$this->hhh . 'CREATIONDATE' . $this->hhh] = $this->fileContentStatic[$this->hhh . 'CREATIONDATE' . $this->hhh . 'GLOBAL'];
+ $this->fileContentStatic[$this->hhh . 'BUILDDATE' . $this->hhh] = $this->fileContentStatic[$this->hhh . 'BUILDDATE' . $this->hhh . 'GLOBAL'];
+ $this->fileContentStatic[$this->hhh . 'VERSION' . $this->hhh] = $this->fileContentStatic[$this->hhh . 'VERSION' . $this->hhh . 'GLOBAL'];
}
// set all global numbers
@@ -399,7 +399,7 @@ class Compiler extends Infusion
private function setReadMe($path)
{
// set readme data if not set already
- if (!isset($this->fileContentStatic['###LINE_COUNT###']) || $this->fileContentStatic['###LINE_COUNT###'] != $this->lineCount)
+ if (!isset($this->fileContentStatic[$this->hhh . 'LINE_COUNT' . $this->hhh]) || $this->fileContentStatic[$this->hhh . 'LINE_COUNT' . $this->hhh] != $this->lineCount)
{
$this->buildReadMeData();
}
@@ -414,39 +414,39 @@ class Compiler extends Infusion
private function buildReadMeData()
{
// set some defaults
- $this->fileContentStatic['###LINE_COUNT###'] = $this->lineCount;
- $this->fileContentStatic['###FIELD_COUNT###'] = $this->fieldCount;
- $this->fileContentStatic['###FILE_COUNT###'] = $this->fileCount;
- $this->fileContentStatic['###FOLDER_COUNT###'] = $this->folderCount;
- $this->fileContentStatic['###PAGE_COUNT###'] = $this->pageCount;
- $this->fileContentStatic['###folders###'] = $this->folderSeconds;
- $this->fileContentStatic['###foldersSeconds###'] = $this->folderSeconds;
- $this->fileContentStatic['###files###'] = $this->fileSeconds;
- $this->fileContentStatic['###filesSeconds###'] = $this->fileSeconds;
- $this->fileContentStatic['###lines###'] = $this->lineSeconds;
- $this->fileContentStatic['###linesSeconds###'] = $this->lineSeconds;
- $this->fileContentStatic['###seconds###'] = $this->actualSeconds;
- $this->fileContentStatic['###actualSeconds###'] = $this->actualSeconds;
- $this->fileContentStatic['###totalHours###'] = $this->totalHours;
- $this->fileContentStatic['###totalDays###'] = $this->totalDays;
- $this->fileContentStatic['###debugging###'] = $this->secondsDebugging;
- $this->fileContentStatic['###secondsDebugging###'] = $this->secondsDebugging;
- $this->fileContentStatic['###planning###'] = $this->secondsPlanning;
- $this->fileContentStatic['###secondsPlanning###'] = $this->secondsPlanning;
- $this->fileContentStatic['###mapping###'] = $this->secondsMapping;
- $this->fileContentStatic['###secondsMapping###'] = $this->secondsMapping;
- $this->fileContentStatic['###office###'] = $this->secondsOffice;
- $this->fileContentStatic['###secondsOffice###'] = $this->secondsOffice;
- $this->fileContentStatic['###actualTotalHours###'] = $this->actualTotalHours;
- $this->fileContentStatic['###actualTotalDays###'] = $this->actualTotalDays;
- $this->fileContentStatic['###debuggingHours###'] = $this->debuggingHours;
- $this->fileContentStatic['###planningHours###'] = $this->planningHours;
- $this->fileContentStatic['###mappingHours###'] = $this->mappingHours;
- $this->fileContentStatic['###officeHours###'] = $this->officeHours;
- $this->fileContentStatic['###actualHoursSpent###'] = $this->actualHoursSpent;
- $this->fileContentStatic['###actualDaysSpent###'] = $this->actualDaysSpent;
- $this->fileContentStatic['###projectWeekTime###'] = $this->projectWeekTime;
- $this->fileContentStatic['###projectMonthTime###'] = $this->projectMonthTime;
+ $this->fileContentStatic[$this->hhh . 'LINE_COUNT' . $this->hhh] = $this->lineCount;
+ $this->fileContentStatic[$this->hhh . 'FIELD_COUNT' . $this->hhh] = $this->fieldCount;
+ $this->fileContentStatic[$this->hhh . 'FILE_COUNT' . $this->hhh] = $this->fileCount;
+ $this->fileContentStatic[$this->hhh . 'FOLDER_COUNT' . $this->hhh] = $this->folderCount;
+ $this->fileContentStatic[$this->hhh . 'PAGE_COUNT' . $this->hhh] = $this->pageCount;
+ $this->fileContentStatic[$this->hhh . 'folders' . $this->hhh] = $this->folderSeconds;
+ $this->fileContentStatic[$this->hhh . 'foldersSeconds' . $this->hhh] = $this->folderSeconds;
+ $this->fileContentStatic[$this->hhh . 'files' . $this->hhh] = $this->fileSeconds;
+ $this->fileContentStatic[$this->hhh . 'filesSeconds' . $this->hhh] = $this->fileSeconds;
+ $this->fileContentStatic[$this->hhh . 'lines' . $this->hhh] = $this->lineSeconds;
+ $this->fileContentStatic[$this->hhh . 'linesSeconds' . $this->hhh] = $this->lineSeconds;
+ $this->fileContentStatic[$this->hhh . 'seconds' . $this->hhh] = $this->actualSeconds;
+ $this->fileContentStatic[$this->hhh . 'actualSeconds' . $this->hhh] = $this->actualSeconds;
+ $this->fileContentStatic[$this->hhh . 'totalHours' . $this->hhh] = $this->totalHours;
+ $this->fileContentStatic[$this->hhh . 'totalDays' . $this->hhh] = $this->totalDays;
+ $this->fileContentStatic[$this->hhh . 'debugging' . $this->hhh] = $this->secondsDebugging;
+ $this->fileContentStatic[$this->hhh . 'secondsDebugging' . $this->hhh] = $this->secondsDebugging;
+ $this->fileContentStatic[$this->hhh . 'planning' . $this->hhh] = $this->secondsPlanning;
+ $this->fileContentStatic[$this->hhh . 'secondsPlanning' . $this->hhh] = $this->secondsPlanning;
+ $this->fileContentStatic[$this->hhh . 'mapping' . $this->hhh] = $this->secondsMapping;
+ $this->fileContentStatic[$this->hhh . 'secondsMapping' . $this->hhh] = $this->secondsMapping;
+ $this->fileContentStatic[$this->hhh . 'office' . $this->hhh] = $this->secondsOffice;
+ $this->fileContentStatic[$this->hhh . 'secondsOffice' . $this->hhh] = $this->secondsOffice;
+ $this->fileContentStatic[$this->hhh . 'actualTotalHours' . $this->hhh] = $this->actualTotalHours;
+ $this->fileContentStatic[$this->hhh . 'actualTotalDays' . $this->hhh] = $this->actualTotalDays;
+ $this->fileContentStatic[$this->hhh . 'debuggingHours' . $this->hhh] = $this->debuggingHours;
+ $this->fileContentStatic[$this->hhh . 'planningHours' . $this->hhh] = $this->planningHours;
+ $this->fileContentStatic[$this->hhh . 'mappingHours' . $this->hhh] = $this->mappingHours;
+ $this->fileContentStatic[$this->hhh . 'officeHours' . $this->hhh] = $this->officeHours;
+ $this->fileContentStatic[$this->hhh . 'actualHoursSpent' . $this->hhh] = $this->actualHoursSpent;
+ $this->fileContentStatic[$this->hhh . 'actualDaysSpent' . $this->hhh] = $this->actualDaysSpent;
+ $this->fileContentStatic[$this->hhh . 'projectWeekTime' . $this->hhh] = $this->projectWeekTime;
+ $this->fileContentStatic[$this->hhh . 'projectMonthTime' . $this->hhh] = $this->projectMonthTime;
}
private function zipComponent()
diff --git a/admin/helpers/compiler/a_Get.php b/admin/helpers/compiler/a_Get.php
index 33c83858a..c3038dcd2 100644
--- a/admin/helpers/compiler/a_Get.php
+++ b/admin/helpers/compiler/a_Get.php
@@ -18,6 +18,27 @@ defined('_JEXEC') or die('Restricted access');
class Get
{
+ /**
+ * The hash placeholder
+ *
+ * @var string
+ */
+ public $hhh = '#' . '#' . '#';
+
+ /**
+ * The open bracket placeholder
+ *
+ * @var string
+ */
+ public $bbb = '[' . '[' . '[';
+
+ /**
+ * The close bracket placeholder
+ *
+ * @var string
+ */
+ public $ddd = ']' . ']' . ']';
+
/**
* The app
*
@@ -834,12 +855,12 @@ class Get
$component = ComponentbuilderHelper::convertRepeatableFields($component, $searchRepeatables, $updater);
// set component place holders
- $this->placeholders['###component###'] = ComponentbuilderHelper::safeString($component->name_code);
- $this->placeholders['###Component###'] = ComponentbuilderHelper::safeString($component->name_code, 'F');
- $this->placeholders['###COMPONENT###'] = ComponentbuilderHelper::safeString($component->name_code, 'U');
- $this->placeholders['[[[component]]]'] = $this->placeholders['###component###'];
- $this->placeholders['[[[Component]]]'] = $this->placeholders['###Component###'];
- $this->placeholders['[[[COMPONENT]]]'] = $this->placeholders['###COMPONENT###'];
+ $this->placeholders[$this->hhh . 'component' . $this->hhh] = ComponentbuilderHelper::safeString($component->name_code);
+ $this->placeholders[$this->hhh . 'Component' . $this->hhh] = ComponentbuilderHelper::safeString($component->name_code, 'F');
+ $this->placeholders[$this->hhh . 'COMPONENT' . $this->hhh] = ComponentbuilderHelper::safeString($component->name_code, 'U');
+ $this->placeholders[$this->bbb . 'component' . $this->ddd] = $this->placeholders[$this->hhh . 'component' . $this->hhh];
+ $this->placeholders[$this->bbb . 'Component' . $this->ddd] = $this->placeholders[$this->hhh . 'Component' . $this->hhh];
+ $this->placeholders[$this->bbb . 'COMPONENT' . $this->ddd] = $this->placeholders[$this->hhh . 'COMPONENT' . $this->hhh];
// set component sales name
$component->sales_name = ComponentbuilderHelper::safeString($component->system_name);
@@ -1376,18 +1397,18 @@ class Get
$this->customScriptBuilder['token'][$name_single] = false;
$this->customScriptBuilder['token'][$name_list] = false;
// set some placeholders
- $this->placeholders['###view###'] = ComponentbuilderHelper::safeString($name_single);
- $this->placeholders['###views###'] = ComponentbuilderHelper::safeString($name_list);
- $this->placeholders['###View###'] = ComponentbuilderHelper::safeString($name_single, 'F');
- $this->placeholders['###Views###'] = ComponentbuilderHelper::safeString($name_list, 'F');
- $this->placeholders['###VIEW###'] = ComponentbuilderHelper::safeString($name_single, 'U');
- $this->placeholders['###VIEWS###'] = ComponentbuilderHelper::safeString($name_list, 'U');
- $this->placeholders['[[[view]]]'] = $this->placeholders['###view###'];
- $this->placeholders['[[[views]]]'] = $this->placeholders['###views###'];
- $this->placeholders['[[[View]]]'] = $this->placeholders['###View###'];
- $this->placeholders['[[[Views]]]'] = $this->placeholders['###Views###'];
- $this->placeholders['[[[VIEW]]]'] = $this->placeholders['###VIEW###'];
- $this->placeholders['[[[VIEWS]]]'] = $this->placeholders['###VIEWS###'];
+ $this->placeholders[$this->hhh . 'view' . $this->hhh] = ComponentbuilderHelper::safeString($name_single);
+ $this->placeholders[$this->hhh . 'views' . $this->hhh] = ComponentbuilderHelper::safeString($name_list);
+ $this->placeholders[$this->hhh . 'View' . $this->hhh] = ComponentbuilderHelper::safeString($name_single, 'F');
+ $this->placeholders[$this->hhh . 'Views' . $this->hhh] = ComponentbuilderHelper::safeString($name_list, 'F');
+ $this->placeholders[$this->hhh . 'VIEW' . $this->hhh] = ComponentbuilderHelper::safeString($name_single, 'U');
+ $this->placeholders[$this->hhh . 'VIEWS' . $this->hhh] = ComponentbuilderHelper::safeString($name_list, 'U');
+ $this->placeholders[$this->bbb . 'view' . $this->ddd] = $this->placeholders[$this->hhh . 'view' . $this->hhh];
+ $this->placeholders[$this->bbb . 'views' . $this->ddd] = $this->placeholders[$this->hhh . 'views' . $this->hhh];
+ $this->placeholders[$this->bbb . 'View' . $this->ddd] = $this->placeholders[$this->hhh . 'View' . $this->hhh];
+ $this->placeholders[$this->bbb . 'Views' . $this->ddd] = $this->placeholders[$this->hhh . 'Views' . $this->hhh];
+ $this->placeholders[$this->bbb . 'VIEW' . $this->ddd] = $this->placeholders[$this->hhh . 'VIEW' . $this->hhh];
+ $this->placeholders[$this->bbb . 'VIEWS' . $this->ddd] = $this->placeholders[$this->hhh . 'VIEWS' . $this->hhh];
// add the tables
$view->addtables = (isset($view->addtables) && ComponentbuilderHelper::checkJson($view->addtables)) ? json_decode($view->addtables, true) : null;
if (ComponentbuilderHelper::checkArray($view->addtables))
@@ -1819,18 +1840,18 @@ class Get
}
}
// clear placeholders
- unset($this->placeholders['###view###']);
- unset($this->placeholders['###views###']);
- unset($this->placeholders['###View###']);
- unset($this->placeholders['###Views###']);
- unset($this->placeholders['###VIEW###']);
- unset($this->placeholders['###VIEWS###']);
- unset($this->placeholders['[[[view]]]']);
- unset($this->placeholders['[[[views]]]']);
- unset($this->placeholders['[[[View]]]']);
- unset($this->placeholders['[[[Views]]]']);
- unset($this->placeholders['[[[VIEW]]]']);
- unset($this->placeholders['[[[VIEWS]]]']);
+ unset($this->placeholders[$this->hhh . 'view' . $this->hhh]);
+ unset($this->placeholders[$this->hhh . 'views' . $this->hhh]);
+ unset($this->placeholders[$this->hhh . 'View' . $this->hhh]);
+ unset($this->placeholders[$this->hhh . 'Views' . $this->hhh]);
+ unset($this->placeholders[$this->hhh . 'VIEW' . $this->hhh]);
+ unset($this->placeholders[$this->hhh . 'VIEWS' . $this->hhh]);
+ unset($this->placeholders[$this->bbb . 'view' . $this->ddd]);
+ unset($this->placeholders[$this->bbb . 'views' . $this->ddd]);
+ unset($this->placeholders[$this->bbb . 'View' . $this->ddd]);
+ unset($this->placeholders[$this->bbb . 'Views' . $this->ddd]);
+ unset($this->placeholders[$this->bbb . 'VIEW' . $this->ddd]);
+ unset($this->placeholders[$this->bbb . 'VIEWS' . $this->ddd]);
// store this view to class object
$this->_adminViewData[$id] = $view;
@@ -3605,7 +3626,7 @@ class Get
if (ComponentbuilderHelper::checkArray($langStringTargets))
{
// insure string is not broken
- $content = str_replace('COM_###COMPONENT###', $this->langPrefix, $content);
+ $content = str_replace('COM_' . $this->hhh . 'COMPONENT' . $this->hhh, $this->langPrefix, $content);
// reset some buckets
$langHolders = array();
$langCheck = array();
@@ -3938,9 +3959,9 @@ class Get
$data = $this->db->loadObjectList();
// start building the MySql dump
$dump = "--";
- $dump .= PHP_EOL . "-- Dumping data for table `#__[[[component]]]_" . $view . "`";
+ $dump .= PHP_EOL . "-- Dumping data for table `#__".$this->bbb."component".$this->ddd."_" . $view . "`";
$dump .= PHP_EOL . "--";
- $dump .= PHP_EOL . PHP_EOL . "INSERT INTO `#__[[[component]]]_" . $view . "` (";
+ $dump .= PHP_EOL . PHP_EOL . "INSERT INTO `#__".$this->bbb."component".$this->ddd."_" . $view . "` (";
foreach ($data as $line)
{
$comaSet = 0;
@@ -4442,7 +4463,7 @@ class Get
}
// check what type of place holders we should load here
$placeholderType = (int) $item['comment_type'] . '2';
- if (stripos($item['code'], '[[[view') !== false || stripos($item['code'], '[[[sview') !== false || stripos($item['code'], '[[[arg') !== false)
+ if (stripos($item['code'], $this->bbb . 'view') !== false || stripos($item['code'], $this->bbb . 'sview') !== false || stripos($item['code'], $this->bbb . 'arg') !== false)
{
// if view is being set dynamicly then we can't update this code via IDE (TODO)
$placeholderType = 3;
@@ -4472,7 +4493,7 @@ class Get
$number = 0;
foreach ($values as $value)
{
- $this->placeholders['[[[' . $key . $number . ']]]'] = $value;
+ $this->placeholders[$this->bbb . $key . $number . $this->ddd] = $value;
$number++;
}
}
@@ -5043,9 +5064,9 @@ class Get
$fileTypes = array('\.php', '\.js');
// set some local placeholders
$placeholders = array();
- $placeholders[ComponentbuilderHelper::safeString($this->componentCodeName, 'F') . 'Helper::'] = '[[[Component]]]Helper::';
- $placeholders['COM_' . ComponentbuilderHelper::safeString($this->componentCodeName, 'U')] = 'COM_[[[COMPONENT]]]';
- $placeholders['com_' . $this->componentCodeName] = 'com_[[[component]]]';
+ $placeholders[ComponentbuilderHelper::safeString($this->componentCodeName, 'F') . 'Helper::'] = $this->bbb . 'Component' . $this->ddd . 'Helper::';
+ $placeholders['COM_' . ComponentbuilderHelper::safeString($this->componentCodeName, 'U')] = 'COM_' . $this->bbb . 'COMPONENT' . $this->ddd;
+ $placeholders['com_' . $this->componentCodeName] = 'com_' . $this->bbb . 'component' . $this->ddd;
foreach ($paths as $target => $path)
{
// we are changing the working directory to the componet path
@@ -5760,7 +5781,7 @@ class Get
return round($val1 + $val2);
break;
// Subtract one number from the other
- case 'add':
+ case 'sub':
return round($val1 - $val2);
break;
}
diff --git a/admin/helpers/compiler/b_Structure.php b/admin/helpers/compiler/b_Structure.php
index edea8eb5d..976528480 100644
--- a/admin/helpers/compiler/b_Structure.php
+++ b/admin/helpers/compiler/b_Structure.php
@@ -490,11 +490,11 @@ class Structure extends Get
if ($addLocalFolder)
{
// check if we sould add it to the media xml list
- if (!isset($this->fileContentStatic['###EXSTRA_MEDIA_FOLDERS###']))
+ if (!isset($this->fileContentStatic[$this->hhh . 'EXSTRA_MEDIA_FOLDERS' . $this->hhh]))
{
- $this->fileContentStatic['###EXSTRA_MEDIA_FOLDERS###'] = '';
+ $this->fileContentStatic[$this->hhh . 'EXSTRA_MEDIA_FOLDERS' . $this->hhh] = '';
}
- $this->fileContentStatic['###EXSTRA_MEDIA_FOLDERS###'] .= PHP_EOL . "\t\t" . $libFolder . "";
+ $this->fileContentStatic[$this->hhh . 'EXSTRA_MEDIA_FOLDERS' . $this->hhh] .= PHP_EOL . "\t\t" . $libFolder . "";
}
}
// if config fields are found load into component config (avoiding dublicates)
@@ -755,9 +755,10 @@ class Structure extends Get
// do license check
$LICENSE = false;
$licenseChecker = strtolower($this->componentData->license);
- if (strpos($licenseChecker, 'gnu') !== false && strpos($licenseChecker, 'gpl') !== false)
+ if (strpos($licenseChecker, 'gnu') !== false && strpos($licenseChecker, '2') !== false &&
+ (strpos($licenseChecker, 'gpl') !== false || strpos($licenseChecker, 'general public license') !== false))
{
- $LICENSE = true;
+ $LICENSE = true; // we only add version 2 auto at this time (TODO)
}
// do README check
$README = false;
@@ -890,20 +891,20 @@ class Structure extends Get
if ($view['settings']->name_list != 'null')
{
$target = array('admin' => $view['settings']->name_list);
- $config = array('###CREATIONDATE###' => $created, '###BUILDDATE###' => $modified, '###VERSION###' => $view['settings']->version);
+ $config = array($this->hhh . 'CREATIONDATE' . $this->hhh => $created, $this->hhh . 'BUILDDATE' . $this->hhh => $modified, $this->hhh . 'VERSION' . $this->hhh => $view['settings']->version);
$this->buildDynamique($target, 'list', false, $config);
}
if ($view['settings']->name_single != 'null')
{
$target = array('admin' => $view['settings']->name_single);
- $config = array('###CREATIONDATE###' => $created, '###BUILDDATE###' => $modified, '###VERSION###' => $view['settings']->version);
+ $config = array($this->hhh . 'CREATIONDATE' . $this->hhh => $created, $this->hhh . 'BUILDDATE' . $this->hhh => $modified, $this->hhh . 'VERSION' . $this->hhh => $view['settings']->version);
$this->buildDynamique($target, 'single', false, $config);
}
if (isset($view['edit_create_site_view']) && $view['edit_create_site_view'])
{
// setup the front site edit-view files
$target = array('site' => $view['settings']->name_single);
- $config = array('###CREATIONDATE###' => $created, '###BUILDDATE###' => $modified, '###VERSION###' => $view['settings']->version);
+ $config = array($this->hhh . 'CREATIONDATE' . $this->hhh => $created, $this->hhh . 'BUILDDATE' . $this->hhh => $modified, $this->hhh . 'VERSION' . $this->hhh => $view['settings']->version);
$this->buildDynamique($target, 'edit', false, $config);
}
}
@@ -927,14 +928,14 @@ class Structure extends Get
{
// set list view
$target = array('site' => $view['settings']->code);
- $config = array('###CREATIONDATE###' => $created, '###BUILDDATE###' => $modified, '###VERSION###' => $view['settings']->version);
+ $config = array($this->hhh . 'CREATIONDATE' . $this->hhh => $created, $this->hhh . 'BUILDDATE' . $this->hhh => $modified, $this->hhh . 'VERSION' . $this->hhh => $view['settings']->version);
$this->buildDynamique($target, 'list', false, $config);
}
elseif ($view['settings']->main_get->gettype == 1)
{
// set single view
$target = array('site' => $view['settings']->code);
- $config = array('###CREATIONDATE###' => $created, '###BUILDDATE###' => $modified, '###VERSION###' => $view['settings']->version);
+ $config = array($this->hhh . 'CREATIONDATE' . $this->hhh => $created, $this->hhh . 'BUILDDATE' . $this->hhh => $modified, $this->hhh . 'VERSION' . $this->hhh => $view['settings']->version);
$this->buildDynamique($target, 'single', false, $config);
}
}
@@ -950,14 +951,14 @@ class Structure extends Get
{
// set list view$view
$target = array('custom_admin' => $view['settings']->code);
- $config = array('###CREATIONDATE###' => $created, '###BUILDDATE###' => $modified, '###VERSION###' => $view['settings']->version);
+ $config = array($this->hhh . 'CREATIONDATE' . $this->hhh => $created, $this->hhh . 'BUILDDATE' . $this->hhh => $modified, $this->hhh . 'VERSION' . $this->hhh => $view['settings']->version);
$this->buildDynamique($target, 'list', false, $config);
}
elseif ($view['settings']->main_get->gettype == 1)
{
// set single view
$target = array('custom_admin' => $view['settings']->code);
- $config = array('###CREATIONDATE###' => $created, '###BUILDDATE###' => $modified, '###VERSION###' => $view['settings']->version);
+ $config = array($this->hhh . 'CREATIONDATE' . $this->hhh => $created, $this->hhh . 'BUILDDATE' . $this->hhh => $modified, $this->hhh . 'VERSION' . $this->hhh => $view['settings']->version);
$this->buildDynamique($target, 'single', false, $config);
}
}
@@ -1278,31 +1279,31 @@ class Structure extends Get
$newname = '';
}
// check if we sould add it to the media xml list
- if (!isset($this->fileContentStatic['###EXSTRA_MEDIA_FOLDERS###']))
+ if (!isset($this->fileContentStatic[$this->hhh . 'EXSTRA_MEDIA_FOLDERS' . $this->hhh]))
{
- $this->fileContentStatic['###EXSTRA_MEDIA_FOLDERS###'] = '';
+ $this->fileContentStatic[$this->hhh . 'EXSTRA_MEDIA_FOLDERS' . $this->hhh] = '';
}
if (count($pathArray) == 1 && $firstFolder === 'media')
{
- $this->fileContentStatic['###EXSTRA_MEDIA_FOLDERS###'] .= PHP_EOL . "\t\t" . $lastFolder . "";
+ $this->fileContentStatic[$this->hhh . 'EXSTRA_MEDIA_FOLDERS' . $this->hhh] .= PHP_EOL . "\t\t" . $lastFolder . "";
}
// check if we sould add it to the site xml list
- if (!isset($this->fileContentStatic['###EXSTRA_SITE_FOLDERS###']))
+ if (!isset($this->fileContentStatic[$this->hhh . 'EXSTRA_SITE_FOLDERS' . $this->hhh]))
{
- $this->fileContentStatic['###EXSTRA_SITE_FOLDERS###'] = '';
+ $this->fileContentStatic[$this->hhh . 'EXSTRA_SITE_FOLDERS' . $this->hhh] = '';
}
if (count($pathArray) == 1 && $firstFolder === 'site')
{
- $this->fileContentStatic['###EXSTRA_SITE_FOLDERS###'] .= PHP_EOL . "\t\t" . $lastFolder . "";
+ $this->fileContentStatic[$this->hhh . 'EXSTRA_SITE_FOLDERS' . $this->hhh] .= PHP_EOL . "\t\t" . $lastFolder . "";
}
// check if we sould add it to the admin xml list
- if (!isset($this->fileContentStatic['###EXSTRA_ADMIN_FOLDERS###']))
+ if (!isset($this->fileContentStatic[$this->hhh . 'EXSTRA_ADMIN_FOLDERS' . $this->hhh]))
{
- $this->fileContentStatic['###EXSTRA_ADMIN_FOLDERS###'] = '';
+ $this->fileContentStatic[$this->hhh . 'EXSTRA_ADMIN_FOLDERS' . $this->hhh] = '';
}
if (count($pathArray) == 1 && $firstFolder === 'admin')
{
- $this->fileContentStatic['###EXSTRA_ADMIN_FOLDERS###'] .= PHP_EOL . "\t\t\t" . $lastFolder . "";
+ $this->fileContentStatic[$this->hhh . 'EXSTRA_ADMIN_FOLDERS' . $this->hhh] .= PHP_EOL . "\t\t\t" . $lastFolder . "";
}
// make we have not duplicates
$key_pointer = ComponentbuilderHelper::safeString($custom['folder']) . '_f' . $pointer_tracker;
diff --git a/admin/helpers/compiler/c_Fields.php b/admin/helpers/compiler/c_Fields.php
index 725e24791..b7202fd9a 100644
--- a/admin/helpers/compiler/c_Fields.php
+++ b/admin/helpers/compiler/c_Fields.php
@@ -384,8 +384,8 @@ class Fields extends Structure
$this->accessBuilder[$view_name_single] = $view_name_single;
}
// main lang prefix
- $langView = $this->langPrefix . '_' . $this->placeholders['###VIEW###'];
- $langViews = $this->langPrefix . '_' . $this->placeholders['###VIEWS###'];
+ $langView = $this->langPrefix . '_' . $this->placeholders[$this->hhh . 'VIEW' . $this->hhh];
+ $langViews = $this->langPrefix . '_' . $this->placeholders[$this->hhh . 'VIEWS' . $this->hhh];
// set default lang
$this->langContent[$this->lang][$langView] = $view['settings']->name_single;
$this->langContent[$this->lang][$langViews] = $view['settings']->name_list;
@@ -2696,17 +2696,17 @@ class Fields extends Structure
);
// make field dynamic
$replace = array(
- '###TABLE###' => $data['custom']['table'],
- '###ID###' => $data['custom']['id'],
- '###TEXT###' => $data['custom']['text'],
- '###CODE_TEXT###' => $data['code'] . '_' . $data['custom']['text'],
- '###CODE###' => $data['code'],
- '###component###' => $this->fileContentStatic['###component###'],
- '###Component###' => $this->fileContentStatic['###Component###'],
- '###view_type###' => $view_name_single . '_' . $data['type'],
- '###type###' => $data['type'],
- '###view###' => $view_name_single,
- '###views###' => $view_name_list
+ $this->hhh . 'TABLE' . $this->hhh => $data['custom']['table'],
+ $this->hhh . 'ID' . $this->hhh => $data['custom']['id'],
+ $this->hhh . 'TEXT' . $this->hhh => $data['custom']['text'],
+ $this->hhh . 'CODE_TEXT' . $this->hhh => $data['code'] . '_' . $data['custom']['text'],
+ $this->hhh . 'CODE' . $this->hhh => $data['code'],
+ $this->hhh . 'component' . $this->hhh => $this->fileContentStatic[$this->hhh . 'component' . $this->hhh],
+ $this->hhh . 'Component' . $this->hhh => $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh],
+ $this->hhh . 'view_type' . $this->hhh => $view_name_single . '_' . $data['type'],
+ $this->hhh . 'type' . $this->hhh => $data['type'],
+ $this->hhh . 'view' . $this->hhh => $view_name_single,
+ $this->hhh . 'views' . $this->hhh => $view_name_list
);
// now load the php script
if (isset($data['custom']['php']) && ComponentbuilderHelper::checkArray($data['custom']['php']))
@@ -2780,23 +2780,23 @@ class Fields extends Structure
$this->langContent[$this->lang][$groupLangName] = ComponentbuilderHelper::safeString($tempName, 'W');
// build the Group Control
$this->setGroupControl[$data['type']] = $groupLangName;
- // ###JFORM_GETGROUPS_PHP### <<>>
- $this->fileContentDynamic['customfield_' . $data['type']]['###JFORM_GETGROUPS_PHP###'] = $phpCode;
+ // JFORM_GETGROUPS_PHP <<>>
+ $this->fileContentDynamic['customfield_' . $data['type']][$this->hhh . 'JFORM_GETGROUPS_PHP' . $this->hhh] = $phpCode;
- // ###JFORM_GETEXCLUDED_PHP### <<>>
- $this->fileContentDynamic['customfield_' . $data['type']]['###JFORM_GETEXCLUDED_PHP###'] = $phpxCode;
+ // JFORM_GETEXCLUDED_PHP <<>>
+ $this->fileContentDynamic['customfield_' . $data['type']][$this->hhh . 'JFORM_GETEXCLUDED_PHP' . $this->hhh] = $phpxCode;
}
else
{
- // ###JFORM_GETOPTIONS_PHP### <<>>
- $this->fileContentDynamic['customfield_' . $data['type']]['###JFORM_GETOPTIONS_PHP###'] = $phpCode;
+ // JFORM_GETOPTIONS_PHP <<>>
+ $this->fileContentDynamic['customfield_' . $data['type']][$this->hhh . 'JFORM_GETOPTIONS_PHP' . $this->hhh] = $phpCode;
}
- // ###Type### <<>>
- $this->fileContentDynamic['customfield_' . $data['type']]['###Type###'] = ComponentbuilderHelper::safeString($data['custom']['type'], 'F');
- // ###type### <<>>
- $this->fileContentDynamic['customfield_' . $data['type']]['###type###'] = $data['custom']['type'];
- // ###type### <<>>
- $this->fileContentDynamic['customfield_' . $data['type']]['###ADD_BUTTON###'] = $this->setAddButtonToListField($data['custom']);
+ // Type <<>>
+ $this->fileContentDynamic['customfield_' . $data['type']][$this->hhh . 'Type' . $this->hhh] = ComponentbuilderHelper::safeString($data['custom']['type'], 'F');
+ // type <<>>
+ $this->fileContentDynamic['customfield_' . $data['type']][$this->hhh . 'type' . $this->hhh] = $data['custom']['type'];
+ // type <<>>
+ $this->fileContentDynamic['customfield_' . $data['type']][$this->hhh . 'ADD_BUTTON' . $this->hhh] = $this->setAddButtonToListField($data['custom']);
}
}
@@ -2818,15 +2818,15 @@ class Fields extends Structure
// check that the component value is set
if (!isset($fieldData['component']) || !ComponentbuilderHelper::checkString($fieldData['component']))
{
- $fieldData['component'] = "com_" . $this->fileContentStatic['###component###'];
+ $fieldData['component'] = "com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh];
}
// check that the componet has the com_ value in it
if (strpos($fieldData['component'], 'com_') === false || strpos($fieldData['component'], '=') !== false)
{
$fieldData['component'] = "com_" . $fieldData['component'];
}
- // make sure the component is update if ### or [[[ component placeholder is used
- if (strpos($fieldData['component'], '###') !== false || strpos($fieldData['component'], '[[[') !== false) // should not be needed... but
+ // make sure the component is update if # # # or [ [ [ component placeholder is used
+ if (strpos($fieldData['component'], $this->hhh) !== false || strpos($fieldData['component'], $this->bbb) !== false) // should not be needed... but
{
$fieldData['component'] = $this->setPlaceholders($fieldData['component'], $this->placeholders);
}
@@ -2841,7 +2841,7 @@ class Fields extends Structure
// set switch to activate easy update
$coreLoad = true;
// since the view is local to the component use this component name
- $component = "com_" . $this->fileContentStatic['###component###'];
+ $component = "com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh];
}
else
{
diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php
index abaed3ab0..e07c234aa 100644
--- a/admin/helpers/compiler/e_Interpretation.php
+++ b/admin/helpers/compiler/e_Interpretation.php
@@ -211,14 +211,14 @@ class Interpretation extends Fields
if (isset($this->componentData->add_email_helper) && $this->componentData->add_email_helper)
{
// set email helper in place with component name
- $component = $this->fileContentStatic['###component###'];
- $Component = $this->fileContentStatic['###Component###'];
+ $component = $this->fileContentStatic[$this->hhh . 'component' . $this->hhh];
+ $Component = $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh];
$target = array('admin' => 'emailer');
$done = $this->buildDynamique($target, 'emailer', $component);
if ($done)
{
- // the text for the file ###BAKING###
- $this->fileContentDynamic['emailer_' . $component]['###BAKING###'] = ''; // <<-- to insure it gets updated
+ // the text for the file BAKING
+ $this->fileContentDynamic['emailer_' . $component][$this->hhh . 'BAKING' . $this->hhh] = ''; // <<-- to insure it gets updated
// return the code need to load the abstract class
return PHP_EOL . "JLoader::register('" . $Component . "Email', JPATH_COMPONENT_ADMINISTRATOR . '/helpers/" . $component . "email.php'); ";
}
@@ -233,23 +233,23 @@ class Interpretation extends Fields
{
if ($this->componentData->add_license && $this->componentData->license_type == 3)
{
- if (!isset($this->fileContentStatic['###HELPER_SITE_LICENSE_LOCK###']))
+ if (!isset($this->fileContentStatic[$this->hhh . 'HELPER_SITE_LICENSE_LOCK' . $this->hhh]))
{
$_VDM = '_' . ComponentbuilderHelper::safeString($this->uniquekey(10), 'U');
// add it to the system
- $this->fileContentStatic['###HELPER_SITE_LICENSE_LOCK###'] = $this->setHelperLicenseLock($_VDM, 'site');
- $this->fileContentStatic['###HELPER_LICENSE_LOCK###'] = $this->setHelperLicenseLock($_VDM, 'admin');
- $this->fileContentStatic['###LICENSE_LOCKED_INT###'] = $this->setInitLicenseLock($_VDM);
- $this->fileContentStatic['###LICENSE_LOCKED_DEFINED###'] = PHP_EOL . PHP_EOL . 'defined(\'' . $_VDM . '\') or die(JText:' . ':_(\'NIE_REG_NIE\'));';
+ $this->fileContentStatic[$this->hhh . 'HELPER_SITE_LICENSE_LOCK' . $this->hhh] = $this->setHelperLicenseLock($_VDM, 'site');
+ $this->fileContentStatic[$this->hhh . 'HELPER_LICENSE_LOCK' . $this->hhh] = $this->setHelperLicenseLock($_VDM, 'admin');
+ $this->fileContentStatic[$this->hhh . 'LICENSE_LOCKED_INT' . $this->hhh] = $this->setInitLicenseLock($_VDM);
+ $this->fileContentStatic[$this->hhh . 'LICENSE_LOCKED_DEFINED' . $this->hhh] = PHP_EOL . PHP_EOL . 'defined(\'' . $_VDM . '\') or die(JText:' . ':_(\'NIE_REG_NIE\'));';
}
}
else
{
// don't add it to the system
- $this->fileContentStatic['###HELPER_SITE_LICENSE_LOCK###'] = '';
- $this->fileContentStatic['###HELPER_LICENSE_LOCK###'] = '';
- $this->fileContentStatic['###LICENSE_LOCKED_INT###'] = '';
- $this->fileContentStatic['###LICENSE_LOCKED_DEFINED###'] = '';
+ $this->fileContentStatic[$this->hhh . 'HELPER_SITE_LICENSE_LOCK' . $this->hhh] = '';
+ $this->fileContentStatic[$this->hhh . 'HELPER_LICENSE_LOCK' . $this->hhh] = '';
+ $this->fileContentStatic[$this->hhh . 'LICENSE_LOCKED_INT' . $this->hhh] = '';
+ $this->fileContentStatic[$this->hhh . 'LICENSE_LOCKED_DEFINED' . $this->hhh] = '';
}
}
@@ -260,23 +260,23 @@ class Interpretation extends Fields
{
if ($this->componentData->add_license && $this->componentData->license_type == 3)
{
- if (!isset($this->fileContentDynamic[$view]['###BOOLMETHOD###']))
+ if (!isset($this->fileContentDynamic[$view][$this->hhh . 'BOOLMETHOD' . $this->hhh]))
{
$boolMethod = 'get' . ComponentbuilderHelper::safeString($this->uniquekey(3, false, 'ddd'), 'W');
$globalbool = 'set' . ComponentbuilderHelper::safeString($this->uniquekey(3), 'W');
// add it to the system
- $this->fileContentDynamic[$view]['###LICENSE_LOCKED_SET_BOOL###'] = $this->setBoolLicenseLock($boolMethod, $globalbool);
- $this->fileContentDynamic[$view]['###LICENSE_LOCKED_CHECK###'] = $this->checkStatmentLicenseLocked($boolMethod);
- $this->fileContentDynamic[$view]['###LICENSE_TABLE_LOCKED_CHECK###'] = $this->checkStatmentLicenseLocked($boolMethod, '$table');
- $this->fileContentDynamic[$view]['###BOOLMETHOD###'] = $boolMethod;
+ $this->fileContentDynamic[$view][$this->hhh . 'LICENSE_LOCKED_SET_BOOL' . $this->hhh] = $this->setBoolLicenseLock($boolMethod, $globalbool);
+ $this->fileContentDynamic[$view][$this->hhh . 'LICENSE_LOCKED_CHECK' . $this->hhh] = $this->checkStatmentLicenseLocked($boolMethod);
+ $this->fileContentDynamic[$view][$this->hhh . 'LICENSE_TABLE_LOCKED_CHECK' . $this->hhh] = $this->checkStatmentLicenseLocked($boolMethod, '$table');
+ $this->fileContentDynamic[$view][$this->hhh . 'BOOLMETHOD' . $this->hhh] = $boolMethod;
}
}
else
{
// don't add it to the system
- $this->fileContentDynamic[$view]['###LICENSE_LOCKED_SET_BOOL###'] = '';
- $this->fileContentDynamic[$view]['###LICENSE_LOCKED_CHECK###'] = '';
- $this->fileContentDynamic[$view]['###LICENSE_TABLE_LOCKED_CHECK###'] = '';
+ $this->fileContentDynamic[$view][$this->hhh . 'LICENSE_LOCKED_SET_BOOL' . $this->hhh] = '';
+ $this->fileContentDynamic[$view][$this->hhh . 'LICENSE_LOCKED_CHECK' . $this->hhh] = '';
+ $this->fileContentDynamic[$view][$this->hhh . 'LICENSE_TABLE_LOCKED_CHECK' . $this->hhh] = '';
}
}
@@ -309,12 +309,12 @@ class Interpretation extends Fields
$bool[] = "\t\t\treturn \$this->" . $globalbool . ";";
$bool[] = "\t\t}";
$bool[] = "\t\t//" . $this->setLine(__LINE__) . " Get the global params";
- $bool[] = "\t\t\$params = JComponentHelper::getParams('com_" . $this->fileContentStatic['###component###'] . "', true);";
+ $bool[] = "\t\t\$params = JComponentHelper::getParams('com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "', true);";
$bool[] = "\t\t\$license_key = \$params->get('license_key', null);";
$bool[] = "\t\tif (\$license_key)";
$bool[] = "\t\t{";
$bool[] = "\t\t\t//" . $this->setLine(__LINE__) . " load the file";
- $bool[] = "\t\t\tJLoader::import( 'vdm', JPATH_ADMINISTRATOR .'/components/com_" . $this->fileContentStatic['###component###'] . "');";
+ $bool[] = "\t\t\tJLoader::import( 'vdm', JPATH_ADMINISTRATOR .'/components/com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "');";
$bool[] = "\t\t\t\$the = new VDM(\$license_key);";
$bool[] = "\t\t\t\$this->" . $globalbool . " = \$the->_is;";
$bool[] = "\t\t\treturn \$this->" . $globalbool . ";";
@@ -333,12 +333,12 @@ class Interpretation extends Fields
$helper[] = "\tpublic static function isGenuine()";
$helper[] = "\t{";
$helper[] = "\t\t//" . $this->setLine(__LINE__) . " Get the global params";
- $helper[] = "\t\t\$params = JComponentHelper::getParams('com_" . $this->fileContentStatic['###component###'] . "', true);";
+ $helper[] = "\t\t\$params = JComponentHelper::getParams('com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "', true);";
$helper[] = "\t\t\$license_key = \$params->get('license_key', null);";
$helper[] = "\t\tif (\$license_key)";
$helper[] = "\t\t{";
$helper[] = "\t\t\t//" . $this->setLine(__LINE__) . " load the file";
- $helper[] = "\t\t\tJLoader::import( 'vdm', JPATH_ADMINISTRATOR .'/components/com_" . $this->fileContentStatic['###component###'] . "');";
+ $helper[] = "\t\t\tJLoader::import( 'vdm', JPATH_ADMINISTRATOR .'/components/com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "');";
$helper[] = "\t\t\t\$the = new VDM(\$license_key);";
$helper[] = "\t\t\treturn \$the->_is;";
$helper[] = "\t\t}";
@@ -352,7 +352,7 @@ class Interpretation extends Fields
{
$init[] = PHP_EOL . "if (!defined('" . $_VDM . "'))";
$init[] = "{";
- $init[] = "\t\$allow = " . $this->fileContentStatic['###Component###'] . "Helper::isGenuine();";
+ $init[] = "\t\$allow = " . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::isGenuine();";
$init[] = "\tif (\$allow)";
$init[] = "\t{";
$init[] = "\t\tdefine('" . $_VDM . "', 1);";
@@ -553,8 +553,8 @@ class Interpretation extends Fields
public function setGetCryptKey()
{
- // ###ENCRYPT_FILE###
- $this->fileContentStatic['###ENCRYPT_FILE###'] = '';
+ // ENCRYPT_FILE
+ $this->fileContentStatic[$this->hhh . 'ENCRYPT_FILE' . $this->hhh] = '';
if ((isset($this->basicEncryptionBuilder) && ComponentbuilderHelper::checkArray($this->basicEncryptionBuilder)) ||
(isset($this->mediumEncryptionBuilder) && ComponentbuilderHelper::checkArray($this->mediumEncryptionBuilder)) ||
(isset($this->whmcsEncryptionBuilder) && ComponentbuilderHelper::checkArray($this->whmcsEncryptionBuilder)) ||
@@ -565,13 +565,13 @@ class Interpretation extends Fields
// set whmcs encrypt file into place
$target = array('admin' => 'whmcs');
$done = $this->buildDynamique($target, 'whmcs');
- // the text for the file ###WHMCS_ENCRYPTION_BODY###
- $this->fileContentDynamic['whmcs']['###WHMCS_ENCRYPTION_BODY###'] = $this->setWHMCSCryption();
- // ###ENCRYPT_FILE###
- $this->fileContentStatic['###WHMCS_ENCRYPT_FILE###'] = PHP_EOL . "\t\t\twhmcs.php";
+ // the text for the file WHMCS_ENCRYPTION_BODY
+ $this->fileContentDynamic['whmcs'][$this->hhh . 'WHMCS_ENCRYPTION_BODY' . $this->hhh] = $this->setWHMCSCryption();
+ // ENCRYPT_FILE
+ $this->fileContentStatic[$this->hhh . 'WHMCS_ENCRYPT_FILE' . $this->hhh] = PHP_EOL . "\t\t\twhmcs.php";
}
// get component name
- $component = $this->fileContentStatic['###component###'];
+ $component = $this->fileContentStatic[$this->hhh . 'component' . $this->hhh];
// set the getCryptKey function to the helper class
$function = array();
// start building the getCryptKey function/class method
@@ -758,11 +758,11 @@ class Interpretation extends Fields
if ($this->componentData->add_update_server && $this->componentData->update_server_target != 3)
{
$updateXML[] = '';
- // ###UPDATE_SERVER_XML###
+ // UPDATE_SERVER_XML
$name = str_replace('.xml', '', substr($this->componentData->update_server_url, strrpos($this->componentData->update_server_url, '/') + 1));
$target = array('admin' => $name);
$this->buildDynamique($target, 'update_server');
- $this->fileContentDynamic[$name]['###UPDATE_SERVER_XML###'] = implode(PHP_EOL, $updateXML);
+ $this->fileContentDynamic[$name][$this->hhh . 'UPDATE_SERVER_XML' . $this->hhh] = implode(PHP_EOL, $updateXML);
// set the Update server file name
$this->updateServerFileName = $name;
@@ -771,20 +771,20 @@ class Interpretation extends Fields
// add the update server link to component XML
if ($this->componentData->add_update_server && isset($this->componentData->update_server_url) && ComponentbuilderHelper::checkString($this->componentData->update_server_url))
{
- // ###UPDATESERVER###
+ // UPDATESERVER
$updateServer = array();
$updateServer[] = PHP_EOL . "\t";
- $updateServer[] = "\t\t" . '' . $this->componentData->update_server_url . '';
+ $updateServer[] = "\t\t" . '' . $this->componentData->update_server_url . '';
$updateServer[] = "\t";
// return the array to string
$updateServer = implode(PHP_EOL, $updateServer);
// add update server details to component XML file
- $this->fileContentStatic['###UPDATESERVER###'] = $updateServer;
+ $this->fileContentStatic[$this->hhh . 'UPDATESERVER' . $this->hhh] = $updateServer;
}
else
{
// add update server details to component XML file
- $this->fileContentStatic['###UPDATESERVER###'] = '';
+ $this->fileContentStatic[$this->hhh . 'UPDATESERVER' . $this->hhh] = '';
}
// ensure to update Component version data
if (ComponentbuilderHelper::checkArray($this->updateSQLBuilder))
@@ -899,7 +899,7 @@ class Interpretation extends Fields
$name = ComponentbuilderHelper::safeString($update['version']);
$target = array('admin' => $name);
$this->buildDynamique($target, 'sql_update', $update['version']);
- $this->fileContentDynamic[$name . '_' . $update['version']]['###UPDATE_VERSION_MYSQL###'] = $update['mysql'];
+ $this->fileContentDynamic[$name . '_' . $update['version']][$this->hhh . 'UPDATE_VERSION_MYSQL' . $this->hhh] = $update['mysql'];
}
elseif (isset($update['url']) && ComponentbuilderHelper::checkString($update['url']))
{
@@ -910,12 +910,12 @@ class Interpretation extends Fields
{
// build update xml
$updateXML[] = "\t";
- $updateXML[] = "\t\t" . $this->fileContentStatic['###Component_name###'] . "";
- $updateXML[] = "\t\t" . $this->fileContentStatic['###SHORT_DESCRIPTION###'] . "";
- $updateXML[] = "\t\tcom_" . $this->fileContentStatic['###component###'] . "";
+ $updateXML[] = "\t\t" . $this->fileContentStatic[$this->hhh . 'Component_name' . $this->hhh] . "";
+ $updateXML[] = "\t\t" . $this->fileContentStatic[$this->hhh . 'SHORT_DESCRIPTION' . $this->hhh] . "";
+ $updateXML[] = "\t\tcom_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "";
$updateXML[] = "\t\tcomponent";
$updateXML[] = "\t\t" . $update['version'] . "";
- $updateXML[] = "\t\t" . '' . $this->fileContentStatic['###AUTHORWEBSITE###'] . '';
+ $updateXML[] = "\t\t" . '' . $this->fileContentStatic[$this->hhh . 'AUTHORWEBSITE' . $this->hhh] . '';
$updateXML[] = "\t\t";
if (!isset($update['url']) || !ComponentbuilderHelper::checkString($update['url']))
{
@@ -926,8 +926,8 @@ class Interpretation extends Fields
$updateXML[] = "\t\t";
$updateXML[] = "\t\t\tstable";
$updateXML[] = "\t\t";
- $updateXML[] = "\t\t" . $this->fileContentStatic['###AUTHOR###'] . "";
- $updateXML[] = "\t\t" . $this->fileContentStatic['###AUTHORWEBSITE###'] . "";
+ $updateXML[] = "\t\t" . $this->fileContentStatic[$this->hhh . 'AUTHOR' . $this->hhh] . "";
+ $updateXML[] = "\t\t" . $this->fileContentStatic[$this->hhh . 'AUTHORWEBSITE' . $this->hhh] . "";
$updateXML[] = "\t\t" . '';
$updateXML[] = "\t";
}
@@ -959,12 +959,12 @@ class Interpretation extends Fields
$sitedone = $this->buildDynamique($target, 'help');
if ($admindone && $sitedone)
{
- // ###HELP###
- $this->fileContentStatic['###HELP###'] = $this->setHelp(1);
- // ###HELP_SITE###
- $this->fileContentStatic['###HELP_SITE###'] = $this->setHelp(2);
+ // HELP
+ $this->fileContentStatic[$this->hhh . 'HELP' . $this->hhh] = $this->setHelp(1);
+ // HELP_SITE
+ $this->fileContentStatic[$this->hhh . 'HELP_SITE' . $this->hhh] = $this->setHelp(2);
// to make sure the file is updated TODO
- $this->fileContentDynamic['help']['###BLABLA###'] = 'blabla';
+ $this->fileContentDynamic['help'][$this->hhh . 'BLABLA' . $this->hhh] = 'blabla';
return true;
}
}
@@ -990,7 +990,7 @@ class Interpretation extends Fields
$help[] = "\t\t\$db = JFactory::getDbo();";
$help[] = "\t\t\$query = \$db->getQuery(true);";
$help[] = "\t\t\$query->select(array('a.id','a.groups','a.target','a.type','a.article','a.url'));";
- $help[] = "\t\t\$query->from('#__" . $this->fileContentStatic['###component###'] . "_help_document AS a');";
+ $help[] = "\t\t\$query->from('#__" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "_help_document AS a');";
$help[] = "\t\t\$query->where('a." . $target . " = '.\$db->quote(\$view));";
$help[] = "\t\t\$query->where('a.location = " . (int) $location . "');";
$help[] = "\t\t\$query->where('a.published = 1');";
@@ -1047,7 +1047,7 @@ class Interpretation extends Fields
$help[] = "\tprotected static function loadHelpTextLink(\$id)";
$help[] = "\t{";
$help[] = "\t\t\$token = JSession::getFormToken();";
- $help[] = "\t\treturn 'index.php?option=com_" . $this->fileContentStatic['###component###'] . "&task=help.getText&id=' . (int) \$id . '&token=' . \$token;";
+ $help[] = "\t\treturn 'index.php?option=com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "&task=help.getText&id=' . (int) \$id . '&token=' . \$token;";
$help[] = "\t}";
// return the help methods
return implode(PHP_EOL, $help);
@@ -1061,7 +1061,7 @@ class Interpretation extends Fields
$exel[] = PHP_EOL . PHP_EOL . "\t/**";
$exel[] = "\t * Prepares the xml document";
$exel[] = "\t */";
- $exel[] = "\tpublic static function xls(\$rows,\$fileName = null,\$title = null,\$subjectTab = null,\$creator = '" . $this->fileContentStatic['###COMPANYNAME###'] . "',\$description = null,\$category = null,\$keywords = null,\$modified = null)";
+ $exel[] = "\tpublic static function xls(\$rows,\$fileName = null,\$title = null,\$subjectTab = null,\$creator = '" . $this->fileContentStatic[$this->hhh . 'COMPANYNAME' . $this->hhh] . "',\$description = null,\$category = null,\$keywords = null,\$modified = null)";
$exel[] = "\t{";
$exel[] = "\t\t//" . $this->setLine(__LINE__) . " set the user";
$exel[] = "\t\t\$user = JFactory::getUser();";
@@ -1095,7 +1095,7 @@ class Interpretation extends Fields
$exel[] = "\t\t";
$exel[] = "\t\t//" . $this->setLine(__LINE__) . " Set document properties";
$exel[] = "\t\t\$objPHPExcel->getProperties()->setCreator(\$creator)";
- $exel[] = "\t\t\t\t\t\t\t\t\t ->setCompany('" . $this->fileContentStatic['###COMPANYNAME###'] . "')";
+ $exel[] = "\t\t\t\t\t\t\t\t\t ->setCompany('" . $this->fileContentStatic[$this->hhh . 'COMPANYNAME' . $this->hhh] . "')";
$exel[] = "\t\t\t\t\t\t\t\t\t ->setLastModifiedBy(\$modified)";
$exel[] = "\t\t\t\t\t\t\t\t\t ->setTitle(\$title)";
$exel[] = "\t\t\t\t\t\t\t\t\t ->setSubject(\$subjectTab);";
@@ -1391,7 +1391,7 @@ class Interpretation extends Fields
if ($done)
{
// set the lang
- $lang = ComponentbuilderHelper::safeString('com_' . $this->fileContentStatic['###component###'] . '_menu_' . $view['settings']->code, 'U');
+ $lang = ComponentbuilderHelper::safeString('com_' . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . '_menu_' . $view['settings']->code, 'U');
$this->langContent['adminsys'][$lang . '_TITLE'] = $view['settings']->name;
$this->langContent['adminsys'][$lang . '_OPTION'] = $view['settings']->name;
$this->langContent['adminsys'][$lang . '_DESC'] = $view['settings']->description;
@@ -1408,8 +1408,8 @@ class Interpretation extends Fields
$xml .= PHP_EOL . "\t" . '';
$xml .= PHP_EOL . "\t" . '';
$xml .= PHP_EOL . "\t\t" . '