The
- category field in (%s) admin view has a mismatching target view.
-
To correct the mismatch, the extension value %s in the
- field must be changed to %s
- for
- best category integration with Joomla.
-
Please watch
- this tutorial before proceeding!!!,
- code fix
pagination->getPagesCounter(); ?> pagination->getLimitBox(); ?>
'; } elseif (!$has_limitbox) { - $body[] = $this->_t(3) + $body[] = Indent::_(3) . 'pagination->getLimitBox(); ?>
'; } elseif (!$has_pagescounter) { - $body[] = $this->_t(3) + $body[] = Indent::_(3) . 'pagination->getPagesCounter(); ?>
'; } // add pagination end if (!$has_pagination_end) { - $body[] = $this->placeholders[$this->bbb . 'PAGINATIONEND' - . $this->ddd]; + $body[] = CFactory::_('Placeholder')->get_('PAGINATIONEND'); } + // lets clear the placeholders just in case - unset( - $this->placeholders[$this->bbb . 'LIMITBOX' . $this->ddd] - ); - unset( - $this->placeholders[$this->bbb . 'PAGESCOUNTER' - . $this->ddd] - ); - unset( - $this->placeholders[$this->bbb . 'PAGESLINKS' . $this->ddd] - ); - unset( - $this->placeholders[$this->bbb . 'PAGINATIONSTART' - . $this->ddd] - ); - unset( - $this->placeholders[$this->bbb . 'PAGINATIONEND' - . $this->ddd] - ); + CFactory::_('Placeholder')->remove_('LIMITBOX'); + CFactory::_('Placeholder')->remove_('PAGESCOUNTER'); + CFactory::_('Placeholder')->remove_('PAGESLINKS'); + CFactory::_('Placeholder')->remove_('PAGINATIONSTART'); + CFactory::_('Placeholder')->remove_('PAGINATIONEND'); + // insure the form is added (only if no form exist) - if (strpos($view['settings']->default, '';
+ var_dump($view['settings']->tabs, $linkedView);
+ exit;
+ }
// get the tab name
$tabName = $view['settings']->tabs[(int) $linkedView['tab']];
// update the tab counter
- $this->tabCounter[$nameSingleCode][$linkedView['tab']]
- = $tabName;
+ CFactory::_('Compiler.Builder.Tab.Counter')->set($nameSingleCode . '.' . $linkedView['tab'], $tabName);
// add the linked view
$linkedTab[$linkedView['adminview']] = $linkedView['tab'];
// set the keys if values are set
@@ -12905,12 +12086,12 @@ class Interpretation extends Fields
{
$keys[$linkedView['adminview']]
= array('key' => $linkedView['key'],
- 'parentKey' => $linkedView['parentkey']);
+ 'parentKey' => $linkedView['parentkey']);
}
else
{
$keys[$linkedView['adminview']] = array('key' => null,
- 'parentKey' => null);
+ 'parentKey' => null);
}
// set the button switches
if (isset($linkedView['addnew']))
@@ -12955,9 +12136,10 @@ class Interpretation extends Fields
// start tabs
$tabs = array();
// sort the tabs based on key order
- ksort($this->tabCounter[$nameSingleCode]);
+ $tab_counter = (array) CFactory::_('Compiler.Builder.Tab.Counter')->get($nameSingleCode, []);
+ ksort($tab_counter);
// start tab building loop
- foreach ($this->tabCounter[$nameSingleCode] as $tabNr => $tabName)
+ foreach ($tab_counter as $tabNr => $tabName)
{
$tabWidth = 12;
$lrCounter = 0;
@@ -12970,7 +12152,7 @@ class Interpretation extends Fields
/// set the values to use in search latter
$searchTabs[$tabCodeName] = $tabNr;
// add to lang array
- $this->setLangContent($this->lang, $tabLangName, $tabName);
+ CFactory::_('Language')->set(CFactory::_('Config')->lang_target, $tabLangName, $tabName);
// check if linked view belongs to this tab
$buildLayout = true;
$linkedViewId = '';
@@ -12984,10 +12166,10 @@ class Interpretation extends Fields
}
}
// build layout these are actual fields
- if ($buildLayout)
+ if ($buildLayout && CFactory::_('Compiler.Builder.Layout')->exists($nameSingleCode . '.' . $tabName))
{
// sort to make sure it loads left first
- $alignments = $this->layoutBuilder[$nameSingleCode][$tabName];
+ $alignments = CFactory::_('Compiler.Builder.Layout')->get($nameSingleCode . '.' . $tabName);
ksort($alignments);
foreach ($alignments as $alignment => $names)
{
@@ -12998,6 +12180,7 @@ class Interpretation extends Fields
$items = '';
$itemCounter = 0;
// sort the names based on order of keys
+ $names = (array) $names;
ksort($names);
// build the items array for this alignment
foreach ($names as $nr => $name)
@@ -13008,7 +12191,7 @@ class Interpretation extends Fields
}
else
{
- $items .= "," . PHP_EOL . $this->_t(1) . "'" . $name
+ $items .= "," . PHP_EOL . Indent::_(1) . "'" . $name
. "'";
}
$itemCounter++;
@@ -13060,7 +12243,7 @@ class Interpretation extends Fields
'layouttitle'
);
// load to header
- $header .= PHP_EOL . $this->_t(1)
+ $header .= PHP_EOL . Indent::_(1)
. "";
@@ -13086,7 +12269,7 @@ class Interpretation extends Fields
'layoutitems'
);
// load the body
- $leftside .= PHP_EOL . $this->_t(1)
+ $leftside .= PHP_EOL . Indent::_(1)
. "";
@@ -13099,7 +12282,7 @@ class Interpretation extends Fields
'layoutitems'
);
// load the body
- $rightside .= PHP_EOL . $this->_t(1)
+ $rightside .= PHP_EOL . Indent::_(1)
. "";
@@ -13181,9 +12364,9 @@ class Interpretation extends Fields
{
case 1: // left
case 2: // right
- $main .= PHP_EOL . $this->_t(3) . '';
- $main .= PHP_EOL . $this->_t(4) . $string;
- $main .= PHP_EOL . $this->_t(3) . '';
+ $main .= PHP_EOL . Indent::_(3) . '';
+ $main .= PHP_EOL . Indent::_(4) . $string;
+ $main .= PHP_EOL . Indent::_(3) . '';
break;
}
}
@@ -13193,20 +12376,20 @@ class Interpretation extends Fields
{
case 1: // left
case 2: // right
- $main .= PHP_EOL . $this->_t(3)
+ $main .= PHP_EOL . Indent::_(3)
. '';
- $main .= PHP_EOL . $this->_t(4) . $string;
- $main .= PHP_EOL . $this->_t(3) . '';
+ $main .= PHP_EOL . Indent::_(4) . $string;
+ $main .= PHP_EOL . Indent::_(3) . '';
break;
}
}
switch ($position)
{
case 3: // fullwidth
- $mainbottom .= PHP_EOL . $this->_t(3)
+ $mainbottom .= PHP_EOL . Indent::_(3)
. '';
- $mainbottom .= PHP_EOL . $this->_t(4) . $string;
- $mainbottom .= PHP_EOL . $this->_t(3) . '';
+ $mainbottom .= PHP_EOL . Indent::_(4) . $string;
+ $mainbottom .= PHP_EOL . Indent::_(3) . '';
break;
}
}
@@ -13229,18 +12412,16 @@ class Interpretation extends Fields
// set default publishing tab lang
$tabLangName = $langView . '_PUBLISHING';
// add to lang array
- $this->setLangContent($this->lang, $tabLangName, 'Publishing');
+ CFactory::_('Language')->set(CFactory::_('Config')->lang_target, $tabLangName, 'Publishing');
// the default publishing items
$items = array('left' => array(), 'right' => array());
// Setup the default (custom) fields
// only load (1 => 'left', 2 => 'right')
$fieldsAddedRight = false;
- if (isset($this->newPublishingFields[$nameSingleCode]))
+ if (CFactory::_('Compiler.Builder.New.Publishing.Fields')->exists($nameSingleCode))
{
- foreach (
- $this->newPublishingFields[$nameSingleCode] as $df_alignment
- => $df_items
- )
+ $new_published_fields = CFactory::_('Compiler.Builder.New.Publishing.Fields')->get($nameSingleCode);
+ foreach ($new_published_fields as $df_alignment => $df_items)
{
foreach ($df_items as $df_order => $df_name)
{
@@ -13282,17 +12463,14 @@ class Interpretation extends Fields
{
foreach ($defaultFields as $defaultField)
{
- if (!isset($this->movedPublishingFields[$nameSingleCode][$defaultField]))
+ if (!CFactory::_('Compiler.Builder.Moved.Publishing.Fields')->exists($nameSingleCode . '.' . $defaultField))
{
if ($defaultField != 'access')
{
$items[$d_alignment][] = $defaultField;
}
elseif ($defaultField === 'access'
- && isset($this->accessBuilder[$nameSingleCode])
- && StringHelper::check(
- $this->accessBuilder[$nameSingleCode]
- ))
+ && CFactory::_('Compiler.Builder.Access.Switch')->exists($nameSingleCode))
{
$items[$d_alignment][] = $defaultField;
}
@@ -13300,10 +12478,7 @@ class Interpretation extends Fields
}
}
// check if metadata is added to this view
- if (isset($this->metadataBuilder[$nameSingleCode])
- && StringHelper::check(
- $this->metadataBuilder[$nameSingleCode]
- ))
+ if (CFactory::_('Compiler.Builder.Meta.Data')->exists($nameSingleCode))
{
// set default publishing tab code name
$tabCodeNameLeft = 'publishing';
@@ -13317,7 +12492,7 @@ class Interpretation extends Fields
if (ArrayHelper::check($items['left']))
{
$items_one .= "'" . implode(
- "'," . PHP_EOL . $this->_t(1) . "'", $items['left']
+ "'," . PHP_EOL . Indent::_(1) . "'", $items['left']
) . "'";
}
if (ArrayHelper::check($items['right']))
@@ -13325,9 +12500,9 @@ class Interpretation extends Fields
// there is already fields just add these
if (strlen($items_one) > 3)
{
- $items_one .= "," . PHP_EOL . $this->_t(1) . "'"
+ $items_one .= "," . PHP_EOL . Indent::_(1) . "'"
. implode(
- "'," . PHP_EOL . $this->_t(1) . "'",
+ "'," . PHP_EOL . Indent::_(1) . "'",
$items['right']
) . "'";
}
@@ -13335,7 +12510,7 @@ class Interpretation extends Fields
else
{
$items_one .= "'" . implode(
- "'," . PHP_EOL . $this->_t(1) . "'",
+ "'," . PHP_EOL . Indent::_(1) . "'",
$items['right']
) . "'";
}
@@ -13384,7 +12559,7 @@ class Interpretation extends Fields
{
// load all items
$items_one = "'" . implode(
- "'," . PHP_EOL . $this->_t(1) . "'", $items['left']
+ "'," . PHP_EOL . Indent::_(1) . "'", $items['left']
) . "'";
// set the publishing layout
$this->setLayout(
@@ -13398,7 +12573,7 @@ class Interpretation extends Fields
{
// load all items
$items_two = "'" . implode(
- "'," . PHP_EOL . $this->_t(1) . "'", $items['right']
+ "'," . PHP_EOL . Indent::_(1) . "'", $items['right']
) . "'";
// set the publishing layout
$this->setLayout(
@@ -13422,13 +12597,6 @@ class Interpretation extends Fields
{
$classs = "span12";
}
- // setup correct core target
- $coreLoad = false;
- if (isset($this->permissionCore[$nameSingleCode]))
- {
- $core = $this->permissionCore[$nameSingleCode];
- $coreLoad = true;
- }
// only load this if needed
if ($items_one || $items_two)
{
@@ -13439,53 +12607,17 @@ class Interpretation extends Fields
'core.edit.state');
foreach ($allToBeChekcedOR as $core_permission)
{
- if ($coreLoad && isset($core[$core_permission])
- && isset($this->permissionBuilder['global'][$core[$core_permission]])
- && ArrayHelper::check(
- $this->permissionBuilder['global'][$core[$core_permission]]
- )
- && in_array(
- $nameSingleCode,
- $this->permissionBuilder['global'][$core[$core_permission]]
- ))
- {
- // set permissions.
- $publishingPerOR[] = "\$this->canDo->get('"
- . $core[$core_permission] . "')";
- }
- else
- {
- // set permissions.
- $publishingPerOR[] = "\$this->canDo->get('"
- . $core_permission
- . "')";
- }
+ // set permissions.
+ $publishingPerOR[] = "\$this->canDo->get('"
+ . CFactory::_('Compiler.Creator.Permission')->getGlobal($nameSingleCode, $core_permission) . "')";
}
$publishingPerAND = array();
$allToBeChekcedAND = array('core.delete', 'core.edit.state');
foreach ($allToBeChekcedAND as $core_permission)
{
- if ($coreLoad && isset($core[$core_permission])
- && isset($this->permissionBuilder['global'][$core[$core_permission]])
- && ArrayHelper::check(
- $this->permissionBuilder['global'][$core[$core_permission]]
- )
- && in_array(
- $nameSingleCode,
- $this->permissionBuilder['global'][$core[$core_permission]]
- ))
- {
- // set permissions.
- $publishingPerAND[] = "\$this->canDo->get('"
- . $core[$core_permission] . "')";
- }
- else
- {
- // set permissions.
- $publishingPerAND[] = "\$this->canDo->get('"
- . $core_permission
- . "')";
- }
+ // set permissions.
+ $publishingPerAND[] = "\$this->canDo->get('"
+ . CFactory::_('Compiler.Creator.Permission')->getGlobal($nameSingleCode, $core_permission) . "')";
}
// check if custom tab must be added
if (($_customTabHTML = $this->addCustomTabs(
@@ -13497,38 +12629,38 @@ class Interpretation extends Fields
// add the AND values to OR
$publishingPerOR[] = '(' . implode(' && ', $publishingPerAND) . ')';
// now build the complete showhide behaviour for the publishing area
- $tabs .= PHP_EOL . PHP_EOL . $this->_t(1) . "";
// set the default publishing tab
- $tabs .= PHP_EOL . $this->_t(1)
+ $tabs .= PHP_EOL . Indent::_(1)
. "";
- $tabs .= PHP_EOL . $this->_t(2)
+ $tabs .= PHP_EOL . Indent::_(2)
. '';
if ($items_one)
{
- $tabs .= PHP_EOL . $this->_t(3) . '';
- $tabs .= PHP_EOL . $this->_t(4)
+ $tabs .= PHP_EOL . Indent::_(4)
. "";
- $tabs .= PHP_EOL . $this->_t(3) . "";
+ $tabs .= PHP_EOL . Indent::_(3) . "";
}
if ($items_two)
{
- $tabs .= PHP_EOL . $this->_t(3) . '';
- $tabs .= PHP_EOL . $this->_t(4)
+ $tabs .= PHP_EOL . Indent::_(4)
. "";
- $tabs .= PHP_EOL . $this->_t(3) . "";
+ $tabs .= PHP_EOL . Indent::_(3) . "";
}
- $tabs .= PHP_EOL . $this->_t(2) . "";
- $tabs .= PHP_EOL . $this->_t(1)
+ $tabs .= PHP_EOL . Indent::_(2) . "";
+ $tabs .= PHP_EOL . Indent::_(1)
. "";
- $tabs .= PHP_EOL . $this->_t(1) . "";
+ $tabs .= PHP_EOL . Indent::_(1) . "";
// check if custom tab must be added
if (($_customTabHTML = $this->addCustomTabs(
15, $nameSingleCode, 2
@@ -13538,44 +12670,43 @@ class Interpretation extends Fields
}
}
- // make sure we dont load it to a view with the name component (as this will cause conflict with Joomla conventions)
+ // make sure we don't load it to a view with the name component (as this will cause conflict with Joomla conventions)
if ($nameSingleCode != 'component'
- && isset($this->hasPermissions[$nameSingleCode])
- && $this->hasPermissions[$nameSingleCode])
+ && CFactory::_('Compiler.Builder.Has.Permissions')->exists($nameSingleCode))
{
// set permissions tab lang
$tabLangName = $langView . '_PERMISSION';
// set permissions tab code name
$tabCodeName = 'permissions';
// add to lang array
- $this->setLangContent($this->lang, $tabLangName, 'Permissions');
+ CFactory::_('Language')->set(CFactory::_('Config')->lang_target, $tabLangName, 'Permissions');
// set the permissions tab
- $tabs .= PHP_EOL . PHP_EOL . $this->_t(1)
+ $tabs .= PHP_EOL . PHP_EOL . Indent::_(1)
. "canDo->get('core.admin')) : ?>";
- $tabs .= PHP_EOL . $this->_t(1)
+ $tabs .= PHP_EOL . Indent::_(1)
. "";
- $tabs .= PHP_EOL . $this->_t(2)
+ $tabs .= PHP_EOL . Indent::_(2)
. '';
- $tabs .= PHP_EOL . $this->_t(3) . '';
- $tabs .= PHP_EOL . $this->_t(4) . '";
+ $tabs .= PHP_EOL . Indent::_(4) . "";
+ $tabs .= PHP_EOL . Indent::_(3) . "";
+ $tabs .= PHP_EOL . Indent::_(2) . "";
+ $tabs .= PHP_EOL . Indent::_(1)
. "";
- $tabs .= PHP_EOL . $this->_t(1) . "";
+ $tabs .= PHP_EOL . Indent::_(1) . "";
}
return $tabs;
@@ -13584,13 +12715,11 @@ class Interpretation extends Fields
protected function addCustomTabs($nr, $name_single, $target)
{
// check if this view is having custom tabs
- if (isset($this->customTabs[$name_single])
- && ArrayHelper::check(
- $this->customTabs[$name_single]
- ))
+ if (($tabs = CFactory::_('Compiler.Builder.Custom.Tabs')->get($name_single)) !== null
+ && ArrayHelper::check($tabs))
{
- $html = array();
- foreach ($this->customTabs[$name_single] as $customTab)
+ $html = [];
+ foreach ($tabs as $customTab)
{
if (ArrayHelper::check($customTab)
&& isset($customTab['html']))
@@ -13623,42 +12752,42 @@ class Interpretation extends Fields
{
// set view name
$fadein[] = "";
- $fadein[] = "componentCodeName
+ $fadein[] = "component_code_name
. "_loader\" style=\"display: none;\">";
return implode(PHP_EOL, $fadein);
}
- return "componentCodeName . "_loader\">";
+ return "component_code_name . "_loader\">";
}
/**
@@ -13674,26 +12803,22 @@ class Interpretation extends Fields
{
// first build the layout file
$target = array('admin' => $nameSingleCode);
- $this->buildDynamique($target, $type, $layoutName);
+ CFactory::_('Utilities.Structure')->build($target, $type, $layoutName);
// add to front if needed
- if ($this->lang === 'both')
+ if (CFactory::_('Config')->lang_target === 'both')
{
$target = array('site' => $nameSingleCode);
- $this->buildDynamique($target, $type, $layoutName);
+ CFactory::_('Utilities.Structure')->build($target, $type, $layoutName);
}
if (StringHelper::check($items))
{
// LAYOUTITEMS <<>>
- $this->fileContentDynamic[$nameSingleCode . '_'
- . $layoutName][$this->hhh . 'LAYOUTITEMS' . $this->hhh]
- = $items;
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '_' . $layoutName . '|LAYOUTITEMS', $items);
}
else
{
// LAYOUTITEMS <<>>
- $this->fileContentDynamic[$nameSingleCode . '_'
- . $layoutName][$this->hhh . 'bogus' . $this->hhh]
- = 'boom';
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '_' . $layoutName . '|bogus', 'boom');
}
}
}
@@ -13708,16 +12833,16 @@ class Interpretation extends Fields
protected function setLayoutOverride($nameSingleCode, $layoutName, $items)
{
if (($data = $this->getLayoutOverride($nameSingleCode, $layoutName))
- !== false)
+ !== null)
{
// first build the layout file
$target = array('admin' => $nameSingleCode);
- $this->buildDynamique($target, 'layoutoverride', $layoutName);
+ CFactory::_('Utilities.Structure')->build($target, 'layoutoverride', $layoutName);
// add to front if needed
- if ($this->lang === 'both')
+ if (CFactory::_('Config')->lang_target === 'both')
{
$target = array('site' => $nameSingleCode);
- $this->buildDynamique($target, 'layoutoverride', $layoutName);
+ CFactory::_('Utilities.Structure')->build($target, 'layoutoverride', $layoutName);
}
// make sure items is an empty string (should not be needed.. but)
if (!StringHelper::check($items))
@@ -13725,42 +12850,36 @@ class Interpretation extends Fields
$items = '';
}
// set placeholder
- $placeholder = $this->placeholders;
- $placeholder[$this->hhh . 'LAYOUTITEMS' . $this->hhh] = $items;
+ $placeholder = CFactory::_('Placeholder')->active;
+ $placeholder[Placefix::_h('LAYOUTITEMS')] = $items;
// OVERRIDE_LAYOUT_CODE <<>>
- $php_view = (array) explode(PHP_EOL, $data['php_view']);
+ $php_view = (array) explode(PHP_EOL, (string) $data['php_view'] ?? '');
if (ArrayHelper::check($php_view))
{
$php_view = PHP_EOL . PHP_EOL . implode(PHP_EOL, $php_view);
- $this->fileContentDynamic[$nameSingleCode . '_'
- . $layoutName][$this->hhh
- . 'OVERRIDE_LAYOUT_CODE' . $this->hhh]
- = $this->setPlaceholders(
- $php_view, $placeholder
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '_' . $layoutName . '|OVERRIDE_LAYOUT_CODE',
+ CFactory::_('Placeholder')->update(
+ $php_view, $placeholder
+ )
);
}
else
{
- $this->fileContentDynamic[$nameSingleCode . '_'
- . $layoutName][$this->hhh
- . 'OVERRIDE_LAYOUT_CODE' . $this->hhh]
- = '';
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '_' . $layoutName . '|OVERRIDE_LAYOUT_CODE', '');
}
// OVERRIDE_LAYOUT_BODY <<>>
- $this->fileContentDynamic[$nameSingleCode . '_'
- . $layoutName][$this->hhh
- . 'OVERRIDE_LAYOUT_BODY' . $this->hhh]
- = PHP_EOL . $this->setPlaceholders(
- $data['html'], $placeholder
- );
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '_' . $layoutName . '|OVERRIDE_LAYOUT_BODY',
+ PHP_EOL . CFactory::_('Placeholder')->update(
+ $data['html'] ?? '', $placeholder
+ )
+ );
// OVERRIDE_LAYOUT_HEADER <<>>
- $this->fileContentDynamic[$nameSingleCode . '_'
- . $layoutName][$this->hhh
- . 'OVERRIDE_LAYOUT_HEADER' . $this->hhh]
- = (($header = $this->setFileHeader(
- 'override.layout',
- $layoutName, false)
- ) !== false) ? PHP_EOL . PHP_EOL . $header : '';
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '_' . $layoutName . '|OVERRIDE_LAYOUT_HEADER',
+ (($header = $this->setFileHeader(
+ 'override.layout',
+ $layoutName, false)
+ ) !== false) ? PHP_EOL . PHP_EOL . $header : ''
+ );
// since override was found
return true;
@@ -13773,69 +12892,26 @@ class Interpretation extends Fields
* @param string $nameSingleCode
* @param string $layoutName
*
- * @return array the layout data
+ * @return array|null the layout data
*/
- protected function getLayoutOverride($nameSingleCode, $layoutName)
+ protected function getLayoutOverride($nameSingleCode, $layoutName): ?array
{
+ $get_key = null;
// check if there is an override by component name, view name, & layout name
if ($this->setTemplateAndLayoutData(
'override', $nameSingleCode, false, array(''),
- array($this->componentCodeName . $nameSingleCode . $layoutName)
+ array(CFactory::_('Config')->component_code_name . $nameSingleCode . $layoutName)
))
{
- $data = $this->layoutData[$this->target][$this->componentCodeName
- . $nameSingleCode . $layoutName];
- // remove since we will add the layout now
- if ($this->lang === 'both')
- {
- unset(
- $this->layoutData['admin'][$this->componentCodeName
- . $nameSingleCode . $layoutName]
- );
- unset(
- $this->layoutData['site'][$this->componentCodeName
- . $nameSingleCode . $layoutName]
- );
- }
- else
- {
- unset(
- $this->layoutData[$this->target][$this->componentCodeName
- . $nameSingleCode . $layoutName]
- );
- }
-
- return $data;
+ $get_key = CFactory::_('Config')->component_code_name . $nameSingleCode . $layoutName;
}
// check if there is an override by component name & layout name
elseif ($this->setTemplateAndLayoutData(
'override', $nameSingleCode, false, array(''),
- array($this->componentCodeName . $layoutName)
+ array(CFactory::_('Config')->component_code_name . $layoutName)
))
{
- $data = $this->layoutData[$this->target][$this->componentCodeName
- . $layoutName];
- // remove since we will add the layout now
- if ($this->lang === 'both')
- {
- unset(
- $this->layoutData['admin'][$this->componentCodeName
- . $layoutName]
- );
- unset(
- $this->layoutData['site'][$this->componentCodeName
- . $layoutName]
- );
- }
- else
- {
- unset(
- $this->layoutData[$this->target][$this->componentCodeName
- . $layoutName]
- );
- }
-
- return $data;
+ $get_key = CFactory::_('Config')->component_code_name . $layoutName;
}
// check if there is an override by view & layout name
elseif ($this->setTemplateAndLayoutData(
@@ -13843,22 +12919,7 @@ class Interpretation extends Fields
array($nameSingleCode . $layoutName)
))
{
- $data = $this->layoutData[$this->target][$nameSingleCode
- . $layoutName];
- // remove since we will add the layout now
- if ($this->lang === 'both')
- {
- unset(
- $this->layoutData['admin'][$nameSingleCode . $layoutName]
- );
- unset($this->layoutData['site'][$nameSingleCode . $layoutName]);
- }
- else
- {
- unset($this->layoutData[$this->target][$layoutName]);
- }
-
- return $data;
+ $get_key = $nameSingleCode . $layoutName;
}
// check if there is an override by layout name (global layout)
elseif ($this->setTemplateAndLayoutData(
@@ -13866,22 +12927,46 @@ class Interpretation extends Fields
array($layoutName)
))
{
- $data = $this->layoutData[$this->target][$layoutName];
- // remove since we will add the layout now
- if ($this->lang === 'both')
+ $get_key = $layoutName;
+ }
+
+ // check if we have a get key
+ if ($get_key)
+ {
+ $data = CFactory::_('Compiler.Builder.Layout.Data')->
+ get(CFactory::_('Config')->build_target . '.' . $get_key);
+
+ if ($data === null)
{
- unset($this->layoutData['admin'][$layoutName]);
- unset($this->layoutData['site'][$layoutName]);
+ var_dump(CFactory::_('Config')->build_target . '.' . $get_key);
+ var_dump('admin.' .$get_key);
+ var_dump(CFactory::_('Compiler.Builder.Layout.Data')->get('admin.' .$get_key));
+ var_dump('site.' .$get_key);
+ var_dump(CFactory::_('Compiler.Builder.Layout.Data')->get('site.' . $get_key));
+ var_dump('both.' .$get_key);
+ var_dump(CFactory::_('Compiler.Builder.Layout.Data')->get('both.' . $get_key));
+ exit;
+ }
+ // remove since we will add the layout now
+ if (CFactory::_('Config')->lang_target === 'both')
+ {
+ CFactory::_('Compiler.Builder.Layout.Data')->
+ remove('admin.' . $get_key);
+ CFactory::_('Compiler.Builder.Layout.Data')->
+ remove('site.' . $get_key);
+ CFactory::_('Compiler.Builder.Layout.Data')->
+ remove('both.' . $get_key);
}
else
{
- unset($this->layoutData[$this->target][$layoutName]);
+ CFactory::_('Compiler.Builder.Layout.Data')->
+ remove(CFactory::_('Config')->build_target . '.' . $get_key);
}
return $data;
}
- return false;
+ return null;
}
/**
@@ -13901,7 +12986,7 @@ class Interpretation extends Fields
extract($args, EXTR_PREFIX_SAME, "oops");
$single = '';
$name_list_code = '';
- foreach ($this->componentData->admin_views as $array)
+ foreach (CFactory::_('Component')->get('admin_views') as $array)
{
if ($array['adminview'] == $viewId)
{
@@ -13922,48 +13007,47 @@ class Interpretation extends Fields
);
$functionName = StringHelper::safe($codeName, 'F');
// LAYOUTITEMSTABLE <<>>
- $this->fileContentDynamic[$nameSingleCode . '_'
- . $layoutCodeName][$this->hhh . 'LAYOUTITEMSTABLE' . $this->hhh]
- = $head . $body;
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '_' . $layoutCodeName . '|LAYOUTITEMSTABLE',
+ $head . $body
+ );
// LAYOUTITEMSHEADER <<>>
- $headerscript = '//' . $this->setLine(__LINE__)
+ $headerscript = '//' . Line::_(__Line__, __Class__)
. ' set the edit URL';
$headerscript .= PHP_EOL . '$edit = "index.php?option=com_'
- . $this->componentCodeName . '&view=' . $name_list_code
+ . CFactory::_('Config')->component_code_name . '&view=' . $name_list_code
. '&task='
. $name_single_code . '.edit";';
- $headerscript .= PHP_EOL . '//' . $this->setLine(__LINE__)
+ $headerscript .= PHP_EOL . '//' . Line::_(__Line__, __Class__)
. ' set a return value';
$headerscript .= PHP_EOL
. '$return = ($id) ? "index.php?option=com_'
- . $this->componentCodeName . '&view=' . $nameSingleCode
+ . CFactory::_('Config')->component_code_name . '&view=' . $nameSingleCode
. '&layout=edit&id=" . $id : "";';
- $headerscript .= PHP_EOL . '//' . $this->setLine(__LINE__)
+ $headerscript .= PHP_EOL . '//' . Line::_(__Line__, __Class__)
. ' check for a return value';
$headerscript .= PHP_EOL
. '$jinput = JFactory::getApplication()->input;';
$headerscript .= PHP_EOL
. "if (\$_return = \$jinput->get('return', null, 'base64'))";
$headerscript .= PHP_EOL . '{';
- $headerscript .= PHP_EOL . $this->_t(1)
+ $headerscript .= PHP_EOL . Indent::_(1)
. '$return .= "&return=" . $_return;';
$headerscript .= PHP_EOL . '}';
- $headerscript .= PHP_EOL . '//' . $this->setLine(__LINE__)
+ $headerscript .= PHP_EOL . '//' . Line::_(__Line__, __Class__)
. ' check if return value was set';
$headerscript .= PHP_EOL . 'if ('
- . $this->fileContentStatic[$this->hhh . 'Component'
- . $this->hhh] . 'Helper::checkString($return))';
+ . CFactory::_('Compiler.Builder.Content.One')->get('Component') . 'Helper::checkString($return))';
$headerscript .= PHP_EOL . '{';
- $headerscript .= PHP_EOL . $this->_t(1) . '//' . $this->setLine(
- __LINE__
+ $headerscript .= PHP_EOL . Indent::_(1) . '//' . Line::_(
+ __LINE__,__CLASS__
) . ' set the referral values';
- $headerscript .= PHP_EOL . $this->_t(1) . '$ref = ($id) ? "&ref='
+ $headerscript .= PHP_EOL . Indent::_(1) . '$ref = ($id) ? "&ref='
. $nameSingleCode
. '&refid=" . $id . "&return=" . urlencode(base64_encode($return)) : "&return=" . urlencode(base64_encode($return));';
$headerscript .= PHP_EOL . '}';
$headerscript .= PHP_EOL . 'else';
$headerscript .= PHP_EOL . '{';
- $headerscript .= PHP_EOL . $this->_t(1) . '$ref = ($id) ? "&ref='
+ $headerscript .= PHP_EOL . Indent::_(1) . '$ref = ($id) ? "&ref='
. $nameSingleCode . '&refid=" . $id : "";';
$headerscript .= PHP_EOL . '}';
if ($addNewButon > 0)
@@ -13971,69 +13055,66 @@ class Interpretation extends Fields
// add the link for new
if ($addNewButon == 1 || $addNewButon == 2)
{
- $headerscript .= PHP_EOL . '//' . $this->setLine(__LINE__)
+ $headerscript .= PHP_EOL . '//' . Line::_(__Line__, __Class__)
. ' set the create new URL';
$headerscript .= PHP_EOL . '$new = "index.php?option=com_'
- . $this->componentCodeName . '&view=' . $name_list_code
+ . CFactory::_('Config')->component_code_name . '&view=' . $name_list_code
. '&task='
. $name_single_code . '.edit" . $ref;';
}
// and the link for close and new
if ($addNewButon == 2 || $addNewButon == 3)
{
- $headerscript .= PHP_EOL . '//' . $this->setLine(__LINE__)
+ $headerscript .= PHP_EOL . '//' . Line::_(__Line__, __Class__)
. ' set the create new and close URL';
$headerscript .= PHP_EOL
. '$close_new = "index.php?option=com_'
- . $this->componentCodeName . '&view=' . $name_list_code
+ . CFactory::_('Config')->component_code_name . '&view=' . $name_list_code
. '&task='
. $name_single_code . '.edit";';
}
- $headerscript .= PHP_EOL . '//' . $this->setLine(__LINE__)
+ $headerscript .= PHP_EOL . '//' . Line::_(__Line__, __Class__)
. ' load the action object';
$headerscript .= PHP_EOL . '$can = '
- . $this->fileContentStatic[$this->hhh . 'Component'
- . $this->hhh] . 'Helper::getActions(' . "'"
+ . CFactory::_('Compiler.Builder.Content.One')->get('Component') . 'Helper::getActions(' . "'"
. $name_single_code . "'"
. ');';
}
- $this->fileContentDynamic[$nameSingleCode . '_'
- . $layoutCodeName][$this->hhh . 'LAYOUTITEMSHEADER' . $this->hhh]
- = $headerscript;
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '_' . $layoutCodeName . '|LAYOUTITEMSHEADER',
+ $headerscript
+ );
// LINKEDVIEWITEMS <<>>
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'LINKEDVIEWITEMS' . $this->hhh]
- .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(
- __LINE__
- ) . " Get Linked view data" . PHP_EOL . $this->_t(2)
+ CFactory::_('Compiler.Builder.Content.Multi')->add($nameSingleCode . '|LINKEDVIEWITEMS',
+ PHP_EOL . PHP_EOL . Indent::_(2) . "//" . Line::_(
+ __LINE__,__CLASS__
+ ) . " Get Linked view data" . PHP_EOL . Indent::_(2)
. "\$this->" . $codeName . " = \$this->get('" . $functionName
- . "');";
+ . "');", false
+ );
// LINKEDVIEWTABLESCRIPTS <<>>
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'LINKEDVIEWTABLESCRIPTS' . $this->hhh]
- = $this->setFootableScripts();
- if (strpos($parentKey, '-R>') !== false
- || strpos($parentKey, '-A>') !== false)
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|LINKEDVIEWTABLESCRIPTS', $this->setFootableScripts());
+ if (strpos((string) $parentKey, '-R>') !== false
+ || strpos((string) $parentKey, '-A>') !== false)
{
- list($parent_key) = explode('-', $parentKey);
+ list($parent_key) = explode('-', (string) $parentKey);
}
- elseif (strpos($parentKey, '-OR>') !== false)
+ elseif (strpos((string) $parentKey, '-OR>') !== false)
{
// this is not good... (TODO)
- $parent_keys = explode('-OR>', $parentKey);
+ $parent_keys = explode('-OR>', (string) $parentKey);
}
else
{
$parent_key = $parentKey;
}
- if (strpos($key, '-R>') !== false || strpos($key, '-A>') !== false)
+ if (strpos((string) $key, '-R>') !== false || strpos((string) $key, '-A>') !== false)
{
- list($_key) = explode('-', $key);
+ list($_key) = explode('-', (string) $key);
}
- elseif (strpos($key, '-OR>') !== false)
+ elseif (strpos((string) $key, '-OR>') !== false)
{
- $_key = str_replace('-OR>', '', $key);
+ $_key = str_replace('-OR>', '', (string) $key);
}
else
{
@@ -14052,11 +13133,10 @@ class Interpretation extends Fields
= StringHelper::safe(
$_key . $this->uniquekey(4)
);
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'LINKEDVIEWGLOBAL' . $this->hhh]
- .= PHP_EOL . $this->_t(2) . "\$this->"
- . $globalKey[$parent_key] . " = \$item->" . $parent_key
- . ";";
+ CFactory::_('Compiler.Builder.Content.Multi')->add($nameSingleCode . '|LINKEDVIEWGLOBAL',
+ PHP_EOL . Indent::_(2) . "\$this->"
+ . $globalKey[$parent_key] . " = \$item->" . $parent_key . ";", false
+ );
}
}
else
@@ -14065,28 +13145,26 @@ class Interpretation extends Fields
$globalKey = StringHelper::safe(
$_key . $this->uniquekey(4)
);
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'LINKEDVIEWGLOBAL' . $this->hhh]
- .= PHP_EOL . $this->_t(2) . "\$this->" . $globalKey
- . " = \$item->" . $parent_key . ";";
+ CFactory::_('Compiler.Builder.Content.Multi')->add($nameSingleCode . '|LINKEDVIEWGLOBAL',
+ PHP_EOL . Indent::_(2) . "\$this->" . $globalKey
+ . " = \$item->" . $parent_key . ";", false
+ );
}
// LINKEDVIEWMETHODS <<>>
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'LINKEDVIEWMETHODS' . $this->hhh]
- .= $this->setListQueryLinked(
- $name_single_code, $name_list_code, $functionName, $key, $_key,
- $parentKey,
- $parent_key, $globalKey
+ CFactory::_('Compiler.Builder.Content.Multi')->add($nameSingleCode . '|LINKEDVIEWMETHODS',
+ $this->setListQueryLinked(
+ $name_single_code, $name_list_code, $functionName, $key, $_key,
+ $parentKey,
+ $parent_key, $globalKey
+ ), false
);
}
else
{
- $this->fileContentDynamic[$nameSingleCode . '_'
- . $layoutCodeName][$this->hhh . 'LAYOUTITEMSTABLE' . $this->hhh]
- = 'oops! error.....';
- $this->fileContentDynamic[$nameSingleCode . '_'
- . $layoutCodeName][$this->hhh . 'LAYOUTITEMSHEADER' . $this->hhh]
- = '';
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '_' . $layoutCodeName . '|LAYOUTITEMSTABLE',
+ 'oops! error.....'
+ );
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '_' . $layoutCodeName . '|LAYOUTITEMSHEADER', '');
}
}
@@ -14097,93 +13175,93 @@ class Interpretation extends Fields
*/
public function setFootableScripts($init = true)
{
- if (!isset($this->footableVersion)
- || 2 == $this->footableVersion) // loading version 2
+ $footable_version = CFactory::_('Config')->get('footable_version', 2);
+ if (2 == $footable_version) // loading version 2
{
- $foo = PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(
- __LINE__
+ $foo = PHP_EOL . PHP_EOL . Indent::_(2) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " Add the CSS for Footable.";
- $foo .= PHP_EOL . $this->_t(2)
+ $foo .= PHP_EOL . Indent::_(2)
. "JHtml::_('stylesheet', 'media/com_"
- . $this->componentCodeName
+ . CFactory::_('Config')->component_code_name
. "/footable-v2/css/footable.core.min.css', ['version' => 'auto']);";
- $foo .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(
- __LINE__
+ $foo .= PHP_EOL . PHP_EOL . Indent::_(2) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " Use the Metro Style";
- $foo .= PHP_EOL . $this->_t(2)
+ $foo .= PHP_EOL . Indent::_(2)
. "if (!isset(\$this->fooTableStyle) || 0 == \$this->fooTableStyle)";
- $foo .= PHP_EOL . $this->_t(2) . "{";
- $foo .= PHP_EOL . $this->_t(3)
+ $foo .= PHP_EOL . Indent::_(2) . "{";
+ $foo .= PHP_EOL . Indent::_(3)
. "JHtml::_('stylesheet', 'media/com_"
- . $this->componentCodeName
+ . CFactory::_('Config')->component_code_name
. "/footable-v2/css/footable.metro.min.css', ['version' => 'auto']);";
- $foo .= PHP_EOL . $this->_t(2) . "}";
- $foo .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $foo .= PHP_EOL . Indent::_(2) . "}";
+ $foo .= PHP_EOL . Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " Use the Legacy Style.";
- $foo .= PHP_EOL . $this->_t(2)
+ $foo .= PHP_EOL . Indent::_(2)
. "elseif (isset(\$this->fooTableStyle) && 1 == \$this->fooTableStyle)";
- $foo .= PHP_EOL . $this->_t(2) . "{";
- $foo .= PHP_EOL . $this->_t(3)
+ $foo .= PHP_EOL . Indent::_(2) . "{";
+ $foo .= PHP_EOL . Indent::_(3)
. "JHtml::_('stylesheet', 'media/com_"
- . $this->componentCodeName
+ . CFactory::_('Config')->component_code_name
. "/footable-v2/css/footable.standalone.min.css', ['version' => 'auto']);";
- $foo .= PHP_EOL . $this->_t(2) . "}";
- $foo .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(
- __LINE__
+ $foo .= PHP_EOL . Indent::_(2) . "}";
+ $foo .= PHP_EOL . PHP_EOL . Indent::_(2) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " Add the JavaScript for Footable";
- $foo .= PHP_EOL . $this->_t(2)
+ $foo .= PHP_EOL . Indent::_(2)
. "JHtml::_('script', 'media/com_"
- . $this->componentCodeName . "/footable-v2/js/footable.js', ['version' => 'auto']);";
- $foo .= PHP_EOL . $this->_t(2)
+ . CFactory::_('Config')->component_code_name . "/footable-v2/js/footable.js', ['version' => 'auto']);";
+ $foo .= PHP_EOL . Indent::_(2)
. "JHtml::_('script', 'media/com_"
- . $this->componentCodeName
+ . CFactory::_('Config')->component_code_name
. "/footable-v2/js/footable.sort.js', ['version' => 'auto']);";
- $foo .= PHP_EOL . $this->_t(2)
+ $foo .= PHP_EOL . Indent::_(2)
. "JHtml::_('script', 'media/com_"
- . $this->componentCodeName
+ . CFactory::_('Config')->component_code_name
. "/footable-v2/js/footable.filter.js', ['version' => 'auto']);";
- $foo .= PHP_EOL . $this->_t(2)
+ $foo .= PHP_EOL . Indent::_(2)
. "JHtml::_('script', 'media/com_"
- . $this->componentCodeName
+ . CFactory::_('Config')->component_code_name
. "/footable-v2/js/footable.paginate.js', ['version' => 'auto']);";
if ($init)
{
- $foo .= PHP_EOL . PHP_EOL . $this->_t(2)
+ $foo .= PHP_EOL . PHP_EOL . Indent::_(2)
. '$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'"
. '); }";';
- $foo .= PHP_EOL . $this->_t(2)
+ $foo .= PHP_EOL . Indent::_(2)
. "\$this->document->addScriptDeclaration(\$footable);"
. PHP_EOL;
}
}
- elseif (3 == $this->footableVersion) // loading version 3
+ elseif (3 == $footable_version) // loading version 3
{
- $foo = PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(
- __LINE__
+ $foo = PHP_EOL . PHP_EOL . Indent::_(2) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " Add the CSS for Footable";
- $foo .= PHP_EOL . $this->_t(2)
+ $foo .= PHP_EOL . Indent::_(2)
. "\$this->document->addStyleSheet('https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css');";
- $foo .= PHP_EOL . $this->_t(2)
+ $foo .= PHP_EOL . Indent::_(2)
. "JHtml::_('stylesheet', 'media/com_"
- . $this->componentCodeName
+ . CFactory::_('Config')->component_code_name
. "/footable-v3/css/footable.standalone.min.css', ['version' => 'auto']);";
- $foo .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $foo .= PHP_EOL . Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " Add the JavaScript for Footable (adding all functions)";
- $foo .= PHP_EOL . $this->_t(2)
+ $foo .= PHP_EOL . Indent::_(2)
. "JHtml::_('script', 'media/com_"
- . $this->componentCodeName
+ . CFactory::_('Config')->component_code_name
. "/footable-v3/js/footable.min.js', ['version' => 'auto']);";
if ($init)
{
- $foo .= PHP_EOL . PHP_EOL . $this->_t(2)
+ $foo .= PHP_EOL . PHP_EOL . Indent::_(2)
. '$footable = "jQuery(document).ready(function() { jQuery(function () { jQuery('
. "'.footable'" . ').footable();});});";';
- $foo .= PHP_EOL . $this->_t(2)
+ $foo .= PHP_EOL . Indent::_(2)
. "\$this->document->addScriptDeclaration(\$footable);"
. PHP_EOL;
}
@@ -14205,46 +13283,35 @@ class Interpretation extends Fields
$refview
)
{
- if (isset($this->listBuilder[$nameListCode])
- && ArrayHelper::check(
- $this->listBuilder[$nameListCode]
- ))
+ if (($items = CFactory::_('Compiler.Builder.Lists')->get($nameListCode)) !== null)
{
// component helper name
- $Helper = $this->fileContentStatic[$this->hhh . 'Component'
- . $this->hhh] . 'Helper';
+ $Helper = CFactory::_('Compiler.Builder.Content.One')->get('Component') . 'Helper';
+ $footable_version = CFactory::_('Config')->get('footable_version', 2);
// make sure the custom links are only added once
$firstTimeBeingAdded = true;
- // setup correct core target
- $coreLoad = false;
- $core = null;
- if (isset($this->permissionCore[$nameSingleCode]))
- {
- $core = $this->permissionCore[$nameSingleCode];
- $coreLoad = true;
- }
$counter = 0;
// add the default
$body = PHP_EOL . "";
$body .= PHP_EOL . " \$item): ?>";
- $body .= PHP_EOL . $this->_t(1) . "_t(2)
+ $body .= PHP_EOL . Indent::_(1) . "authorise('core.manage', 'com_checkin') || \$item->checked_out == \$user->id || \$item->checked_out == 0;";
- $body .= PHP_EOL . $this->_t(2)
+ $body .= PHP_EOL . Indent::_(2)
. "\$userChkOut = JFactory::getUser(\$item->checked_out);";
- $body .= PHP_EOL . $this->_t(2) . "\$canDo = " . $Helper
+ $body .= PHP_EOL . Indent::_(2) . "\$canDo = " . $Helper
. "::getActions('" . $nameSingleCode . "',\$item,'"
. $nameListCode . "');";
- $body .= PHP_EOL . $this->_t(1) . "?>";
- $body .= PHP_EOL . $this->_t(1) . '';
+ $body .= PHP_EOL . Indent::_(1) . "?>";
+ $body .= PHP_EOL . Indent::_(1) . ' ';
// check if this view has fields that should not be escaped
$doNotEscape = false;
- if (isset($this->doNotEscape[$nameListCode]))
+ if (CFactory::_('Compiler.Builder.Do.Not.Escape')->exists($nameListCode))
{
$doNotEscape = true;
}
// start adding the dynamic
- foreach ($this->listBuilder[$nameListCode] as $item)
+ foreach ($items as $item)
{
// check if target is linked list view
if (1 == $item['target'] || 4 == $item['target'])
@@ -14256,7 +13323,7 @@ class Interpretation extends Fields
// set the item row
$itemRow = $this->getListItemBuilder(
$item, $nameSingleCode, $nameListCode, $itemClass,
- $doNotEscape, $coreLoad, $core, false, $ref,
+ $doNotEscape, false, $ref,
'$displayData->escape', '$user', $refview
);
// check if buttons was aready added
@@ -14271,111 +13338,111 @@ class Interpretation extends Fields
$firstTimeBeingAdded = false;
}
// add row to body
- $body .= PHP_EOL . $this->_t(2) . "";
+ $body .= PHP_EOL . Indent::_(2) . " ";
$body .= $itemRow;
$body .= $customAdminViewButtons;
- $body .= PHP_EOL . $this->_t(2) . " ";
+ $body .= PHP_EOL . Indent::_(2) . "";
// increment counter
$counter++;
}
}
- $data_value = (3 == $this->footableVersion) ? 'data-sort-value'
+ $data_value = (3 == $footable_version) ? 'data-sort-value'
: 'data-value';
// add the defaults
- if (!isset($this->fieldsNames[$nameSingleCode]['published']))
+ if (!CFactory::_('Compiler.Builder.Field.Names')->isString($nameSingleCode . '.published'))
{
$counter++;
// add the defaults
- $body .= PHP_EOL . $this->_t(2)
+ $body .= PHP_EOL . Indent::_(2)
. "published == 1): ?>";
- $body .= PHP_EOL . $this->_t(3) . '';
- $body .= PHP_EOL . $this->_t(4)
+ $body .= PHP_EOL . Indent::_(4)
. 'langPrefix . "_PUBLISHED'"
. '); ?>">';
- $body .= PHP_EOL . $this->_t(5) . 'langPrefix . "_PUBLISHED'" . '); ?>';
- $body .= PHP_EOL . $this->_t(4) . '';
- $body .= PHP_EOL . $this->_t(3) . ' ';
+ $body .= PHP_EOL . Indent::_(4) . '';
+ $body .= PHP_EOL . Indent::_(3) . '';
- $body .= PHP_EOL . $this->_t(2)
+ $body .= PHP_EOL . Indent::_(2)
. "published == 0): ?>";
- $body .= PHP_EOL . $this->_t(3) . '';
- $body .= PHP_EOL . $this->_t(4)
+ $body .= PHP_EOL . Indent::_(4)
. 'langPrefix . "_INACTIVE'"
. '); ?>">';
- $body .= PHP_EOL . $this->_t(5) . 'langPrefix . "_INACTIVE'" . '); ?>';
- $body .= PHP_EOL . $this->_t(4) . '';
- $body .= PHP_EOL . $this->_t(3) . ' ';
+ $body .= PHP_EOL . Indent::_(4) . '';
+ $body .= PHP_EOL . Indent::_(3) . '';
- $body .= PHP_EOL . $this->_t(2)
+ $body .= PHP_EOL . Indent::_(2)
. "published == 2): ?>";
- $body .= PHP_EOL . $this->_t(3) . '';
- $body .= PHP_EOL . $this->_t(4)
+ $body .= PHP_EOL . Indent::_(4)
. 'langPrefix . "_ARCHIVED'"
. '); ?>">';
- $body .= PHP_EOL . $this->_t(5) . 'langPrefix . "_ARCHIVED'" . '); ?>';
- $body .= PHP_EOL . $this->_t(4) . '';
- $body .= PHP_EOL . $this->_t(3) . ' ';
+ $body .= PHP_EOL . Indent::_(4) . '';
+ $body .= PHP_EOL . Indent::_(3) . '';
- $body .= PHP_EOL . $this->_t(2)
+ $body .= PHP_EOL . Indent::_(2)
. "published == -2): ?>";
- $body .= PHP_EOL . $this->_t(3) . '';
- $body .= PHP_EOL . $this->_t(4)
+ $body .= PHP_EOL . Indent::_(4)
. 'langPrefix . "_TRASHED'"
. '); ?>">';
- $body .= PHP_EOL . $this->_t(5) . 'langPrefix . "_TRASHED'" . '); ?>';
- $body .= PHP_EOL . $this->_t(4) . '';
- $body .= PHP_EOL . $this->_t(3) . ' ';
- $body .= PHP_EOL . $this->_t(2) . '';
+ $body .= PHP_EOL . Indent::_(4) . '';
+ $body .= PHP_EOL . Indent::_(3) . '';
+ $body .= PHP_EOL . Indent::_(2) . '';
}
// add the defaults
- if (!isset($this->fieldsNames[$nameSingleCode]['id']))
+ if (!CFactory::_('Compiler.Builder.Field.Names')->isString($nameSingleCode . '.id'))
{
$counter++;
- $body .= PHP_EOL . $this->_t(2)
+ $body .= PHP_EOL . Indent::_(2)
. '";
+ $body .= PHP_EOL . Indent::_(3) . "id; ?>";
+ $body .= PHP_EOL . Indent::_(2) . "";
}
- $body .= PHP_EOL . $this->_t(1) . " ";
+ $body .= PHP_EOL . Indent::_(1) . "";
$body .= PHP_EOL . "";
$body .= PHP_EOL . "";
- if (2 == $this->footableVersion)
+ if (2 == $footable_version)
{
$body .= PHP_EOL . '';
- $body .= PHP_EOL . $this->_t(1) . '';
- $body .= PHP_EOL . $this->_t(2) . '';
- $body .= PHP_EOL . $this->_t(3)
+ $body .= PHP_EOL . Indent::_(3)
. '';
- $body .= PHP_EOL . $this->_t(2) . ' ';
- $body .= PHP_EOL . $this->_t(1) . ' ';
+ $body .= PHP_EOL . Indent::_(2) . '';
+ $body .= PHP_EOL . Indent::_(1) . '';
$body .= PHP_EOL . '';
}
$body .= PHP_EOL . '';
$body .= PHP_EOL . '';
- $body .= PHP_EOL . $this->_t(1)
+ $body .= PHP_EOL . Indent::_(1)
. '';
- $body .= PHP_EOL . $this->_t(2) . '';
- $body .= PHP_EOL . $this->_t(1) . '';
+ $body .= PHP_EOL . Indent::_(1) . ' ';
$body .= PHP_EOL . '';
// return the build
@@ -14399,57 +13466,30 @@ class Interpretation extends Fields
$addNewButon, $refview
)
{
- if (isset($this->listBuilder[$nameListCode])
- && ArrayHelper::check(
- $this->listBuilder[$nameListCode]
- ))
+ if (($items = CFactory::_('Compiler.Builder.Lists')->get($nameListCode)) !== null)
{
// component helper name
- $Helper = $this->fileContentStatic[$this->hhh . 'Component'
- . $this->hhh] . 'Helper';
+ $Helper = CFactory::_('Compiler.Builder.Content.One')->get('Component') . 'Helper';
$head = '';
+ $footable_version = CFactory::_('Config')->get('footable_version', 2);
// only add new button if set
if ($addNewButon > 0)
{
- // setup correct core target
- $coreLoad = false;
- if (isset($this->permissionCore[$nameSingleCode]))
- {
- $core = $this->permissionCore[$nameSingleCode];
- $coreLoad = true;
- }
- // check if the item has permissions.
- if ($coreLoad && isset($core['core.create'])
- && isset($this->permissionBuilder['global'][$core['core.create']])
- && ArrayHelper::check(
- $this->permissionBuilder['global'][$core['core.create']]
- )
- && in_array(
- $nameSingleCode,
- $this->permissionBuilder['global'][$core['core.create']]
- ))
- {
- // set permissions.
- $accessCheck = "\$can->get('" . $core['core.create'] . "')";
- }
- else
- {
- // set permissions.
- $accessCheck = "\$can->get('core.create')";
- }
+ // set permissions.
+ $accessCheck = "\$can->get('" . CFactory::_('Compiler.Creator.Permission')->getGlobal($nameSingleCode, 'core.create') . "')";
// add a button for new
$head = '';
// make group button if needed
$tabB = "";
if ($addNewButon == 2)
{
- $head .= PHP_EOL . $this->_t(1) . '';
- $tabB = $this->_t(1);
+ $head .= PHP_EOL . Indent::_(1) . '';
+ $tabB = Indent::_(1);
}
// add the new buttons
if ($addNewButon == 1 || $addNewButon == 2)
{
- $head .= PHP_EOL . $tabB . $this->_t(1)
+ $head .= PHP_EOL . $tabB . Indent::_(1)
. ' langPrefix . "_NEW'"
. '); ?>';
@@ -14457,7 +13497,7 @@ class Interpretation extends Fields
// add the close and new button
if ($addNewButon == 2 || $addNewButon == 3)
{
- $head .= PHP_EOL . $tabB . $this->_t(1)
+ $head .= PHP_EOL . $tabB . Indent::_(1)
. ' _t(1) . '
';
+ $head .= PHP_EOL . Indent::_(1) . '
';
}
else
{
@@ -14477,17 +13517,17 @@ class Interpretation extends Fields
}
$head .= '';
// set the style for V2
- $metro_blue = (2 == $this->footableVersion) ? ' metro-blue' : '';
+ $metro_blue = (2 == $footable_version) ? ' metro-blue' : '';
// set the toggle for V3
- $toggle = (3 == $this->footableVersion)
+ $toggle = (3 == $footable_version)
? ' data-show-toggle="true" data-toggle-column="first"' : '';
// set paging
- $paging = (2 == $this->footableVersion)
+ $paging = (2 == $footable_version)
? ' data-page-size="20" data-filter="#filter_' . $nameListCode
. '"'
: ' data-sorting="true" data-paging="true" data-paging-size="20" data-filtering="true"';
// add html fix for V3
- $htmlFix = (3 == $this->footableVersion)
+ $htmlFix = (3 == $footable_version)
? ' data-type="html" data-sort-use="text"' : '';
$head .= PHP_EOL . '';
@@ -14502,85 +13542,81 @@ class Interpretation extends Fields
// make sure only first link is used as togeler
$firstLink = true;
// add to lang array
- $this->setLangContent($this->lang, $statusLangName, 'Status');
+ CFactory::_('Language')->set(CFactory::_('Config')->lang_target, $statusLangName, 'Status');
// add to lang array
- $this->setLangContent($this->lang, $idLangName, 'Id');
- $head .= PHP_EOL . $this->_t(1) . "";
+ CFactory::_('Language')->set(CFactory::_('Config')->lang_target, $idLangName, 'Id');
+ $head .= PHP_EOL . Indent::_(1) . " ";
// set controller for data hiding options
$controller = 1;
// build the dynamic fields
- foreach ($this->listBuilder[$nameListCode] as $item)
+ foreach ($items as $item)
{
// check if target is linked list view
if (1 == $item['target'] || 4 == $item['target'])
{
// check if we have an over-ride
- if (isset($this->listHeadOverRide[$nameListCode])
- && ArrayHelper::check(
- $this->listHeadOverRide[$nameListCode]
- )
- && isset($this->listHeadOverRide[$nameListCode][$item['id']]))
+ if (($list_head_override = CFactory::_('Compiler.Builder.List.Head.Override')->
+ get($nameListCode . '.' . (int) $item['id'])) !== null)
{
- $item['lang']
- = $this->listHeadOverRide[$nameListCode][$item['id']];
+ $item['lang'] = $list_head_override;
}
- $setin = (2 == $this->footableVersion)
+ $setin = (2 == $footable_version)
? ' data-hide="phone"' : ' data-breakpoints="xs sm"';
if ($controller > 3)
{
- $setin = (2 == $this->footableVersion)
+ $setin = (2 == $footable_version)
? ' data-hide="phone,tablet"'
: ' data-breakpoints="xs sm md"';
}
if ($controller > 6)
{
- $setin = (2 == $this->footableVersion)
+ $setin = (2 == $footable_version)
? ' data-hide="all"' : ' data-breakpoints="all"';
}
if ($item['link'] && $firstLink)
{
- $setin = (2 == $this->footableVersion)
+ $setin = (2 == $footable_version)
? ' data-toggle="true"' : '';
$firstLink = false;
}
- $head .= PHP_EOL . $this->_t(2) . "";
- $head .= PHP_EOL . $this->_t(3) . "";
- $head .= PHP_EOL . $this->_t(2) . "";
+ $head .= PHP_EOL . Indent::_(2) . "";
$controller++;
}
}
// set some V3 attr
- $data_hide = (2 == $this->footableVersion)
+ $data_hide = (2 == $footable_version)
? 'data-hide="phone,tablet"' : 'data-breakpoints="xs sm md"';
// add the defaults
- if (!isset($this->fieldsNames[$nameSingleCode]['published']))
+ if (!CFactory::_('Compiler.Builder.Field.Names')->isString($nameSingleCode . '.published'))
{
- $head .= PHP_EOL . $this->_t(2) . '';
- $head .= PHP_EOL . $this->_t(3) . "";
- $head .= PHP_EOL . $this->_t(2) . " ";
+ $head .= PHP_EOL . Indent::_(2) . "";
}
// add the defaults
- if (!isset($this->fieldsNames[$nameSingleCode]['id']))
+ if (!CFactory::_('Compiler.Builder.Field.Names')->isString($nameSingleCode . '.id'))
{
- $data_type = (2 == $this->footableVersion)
+ $data_type = (2 == $footable_version)
? 'data-type="numeric"'
: 'data-type="number"';
- $head .= PHP_EOL . $this->_t(2) . '';
- $head .= PHP_EOL . $this->_t(3) . "";
- $head .= PHP_EOL . $this->_t(2) . " ";
+ $head .= PHP_EOL . Indent::_(2) . "";
}
- $head .= PHP_EOL . $this->_t(1) . " ";
+ $head .= PHP_EOL . Indent::_(1) . "";
$head .= PHP_EOL . "";
return $head;
@@ -14602,111 +13638,107 @@ class Interpretation extends Fields
* @return string
*/
public function setListQueryLinked($nameSingleCode, $nameListCode,
- $functionName, $key, $_key, $parentKey, $parent_key, $globalKey
- )
+ $functionName, $key, $_key, $parentKey, $parent_key, $globalKey)
{
// check if this view has category added
- if (isset($this->categoryBuilder[$nameListCode])
- && ArrayHelper::check(
- $this->categoryBuilder[$nameListCode]
- ))
+ if (CFactory::_('Compiler.Builder.Category')->exists("{$nameListCode}.code"))
{
- $categoryCodeName = $this->categoryBuilder[$nameListCode]['code'];
+ $categoryCodeName = CFactory::_('Compiler.Builder.Category')->get("{$nameListCode}.code");
$addCategory = true;
}
else
{
$addCategory = false;
}
- $query = PHP_EOL . PHP_EOL . $this->_t(1) . "/**";
- $query .= PHP_EOL . $this->_t(1) . " * Method to get list data.";
- $query .= PHP_EOL . $this->_t(1) . " *";
- $query .= PHP_EOL . $this->_t(1)
+ $query = PHP_EOL . PHP_EOL . Indent::_(1) . "/**";
+ $query .= PHP_EOL . Indent::_(1) . " * Method to get list data.";
+ $query .= PHP_EOL . Indent::_(1) . " *";
+ $query .= PHP_EOL . Indent::_(1)
. " * @return mixed An array of data items on success, false on failure.";
- $query .= PHP_EOL . $this->_t(1) . " */";
- $query .= PHP_EOL . $this->_t(1) . "public function get" . $functionName
+ $query .= PHP_EOL . Indent::_(1) . " */";
+ $query .= PHP_EOL . Indent::_(1) . "public function get" . $functionName
. "()";
- $query .= PHP_EOL . $this->_t(1) . "{";
+ $query .= PHP_EOL . Indent::_(1) . "{";
// setup the query
- $query .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $query .= PHP_EOL . Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " Get the user object.";
- $query .= PHP_EOL . $this->_t(2) . "\$user = JFactory::getUser();";
- $query .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $query .= PHP_EOL . Indent::_(2) . "\$user = JFactory::getUser();";
+ $query .= PHP_EOL . Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " Create a new query object.";
- $query .= PHP_EOL . $this->_t(2) . "\$db = JFactory::getDBO();";
- $query .= PHP_EOL . $this->_t(2) . "\$query = \$db->getQuery(true);";
- $query .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(
- __LINE__
+ $query .= PHP_EOL . Indent::_(2) . "\$db = JFactory::getDBO();";
+ $query .= PHP_EOL . Indent::_(2) . "\$query = \$db->getQuery(true);";
+ $query .= PHP_EOL . PHP_EOL . Indent::_(2) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " Select some fields";
- $query .= PHP_EOL . $this->_t(2) . "\$query->select('a.*');";
+ $query .= PHP_EOL . Indent::_(2) . "\$query->select('a.*');";
// add the category
if ($addCategory)
{
- $query .= PHP_EOL . $this->_t(2)
+ $query .= PHP_EOL . Indent::_(2)
. "\$query->select(\$db->quoteName('c.title','category_title'));";
}
- $query .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(
- __LINE__
- ) . " From the " . $this->componentCodeName . "_"
+ $query .= PHP_EOL . PHP_EOL . Indent::_(2) . "//" . Line::_(
+ __LINE__,__CLASS__
+ ) . " From the " . CFactory::_('Config')->component_code_name . "_"
. $nameSingleCode
. " table";
- $query .= PHP_EOL . $this->_t(2) . "\$query->from(\$db->quoteName('#__"
- . $this->componentCodeName . "_" . $nameSingleCode . "', 'a'));";
+ $query .= PHP_EOL . Indent::_(2) . "\$query->from(\$db->quoteName('#__"
+ . CFactory::_('Config')->component_code_name . "_" . $nameSingleCode . "', 'a'));";
// add the category
if ($addCategory)
{
- $query .= PHP_EOL . $this->_t(2)
+ $query .= PHP_EOL . Indent::_(2)
. "\$query->join('LEFT', \$db->quoteName('#__categories', 'c') . ' ON (' . \$db->quoteName('a."
. $categoryCodeName
. "') . ' = ' . \$db->quoteName('c.id') . ')');";
}
// add custom filtering php
- $query .= $this->getCustomScriptBuilder(
+ $query .= CFactory::_('Customcode.Dispenser')->get(
'php_getlistquery', $nameSingleCode, PHP_EOL . PHP_EOL
);
// add the custom fields query
$query .= $this->setCustomQuery($nameListCode, $nameSingleCode);
if (StringHelper::check($globalKey) && $key
&& strpos(
- $key, '-R>'
+ (string) $key, '-R>'
) === false
- && strpos($key, '-A>') === false
- && strpos($key, '-OR>') === false
+ && strpos((string) $key, '-A>') === false
+ && strpos((string) $key, '-OR>') === false
&& $parentKey
- && strpos($parentKey, '-R>') === false
- && strpos($parentKey, '-A>') === false
- && strpos($parentKey, '-OR>') === false)
+ && strpos((string) $parentKey, '-R>') === false
+ && strpos((string) $parentKey, '-A>') === false
+ && strpos((string) $parentKey, '-OR>') === false)
{
- $query .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(
- __LINE__
+ $query .= PHP_EOL . PHP_EOL . Indent::_(2) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " Filter by " . $globalKey . " global.";
- $query .= PHP_EOL . $this->_t(2) . "\$" . $globalKey . " = \$this->"
+ $query .= PHP_EOL . Indent::_(2) . "\$" . $globalKey . " = \$this->"
. $globalKey . ";";
- $query .= PHP_EOL . $this->_t(2) . "if (is_numeric(\$" . $globalKey
+ $query .= PHP_EOL . Indent::_(2) . "if (is_numeric(\$" . $globalKey
. " ))";
- $query .= PHP_EOL . $this->_t(2) . "{";
- $query .= PHP_EOL . $this->_t(3) . "\$query->where('a." . $key
+ $query .= PHP_EOL . Indent::_(2) . "{";
+ $query .= PHP_EOL . Indent::_(3) . "\$query->where('a." . $key
. " = ' . (int) \$" . $globalKey . " );";
- $query .= PHP_EOL . $this->_t(2) . "}";
- $query .= PHP_EOL . $this->_t(2) . "elseif (is_string(\$"
+ $query .= PHP_EOL . Indent::_(2) . "}";
+ $query .= PHP_EOL . Indent::_(2) . "elseif (is_string(\$"
. $globalKey . "))";
- $query .= PHP_EOL . $this->_t(2) . "{";
- $query .= PHP_EOL . $this->_t(3) . "\$query->where('a." . $key
+ $query .= PHP_EOL . Indent::_(2) . "{";
+ $query .= PHP_EOL . Indent::_(3) . "\$query->where('a." . $key
. " = ' . \$db->quote(\$" . $globalKey . "));";
- $query .= PHP_EOL . $this->_t(2) . "}";
- $query .= PHP_EOL . $this->_t(2) . "else";
- $query .= PHP_EOL . $this->_t(2) . "{";
- $query .= PHP_EOL . $this->_t(3) . "\$query->where('a." . $key
+ $query .= PHP_EOL . Indent::_(2) . "}";
+ $query .= PHP_EOL . Indent::_(2) . "else";
+ $query .= PHP_EOL . Indent::_(2) . "{";
+ $query .= PHP_EOL . Indent::_(3) . "\$query->where('a." . $key
. " = -5');";
- $query .= PHP_EOL . $this->_t(2) . "}";
+ $query .= PHP_EOL . Indent::_(2) . "}";
}
- elseif (strpos($parentKey, '-OR>') !== false
- || strpos($key, '-OR>') !== false)
+ elseif (strpos((string) $parentKey, '-OR>') !== false
+ || strpos((string) $key, '-OR>') !== false)
{
// get both strings
- if (strpos($key, '-OR>') !== false)
+ if (strpos((string) $key, '-OR>') !== false)
{
- $ORarray = explode('-OR>', $key);
+ $ORarray = explode('-OR>', (string) $key);
}
else
{
@@ -14729,89 +13761,85 @@ class Interpretation extends Fields
$ORquery['s'][] = "a." . $ORkey . " = ' . \$db->quote(\$"
. $_globalKey . ")";
}
- $query .= PHP_EOL . PHP_EOL . $this->_t(2) . "//"
- . $this->setLine(__LINE__) . " Filter by " . $_globalKey
+ $query .= PHP_EOL . PHP_EOL . Indent::_(2) . "//"
+ . Line::_(__Line__, __Class__) . " Filter by " . $_globalKey
. " global.";
- $query .= PHP_EOL . $this->_t(2) . "\$" . $_globalKey
+ $query .= PHP_EOL . Indent::_(2) . "\$" . $_globalKey
. " = \$this->" . $_globalKey . ";";
- $query .= PHP_EOL . $this->_t(2) . "if (is_numeric(\$"
+ $query .= PHP_EOL . Indent::_(2) . "if (is_numeric(\$"
. $_globalKey . " ))";
- $query .= PHP_EOL . $this->_t(2) . "{";
- $query .= PHP_EOL . $this->_t(3) . "\$query->where('" . implode(
+ $query .= PHP_EOL . Indent::_(2) . "{";
+ $query .= PHP_EOL . Indent::_(3) . "\$query->where('" . implode(
" . ' OR ", $ORquery['i']
) . ", ' OR');";
- $query .= PHP_EOL . $this->_t(2) . "}";
- $query .= PHP_EOL . $this->_t(2) . "elseif (is_string(\$"
+ $query .= PHP_EOL . Indent::_(2) . "}";
+ $query .= PHP_EOL . Indent::_(2) . "elseif (is_string(\$"
. $_globalKey . "))";
- $query .= PHP_EOL . $this->_t(2) . "{";
- $query .= PHP_EOL . $this->_t(3) . "\$query->where('" . implode(
+ $query .= PHP_EOL . Indent::_(2) . "{";
+ $query .= PHP_EOL . Indent::_(3) . "\$query->where('" . implode(
" . ' OR ", $ORquery['s']
) . ", ' OR');";
- $query .= PHP_EOL . $this->_t(2) . "}";
- $query .= PHP_EOL . $this->_t(2) . "else";
- $query .= PHP_EOL . $this->_t(2) . "{";
- $query .= PHP_EOL . $this->_t(3) . "\$query->where('a." . $ORkey
+ $query .= PHP_EOL . Indent::_(2) . "}";
+ $query .= PHP_EOL . Indent::_(2) . "else";
+ $query .= PHP_EOL . Indent::_(2) . "{";
+ $query .= PHP_EOL . Indent::_(3) . "\$query->where('a." . $ORkey
. " = -5');";
- $query .= PHP_EOL . $this->_t(2) . "}";
+ $query .= PHP_EOL . Indent::_(2) . "}";
}
}
- if (isset($this->accessBuilder[$nameSingleCode])
- && StringHelper::check(
- $this->accessBuilder[$nameSingleCode]
- ))
+ if (CFactory::_('Compiler.Builder.Access.Switch')->exists($nameSingleCode))
{
- $query .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(
- __LINE__
+ $query .= PHP_EOL . PHP_EOL . Indent::_(2) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " Join over the asset groups.";
- $query .= PHP_EOL . $this->_t(2)
+ $query .= PHP_EOL . Indent::_(2)
. "\$query->select('ag.title AS access_level');";
- $query .= PHP_EOL . $this->_t(2)
+ $query .= PHP_EOL . Indent::_(2)
. "\$query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');";
// check if the access field was over ridden
- if (!isset($this->fieldsNames[$nameSingleCode]['access']))
+ if (!CFactory::_('Compiler.Builder.Field.Names')->isString($nameSingleCode . '.access'))
{
// component helper name
- $Helper = $this->fileContentStatic[$this->hhh . 'Component'
- . $this->hhh] . 'Helper';
+ $Helper = CFactory::_('Compiler.Builder.Content.One')->get('Component') . 'Helper';
// load the access filter query code
- $query .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(
- __LINE__
+ $query .= PHP_EOL . Indent::_(2) . "//" . Line::_(
+ __LINE__,__CLASS__
)
. " Filter by access level.";
- $query .= PHP_EOL . $this->_t(2)
+ $query .= PHP_EOL . Indent::_(2)
. "\$_access = \$this->getState('filter.access');";
- $query .= PHP_EOL . $this->_t(2)
+ $query .= PHP_EOL . Indent::_(2)
. "if (\$_access && is_numeric(\$_access))";
- $query .= PHP_EOL . $this->_t(2) . "{";
- $query .= PHP_EOL . $this->_t(3)
+ $query .= PHP_EOL . Indent::_(2) . "{";
+ $query .= PHP_EOL . Indent::_(3)
. "\$query->where('a.access = ' . (int) \$_access);";
- $query .= PHP_EOL . $this->_t(2) . "}";
- $query .= PHP_EOL . $this->_t(2) . "elseif ("
+ $query .= PHP_EOL . Indent::_(2) . "}";
+ $query .= PHP_EOL . Indent::_(2) . "elseif ("
. $Helper . "::checkArray(\$_access))";
- $query .= PHP_EOL . $this->_t(2) . "{";
- $query .= PHP_EOL . $this->_t(3) . "//"
- . $this->setLine(__LINE__)
+ $query .= PHP_EOL . Indent::_(2) . "{";
+ $query .= PHP_EOL . Indent::_(3) . "//"
+ . Line::_(__Line__, __Class__)
. " Secure the array for the query";
- $query .= PHP_EOL . $this->_t(3)
+ $query .= PHP_EOL . Indent::_(3)
. "\$_access = ArrayHelper::toInteger(\$_access);";
- $query .= PHP_EOL . $this->_t(3) . "//"
- . $this->setLine(__LINE__) . " Filter by the Access Array.";
- $query .= PHP_EOL . $this->_t(3)
+ $query .= PHP_EOL . Indent::_(3) . "//"
+ . Line::_(__Line__, __Class__) . " Filter by the Access Array.";
+ $query .= PHP_EOL . Indent::_(3)
. "\$query->where('a.access IN (' . implode(',', \$_access) . ')');";
- $query .= PHP_EOL . $this->_t(2) . "}";
+ $query .= PHP_EOL . Indent::_(2) . "}";
}
// TODO the following will fight against the above access filter
- $query .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $query .= PHP_EOL . Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " Implement View Level Access";
- $query .= PHP_EOL . $this->_t(2)
+ $query .= PHP_EOL . Indent::_(2)
. "if (!\$user->authorise('core.options', 'com_"
- . $this->componentCodeName . "'))";
- $query .= PHP_EOL . $this->_t(2) . "{";
- $query .= PHP_EOL . $this->_t(3)
+ . CFactory::_('Config')->component_code_name . "'))";
+ $query .= PHP_EOL . Indent::_(2) . "{";
+ $query .= PHP_EOL . Indent::_(3)
. "\$groups = implode(',', \$user->getAuthorisedViewLevels());";
- $query .= PHP_EOL . $this->_t(3)
+ $query .= PHP_EOL . Indent::_(3)
. "\$query->where('a.access IN (' . \$groups . ')');";
- $query .= PHP_EOL . $this->_t(2) . "}";
+ $query .= PHP_EOL . Indent::_(2) . "}";
}
// add dynamic ordering (Linked view)
if (isset($this->viewsDefaultOrdering[$nameListCode])
@@ -14823,18 +13851,18 @@ class Interpretation extends Fields
as $order_field
)
{
- if (($order_field_name = $this->getFieldDatabaseName(
+ if (($order_field_name = CFactory::_('Field.Database.Name')->get(
$nameListCode, $order_field['field']
// We Removed This 'listJoinBuilder' as targetArea
// we will keep an eye on this
)) !== false)
{
// default ordering is by publish and ordering
- $query .= PHP_EOL . PHP_EOL . $this->_t(2) . "//"
- . $this->setLine(
- __LINE__
+ $query .= PHP_EOL . PHP_EOL . Indent::_(2) . "//"
+ . Line::_(
+ __LINE__,__CLASS__
) . " Order the results by ordering";
- $query .= PHP_EOL . $this->_t(2)
+ $query .= PHP_EOL . Indent::_(2)
. "\$query->order('"
. $order_field_name . " " . $order_field['direction']
. "');";
@@ -14844,272 +13872,258 @@ class Interpretation extends Fields
else
{
// default ordering is by publish and ordering
- $query .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(
- __LINE__
+ $query .= PHP_EOL . PHP_EOL . Indent::_(2) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " Order the results by ordering";
- $query .= PHP_EOL . $this->_t(2)
+ $query .= PHP_EOL . Indent::_(2)
. "\$query->order('a.published ASC');";
- $query .= PHP_EOL . $this->_t(2)
+ $query .= PHP_EOL . Indent::_(2)
. "\$query->order('a.ordering ASC');";
}
- $query .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(
- __LINE__
+ $query .= PHP_EOL . PHP_EOL . Indent::_(2) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " Load the items";
- $query .= PHP_EOL . $this->_t(2) . "\$db->setQuery(\$query);";
- $query .= PHP_EOL . $this->_t(2) . "\$db->execute();";
- $query .= PHP_EOL . $this->_t(2) . "if (\$db->getNumRows())";
- $query .= PHP_EOL . $this->_t(2) . "{";
- $query .= PHP_EOL . $this->_t(3) . "\$items = \$db->loadObjectList();";
+ $query .= PHP_EOL . Indent::_(2) . "\$db->setQuery(\$query);";
+ $query .= PHP_EOL . Indent::_(2) . "\$db->execute();";
+ $query .= PHP_EOL . Indent::_(2) . "if (\$db->getNumRows())";
+ $query .= PHP_EOL . Indent::_(2) . "{";
+ $query .= PHP_EOL . Indent::_(3) . "\$items = \$db->loadObjectList();";
// add the fixing strings method
$query .= $this->setGetItemsMethodStringFix(
$nameSingleCode, $nameListCode,
- $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh],
- $this->_t(1)
+ CFactory::_('Compiler.Builder.Content.One')->get('Component'),
+ Indent::_(1)
);
// add translations
$query .= $this->setSelectionTranslationFix(
$nameListCode,
- $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh],
- $this->_t(1)
+ CFactory::_('Compiler.Builder.Content.One')->get('Component'),
+ Indent::_(1)
);
// filter by child repetable field values
if (StringHelper::check($globalKey) && $key
&& strpos(
- $key, '-R>'
+ (string) $key, '-R>'
) !== false
- && strpos($key, '-A>') === false)
+ && strpos((string) $key, '-A>') === false)
{
- list($field, $target) = explode('-R>', $key);
- $query .= PHP_EOL . PHP_EOL . $this->_t(3) . "//" . $this->setLine(
- __LINE__
+ list($field, $target) = explode('-R>', (string) $key);
+ $query .= PHP_EOL . PHP_EOL . Indent::_(3) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " Filter by " . $globalKey . " in this Repetable Field";
- $query .= PHP_EOL . $this->_t(3) . "if ("
- . $this->fileContentStatic[$this->hhh . 'Component'
- . $this->hhh] . "Helper::checkArray(\$items) && isset(\$this->"
+ $query .= PHP_EOL . Indent::_(3) . "if ("
+ . CFactory::_('Compiler.Builder.Content.One')->get('Component') . "Helper::checkArray(\$items) && isset(\$this->"
. $globalKey . "))";
- $query .= PHP_EOL . $this->_t(3) . "{";
- $query .= PHP_EOL . $this->_t(4)
+ $query .= PHP_EOL . Indent::_(3) . "{";
+ $query .= PHP_EOL . Indent::_(4)
. "foreach (\$items as \$nr => &\$item)";
- $query .= PHP_EOL . $this->_t(4) . "{";
- $query .= PHP_EOL . $this->_t(5) . "if (isset(\$item->" . $field
- . ") && " . $this->fileContentStatic[$this->hhh . 'Component'
- . $this->hhh] . "Helper::checkJson(\$item->" . $field . "))";
- $query .= PHP_EOL . $this->_t(5) . "{";
- $query .= PHP_EOL . $this->_t(6)
+ $query .= PHP_EOL . Indent::_(4) . "{";
+ $query .= PHP_EOL . Indent::_(5) . "if (isset(\$item->" . $field
+ . ") && " . CFactory::_('Compiler.Builder.Content.One')->get('Component') . "Helper::checkJson(\$item->" . $field . "))";
+ $query .= PHP_EOL . Indent::_(5) . "{";
+ $query .= PHP_EOL . Indent::_(6)
. "\$tmpArray = json_decode(\$item->" . $field . ",true);";
- $query .= PHP_EOL . $this->_t(6) . "if (!isset(\$tmpArray['"
- . $target . "']) || !" . $this->fileContentStatic[$this->hhh
- . 'Component' . $this->hhh] . "Helper::checkArray(\$tmpArray['"
+ $query .= PHP_EOL . Indent::_(6) . "if (!isset(\$tmpArray['"
+ . $target . "']) || !" . CFactory::_('Compiler.Builder.Content.One')->get('Component') . "Helper::checkArray(\$tmpArray['"
. $target . "']) || !in_array(\$this->" . $globalKey
. ", \$tmpArray['" . $target . "']))";
- $query .= PHP_EOL . $this->_t(6) . "{";
- $query .= PHP_EOL . $this->_t(7) . "unset(\$items[\$nr]);";
- $query .= PHP_EOL . $this->_t(7) . "continue;";
- $query .= PHP_EOL . $this->_t(6) . "}";
- $query .= PHP_EOL . $this->_t(5) . "}";
- $query .= PHP_EOL . $this->_t(5) . "else";
- $query .= PHP_EOL . $this->_t(5) . "{";
- $query .= PHP_EOL . $this->_t(6) . "unset(\$items[\$nr]);";
- $query .= PHP_EOL . $this->_t(6) . "continue;";
- $query .= PHP_EOL . $this->_t(5) . "}";
- $query .= PHP_EOL . $this->_t(4) . "}";
- $query .= PHP_EOL . $this->_t(3) . "}";
- $query .= PHP_EOL . $this->_t(3) . "else";
- $query .= PHP_EOL . $this->_t(3) . "{";
- $query .= PHP_EOL . $this->_t(4) . "return false;";
- $query .= PHP_EOL . $this->_t(3) . "}";
+ $query .= PHP_EOL . Indent::_(6) . "{";
+ $query .= PHP_EOL . Indent::_(7) . "unset(\$items[\$nr]);";
+ $query .= PHP_EOL . Indent::_(7) . "continue;";
+ $query .= PHP_EOL . Indent::_(6) . "}";
+ $query .= PHP_EOL . Indent::_(5) . "}";
+ $query .= PHP_EOL . Indent::_(5) . "else";
+ $query .= PHP_EOL . Indent::_(5) . "{";
+ $query .= PHP_EOL . Indent::_(6) . "unset(\$items[\$nr]);";
+ $query .= PHP_EOL . Indent::_(6) . "continue;";
+ $query .= PHP_EOL . Indent::_(5) . "}";
+ $query .= PHP_EOL . Indent::_(4) . "}";
+ $query .= PHP_EOL . Indent::_(3) . "}";
+ $query .= PHP_EOL . Indent::_(3) . "else";
+ $query .= PHP_EOL . Indent::_(3) . "{";
+ $query .= PHP_EOL . Indent::_(4) . "return false;";
+ $query .= PHP_EOL . Indent::_(3) . "}";
}
// filter by child array field values
if (StringHelper::check($globalKey) && $key
&& strpos(
- $key, '-R>'
+ (string) $key, '-R>'
) === false
- && strpos($key, '-A>') !== false)
+ && strpos((string) $key, '-A>') !== false)
{
- $query .= PHP_EOL . PHP_EOL . $this->_t(3) . "//" . $this->setLine(
- __LINE__
+ $query .= PHP_EOL . PHP_EOL . Indent::_(3) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " Filter by " . $globalKey . " Array Field";
- $query .= PHP_EOL . $this->_t(3) . "\$" . $globalKey . " = \$this->"
+ $query .= PHP_EOL . Indent::_(3) . "\$" . $globalKey . " = \$this->"
. $globalKey . ";";
- $query .= PHP_EOL . $this->_t(3) . "if ("
- . $this->fileContentStatic[$this->hhh . 'Component'
- . $this->hhh] . "Helper::checkArray(\$items) && \$" . $globalKey
+ $query .= PHP_EOL . Indent::_(3) . "if ("
+ . CFactory::_('Compiler.Builder.Content.One')->get('Component') . "Helper::checkArray(\$items) && \$" . $globalKey
. ")";
- $query .= PHP_EOL . $this->_t(3) . "{";
- $query .= PHP_EOL . $this->_t(4)
+ $query .= PHP_EOL . Indent::_(3) . "{";
+ $query .= PHP_EOL . Indent::_(4)
. "foreach (\$items as \$nr => &\$item)";
- $query .= PHP_EOL . $this->_t(4) . "{";
- list($bin, $target) = explode('-A>', $key);
+ $query .= PHP_EOL . Indent::_(4) . "{";
+ list($bin, $target) = explode('-A>', (string) $key);
if (StringHelper::check($target))
{
- $query .= PHP_EOL . $this->_t(5) . "if ("
- . $this->fileContentStatic[$this->hhh . 'Component'
- . $this->hhh] . "Helper::checkJson(\$item->" . $target
- . "))";
- $query .= PHP_EOL . $this->_t(5) . "{";
- $query .= PHP_EOL . $this->_t(6) . "\$item->" . $target
+ $query .= PHP_EOL . Indent::_(5) . "if (isset(\$item->" . $target
+ . ") && " . CFactory::_('Compiler.Builder.Content.One')->get('Component')
+ . "Helper::checkJson(\$item->" . $target . "))";
+ $query .= PHP_EOL . Indent::_(5) . "{";
+ $query .= PHP_EOL . Indent::_(6) . "\$item->" . $target
. " = json_decode(\$item->" . $target . ", true);";
- $query .= PHP_EOL . $this->_t(5) . "}";
- $query .= PHP_EOL . $this->_t(5) . "elseif (!isset(\$item->"
- . $target . ") || !" . $this->fileContentStatic[$this->hhh
- . 'Component' . $this->hhh] . "Helper::checkArray(\$item->"
+ $query .= PHP_EOL . Indent::_(5) . "}";
+ $query .= PHP_EOL . Indent::_(5) . "elseif (!isset(\$item->"
+ . $target . ") || !" . CFactory::_('Compiler.Builder.Content.One')->get('Component') . "Helper::checkArray(\$item->"
. $target . "))";
- $query .= PHP_EOL . $this->_t(5) . "{";
- $query .= PHP_EOL . $this->_t(6) . "unset(\$items[\$nr]);";
- $query .= PHP_EOL . $this->_t(6) . "continue;";
- $query .= PHP_EOL . $this->_t(5) . "}";
- $query .= PHP_EOL . $this->_t(5) . "if (!in_array(\$"
+ $query .= PHP_EOL . Indent::_(5) . "{";
+ $query .= PHP_EOL . Indent::_(6) . "unset(\$items[\$nr]);";
+ $query .= PHP_EOL . Indent::_(6) . "continue;";
+ $query .= PHP_EOL . Indent::_(5) . "}";
+ $query .= PHP_EOL . Indent::_(5) . "if (!in_array(\$"
. $globalKey . ",\$item->" . $target . "))";
}
else
{
- $query .= PHP_EOL . $this->_t(5) . "if ("
- . $this->fileContentStatic[$this->hhh . 'Component'
- . $this->hhh] . "Helper::checkJson(\$item->" . $_key . "))";
- $query .= PHP_EOL . $this->_t(5) . "{";
- $query .= PHP_EOL . $this->_t(6) . "\$item->" . $_key
+ $query .= PHP_EOL . Indent::_(5) . "if (isset(\$item->" . $_key . ") && "
+ . CFactory::_('Compiler.Builder.Content.One')->get('Component') . "Helper::checkJson(\$item->" . $_key . "))";
+ $query .= PHP_EOL . Indent::_(5) . "{";
+ $query .= PHP_EOL . Indent::_(6) . "\$item->" . $_key
. " = json_decode(\$item->" . $_key . ", true);";
- $query .= PHP_EOL . $this->_t(5) . "}";
- $query .= PHP_EOL . $this->_t(5) . "elseif (!isset(\$item->"
- . $_key . ") || !" . $this->fileContentStatic[$this->hhh
- . 'Component' . $this->hhh] . "Helper::checkArray(\$item->"
+ $query .= PHP_EOL . Indent::_(5) . "}";
+ $query .= PHP_EOL . Indent::_(5) . "elseif (!isset(\$item->"
+ . $_key . ") || !" . CFactory::_('Compiler.Builder.Content.One')->get('Component') . "Helper::checkArray(\$item->"
. $_key . "))";
- $query .= PHP_EOL . $this->_t(5) . "{";
- $query .= PHP_EOL . $this->_t(6) . "unset(\$items[\$nr]);";
- $query .= PHP_EOL . $this->_t(6) . "continue;";
- $query .= PHP_EOL . $this->_t(5) . "}";
- $query .= PHP_EOL . $this->_t(5) . "if (!in_array(\$"
+ $query .= PHP_EOL . Indent::_(5) . "{";
+ $query .= PHP_EOL . Indent::_(6) . "unset(\$items[\$nr]);";
+ $query .= PHP_EOL . Indent::_(6) . "continue;";
+ $query .= PHP_EOL . Indent::_(5) . "}";
+ $query .= PHP_EOL . Indent::_(5) . "if (!in_array(\$"
. $globalKey . ",\$item->" . $_key . "))";
}
- $query .= PHP_EOL . $this->_t(5) . "{";
- $query .= PHP_EOL . $this->_t(6) . "unset(\$items[\$nr]);";
- $query .= PHP_EOL . $this->_t(6) . "continue;";
- $query .= PHP_EOL . $this->_t(5) . "}";
- $query .= PHP_EOL . $this->_t(4) . "}";
- $query .= PHP_EOL . $this->_t(3) . "}";
- $query .= PHP_EOL . $this->_t(3) . "else";
- $query .= PHP_EOL . $this->_t(3) . "{";
- $query .= PHP_EOL . $this->_t(4) . "return false;";
- $query .= PHP_EOL . $this->_t(3) . "}";
+ $query .= PHP_EOL . Indent::_(5) . "{";
+ $query .= PHP_EOL . Indent::_(6) . "unset(\$items[\$nr]);";
+ $query .= PHP_EOL . Indent::_(6) . "continue;";
+ $query .= PHP_EOL . Indent::_(5) . "}";
+ $query .= PHP_EOL . Indent::_(4) . "}";
+ $query .= PHP_EOL . Indent::_(3) . "}";
+ $query .= PHP_EOL . Indent::_(3) . "else";
+ $query .= PHP_EOL . Indent::_(3) . "{";
+ $query .= PHP_EOL . Indent::_(4) . "return false;";
+ $query .= PHP_EOL . Indent::_(3) . "}";
}
// filter by parent repetable field values
if (StringHelper::check($globalKey) && $key
&& strpos(
- $parentKey, '-R>'
+ (string) $parentKey, '-R>'
) !== false
- && strpos($parentKey, '-A>') === false)
+ && strpos((string) $parentKey, '-A>') === false)
{
- list($bin, $target) = explode('-R>', $parentKey);
- $query .= PHP_EOL . PHP_EOL . $this->_t(3) . "//" . $this->setLine(
- __LINE__
+ list($bin, $target) = explode('-R>', (string) $parentKey);
+ $query .= PHP_EOL . PHP_EOL . Indent::_(3) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " Filter by " . $_key . " Repetable Field";
- $query .= PHP_EOL . $this->_t(3) . "\$" . $globalKey
+ $query .= PHP_EOL . Indent::_(3) . "\$" . $globalKey
. " = json_decode(\$this->" . $globalKey . ",true);";
- $query .= PHP_EOL . $this->_t(3) . "if ("
- . $this->fileContentStatic[$this->hhh . 'Component'
- . $this->hhh] . "Helper::checkArray(\$items) && isset(\$"
- . $globalKey . ") && " . $this->fileContentStatic[$this->hhh
- . 'Component' . $this->hhh] . "Helper::checkArray(\$"
+ $query .= PHP_EOL . Indent::_(3) . "if ("
+ . CFactory::_('Compiler.Builder.Content.One')->get('Component') . "Helper::checkArray(\$items) && isset(\$"
+ . $globalKey . ") && " . CFactory::_('Compiler.Builder.Content.One')->get('Component') . "Helper::checkArray(\$"
. $globalKey . "))";
- $query .= PHP_EOL . $this->_t(3) . "{";
- $query .= PHP_EOL . $this->_t(4)
+ $query .= PHP_EOL . Indent::_(3) . "{";
+ $query .= PHP_EOL . Indent::_(4)
. "foreach (\$items as \$nr => &\$item)";
- $query .= PHP_EOL . $this->_t(4) . "{";
- $query .= PHP_EOL . $this->_t(5) . "if (\$item->" . $_key
+ $query .= PHP_EOL . Indent::_(4) . "{";
+ $query .= PHP_EOL . Indent::_(5) . "if (\$item->" . $_key
. " && isset(\$" . $globalKey . "['" . $target . "']) && "
- . $this->fileContentStatic[$this->hhh . 'Component'
- . $this->hhh] . "Helper::checkArray(\$" . $globalKey . "['"
+ . CFactory::_('Compiler.Builder.Content.One')->get('Component') . "Helper::checkArray(\$" . $globalKey . "['"
. $target . "']))";
- $query .= PHP_EOL . $this->_t(5) . "{";
- $query .= PHP_EOL . $this->_t(6) . "if (!in_array(\$item->" . $_key
+ $query .= PHP_EOL . Indent::_(5) . "{";
+ $query .= PHP_EOL . Indent::_(6) . "if (!in_array(\$item->" . $_key
. ",\$" . $globalKey . "['" . $target . "']))";
- $query .= PHP_EOL . $this->_t(6) . "{";
- $query .= PHP_EOL . $this->_t(7) . "unset(\$items[\$nr]);";
- $query .= PHP_EOL . $this->_t(7) . "continue;";
- $query .= PHP_EOL . $this->_t(6) . "}";
- $query .= PHP_EOL . $this->_t(5) . "}";
- $query .= PHP_EOL . $this->_t(5) . "else";
- $query .= PHP_EOL . $this->_t(5) . "{";
- $query .= PHP_EOL . $this->_t(6) . "unset(\$items[\$nr]);";
- $query .= PHP_EOL . $this->_t(6) . "continue;";
- $query .= PHP_EOL . $this->_t(5) . "}";
- $query .= PHP_EOL . $this->_t(4) . "}";
- $query .= PHP_EOL . $this->_t(3) . "}";
- $query .= PHP_EOL . $this->_t(3) . "else";
- $query .= PHP_EOL . $this->_t(3) . "{";
- $query .= PHP_EOL . $this->_t(4) . "return false;";
- $query .= PHP_EOL . $this->_t(3) . "}";
+ $query .= PHP_EOL . Indent::_(6) . "{";
+ $query .= PHP_EOL . Indent::_(7) . "unset(\$items[\$nr]);";
+ $query .= PHP_EOL . Indent::_(7) . "continue;";
+ $query .= PHP_EOL . Indent::_(6) . "}";
+ $query .= PHP_EOL . Indent::_(5) . "}";
+ $query .= PHP_EOL . Indent::_(5) . "else";
+ $query .= PHP_EOL . Indent::_(5) . "{";
+ $query .= PHP_EOL . Indent::_(6) . "unset(\$items[\$nr]);";
+ $query .= PHP_EOL . Indent::_(6) . "continue;";
+ $query .= PHP_EOL . Indent::_(5) . "}";
+ $query .= PHP_EOL . Indent::_(4) . "}";
+ $query .= PHP_EOL . Indent::_(3) . "}";
+ $query .= PHP_EOL . Indent::_(3) . "else";
+ $query .= PHP_EOL . Indent::_(3) . "{";
+ $query .= PHP_EOL . Indent::_(4) . "return false;";
+ $query .= PHP_EOL . Indent::_(3) . "}";
}
// filter by parent array field values
if (StringHelper::check($globalKey) && $key
&& strpos(
- $parentKey, '-R>'
+ (string) $parentKey, '-R>'
) === false
- && strpos($parentKey, '-A>') !== false)
+ && strpos((string) $parentKey, '-A>') !== false)
{
- $query .= PHP_EOL . PHP_EOL . $this->_t(3) . "//" . $this->setLine(
- __LINE__
+ $query .= PHP_EOL . PHP_EOL . Indent::_(3) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " Filter by " . $globalKey . " Array Field";
- $query .= PHP_EOL . $this->_t(3) . "\$" . $globalKey . " = \$this->"
+ $query .= PHP_EOL . Indent::_(3) . "\$" . $globalKey . " = \$this->"
. $globalKey . ";";
- $query .= PHP_EOL . $this->_t(3) . "if ("
- . $this->fileContentStatic[$this->hhh . 'Component'
- . $this->hhh] . "Helper::checkArray(\$items) && "
- . $this->fileContentStatic[$this->hhh . 'Component'
- . $this->hhh] . "Helper::checkArray(\$" . $globalKey . "))";
- $query .= PHP_EOL . $this->_t(3) . "{";
- $query .= PHP_EOL . $this->_t(4)
+ $query .= PHP_EOL . Indent::_(3) . "if ("
+ . CFactory::_('Compiler.Builder.Content.One')->get('Component') . "Helper::checkArray(\$items) && "
+ . CFactory::_('Compiler.Builder.Content.One')->get('Component') . "Helper::checkArray(\$" . $globalKey . "))";
+ $query .= PHP_EOL . Indent::_(3) . "{";
+ $query .= PHP_EOL . Indent::_(4)
. "foreach (\$items as \$nr => &\$item)";
- $query .= PHP_EOL . $this->_t(4) . "{";
- list($bin, $target) = explode('-A>', $parentKey);
+ $query .= PHP_EOL . Indent::_(4) . "{";
+ list($bin, $target) = explode('-A>', (string) $parentKey);
if (StringHelper::check($target))
{
- $query .= PHP_EOL . $this->_t(5) . "if (\$item->" . $_key
- . " && " . $this->fileContentStatic[$this->hhh . 'Component'
- . $this->hhh] . "Helper::checkArray(\$" . $globalKey . "['"
+ $query .= PHP_EOL . Indent::_(5) . "if (\$item->" . $_key
+ . " && " . CFactory::_('Compiler.Builder.Content.One')->get('Component') . "Helper::checkArray(\$" . $globalKey . "['"
. $target . "']))";
- $query .= PHP_EOL . $this->_t(5) . "{";
- $query .= PHP_EOL . $this->_t(6) . "if (!in_array(\$item->"
+ $query .= PHP_EOL . Indent::_(5) . "{";
+ $query .= PHP_EOL . Indent::_(6) . "if (!in_array(\$item->"
. $_key . ",\$" . $globalKey . "['" . $target . "']))";
}
else
{
- $query .= PHP_EOL . $this->_t(5) . "if (\$item->" . $_key . ")";
- $query .= PHP_EOL . $this->_t(5) . "{";
- $query .= PHP_EOL . $this->_t(6) . "if (!in_array(\$item->"
+ $query .= PHP_EOL . Indent::_(5) . "if (\$item->" . $_key . ")";
+ $query .= PHP_EOL . Indent::_(5) . "{";
+ $query .= PHP_EOL . Indent::_(6) . "if (!in_array(\$item->"
. $_key . ",\$" . $globalKey . "))";
}
- $query .= PHP_EOL . $this->_t(6) . "{";
- $query .= PHP_EOL . $this->_t(7) . "unset(\$items[\$nr]);";
- $query .= PHP_EOL . $this->_t(7) . "continue;";
- $query .= PHP_EOL . $this->_t(6) . "}";
- $query .= PHP_EOL . $this->_t(5) . "}";
- $query .= PHP_EOL . $this->_t(5) . "else";
- $query .= PHP_EOL . $this->_t(5) . "{";
- $query .= PHP_EOL . $this->_t(6) . "unset(\$items[\$nr]);";
- $query .= PHP_EOL . $this->_t(6) . "continue;";
- $query .= PHP_EOL . $this->_t(5) . "}";
- $query .= PHP_EOL . $this->_t(4) . "}";
- $query .= PHP_EOL . $this->_t(3) . "}";
- $query .= PHP_EOL . $this->_t(3) . "else";
- $query .= PHP_EOL . $this->_t(3) . "{";
- $query .= PHP_EOL . $this->_t(4) . "return false;";
- $query .= PHP_EOL . $this->_t(3) . "}";
+ $query .= PHP_EOL . Indent::_(6) . "{";
+ $query .= PHP_EOL . Indent::_(7) . "unset(\$items[\$nr]);";
+ $query .= PHP_EOL . Indent::_(7) . "continue;";
+ $query .= PHP_EOL . Indent::_(6) . "}";
+ $query .= PHP_EOL . Indent::_(5) . "}";
+ $query .= PHP_EOL . Indent::_(5) . "else";
+ $query .= PHP_EOL . Indent::_(5) . "{";
+ $query .= PHP_EOL . Indent::_(6) . "unset(\$items[\$nr]);";
+ $query .= PHP_EOL . Indent::_(6) . "continue;";
+ $query .= PHP_EOL . Indent::_(5) . "}";
+ $query .= PHP_EOL . Indent::_(4) . "}";
+ $query .= PHP_EOL . Indent::_(3) . "}";
+ $query .= PHP_EOL . Indent::_(3) . "else";
+ $query .= PHP_EOL . Indent::_(3) . "{";
+ $query .= PHP_EOL . Indent::_(4) . "return false;";
+ $query .= PHP_EOL . Indent::_(3) . "}";
}
// add custom php to getitems method after all
- $query .= $this->getCustomScriptBuilder(
+ $query .= CFactory::_('Customcode.Dispenser')->get(
'php_getitems_after_all', $nameSingleCode,
- PHP_EOL . PHP_EOL . $this->_t(1)
+ PHP_EOL . PHP_EOL . Indent::_(1)
);
- $query .= PHP_EOL . $this->_t(3) . "return \$items;";
- $query .= PHP_EOL . $this->_t(2) . "}";
- $query .= PHP_EOL . $this->_t(2) . "return false;";
- $query .= PHP_EOL . $this->_t(1) . "}";
+ $query .= PHP_EOL . Indent::_(3) . "return \$items;";
+ $query .= PHP_EOL . Indent::_(2) . "}";
+ $query .= PHP_EOL . Indent::_(2) . "return false;";
+ $query .= PHP_EOL . Indent::_(1) . "}";
// SELECTIONTRANSLATIONFIXFUNC<<>>
$query .= $this->setSelectionTranslationFixFunc(
$nameListCode,
- $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh]
+ CFactory::_('Compiler.Builder.Content.One')->get('Component')
);
// fixe mothod name clash
@@ -15142,24 +14156,24 @@ class Interpretation extends Fields
{
// Load to lang
$keyLang = $this->langPrefix . '_' . $custom_button['NAME'];
- $this->setLangContent(
- $this->lang, $keyLang, StringHelper::safe(
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $keyLang, StringHelper::safe(
$custom_button['name'], 'Ww'
)
);
// add cpanel button
- $buttons[] = $this->_t(2) . "if (\$this->canDo->get('"
+ $buttons[] = Indent::_(2) . "if (\$this->canDo->get('"
. $custom_button['link'] . ".access'))";
- $buttons[] = $this->_t(2) . "{";
- $buttons[] = $this->_t(3) . "//" . $this->setLine(__LINE__)
+ $buttons[] = Indent::_(2) . "{";
+ $buttons[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " add " . $custom_button['name'] . " button.";
- $buttons[] = $this->_t(3) . "JToolBarHelper::custom('"
+ $buttons[] = Indent::_(3) . "JToolBarHelper::custom('"
. $nameListCode . ".redirectTo"
. StringHelper::safe(
$custom_button['link'], 'F'
) . "', '" . $custom_button['icon'] . "', '', '" . $keyLang
. "', true);";
- $buttons[] = $this->_t(2) . "}";
+ $buttons[] = Indent::_(2) . "}";
}
if (ArrayHelper::check($buttons))
{
@@ -15190,59 +14204,59 @@ class Interpretation extends Fields
)
{
// add the custom redirect method
- $method[] = PHP_EOL . PHP_EOL . $this->_t(1)
+ $method[] = PHP_EOL . PHP_EOL . Indent::_(1)
. "public function redirectTo"
. StringHelper::safe(
$custom_button['link'], 'F'
) . "()";
- $method[] = $this->_t(1) . "{";
- $method[] = $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $method[] = Indent::_(1) . "{";
+ $method[] = Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " Check for request forgeries";
- $method[] = $this->_t(2)
+ $method[] = Indent::_(2)
. "JSession::checkToken() or die(JText:"
. ":_('JINVALID_TOKEN'));";
- $method[] = $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $method[] = Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " check if export is allowed for this user.";
- $method[] = $this->_t(2) . "\$user = JFactory::getUser();";
- $method[] = $this->_t(2) . "if (\$user->authorise('"
+ $method[] = Indent::_(2) . "\$user = JFactory::getUser();";
+ $method[] = Indent::_(2) . "if (\$user->authorise('"
. $custom_button['link'] . ".access', 'com_"
- . $this->componentCodeName . "'))";
- $method[] = $this->_t(2) . "{";
- $method[] = $this->_t(3) . "//" . $this->setLine(__LINE__)
+ . CFactory::_('Config')->component_code_name . "'))";
+ $method[] = Indent::_(2) . "{";
+ $method[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " Get the input";
- $method[] = $this->_t(3)
+ $method[] = Indent::_(3)
. "\$input = JFactory::getApplication()->input;";
- $method[] = $this->_t(3)
+ $method[] = Indent::_(3)
. "\$pks = \$input->post->get('cid', array(), 'array');";
- $method[] = $this->_t(3) . "//" . $this->setLine(__LINE__)
+ $method[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " Sanitize the input";
- $method[] = $this->_t(3)
+ $method[] = Indent::_(3)
. "\$pks = ArrayHelper::toInteger(\$pks);";
- $method[] = $this->_t(3) . "//" . $this->setLine(__LINE__)
+ $method[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " convert to string";
- $method[] = $this->_t(3) . "\$ids = implode('_', \$pks);";
- $method[] = $this->_t(3)
+ $method[] = Indent::_(3) . "\$ids = implode('_', \$pks);";
+ $method[] = Indent::_(3)
. "\$this->setRedirect(JRoute::_('index.php?option=com_"
- . $this->componentCodeName . "&view="
+ . CFactory::_('Config')->component_code_name . "&view="
. $custom_button['link'] . "&cid='.\$ids, false));";
- $method[] = $this->_t(3) . "return;";
- $method[] = $this->_t(2) . "}";
- $method[] = $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $method[] = Indent::_(3) . "return;";
+ $method[] = Indent::_(2) . "}";
+ $method[] = Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " Redirect to the list screen with error.";
- $method[] = $this->_t(2) . "\$message = JText:" . ":_('"
+ $method[] = Indent::_(2) . "\$message = JText:" . ":_('"
. $this->langPrefix . "_ACCESS_TO_" . $custom_button['NAME']
. "_FAILED');";
- $method[] = $this->_t(2)
+ $method[] = Indent::_(2)
. "\$this->setRedirect(JRoute::_('index.php?option=com_"
- . $this->componentCodeName . "&view=" . $nameListCode
+ . CFactory::_('Config')->component_code_name . "&view=" . $nameListCode
. "', false), \$message, 'error');";
- $method[] = $this->_t(2) . "return;";
- $method[] = $this->_t(1) . "}";
+ $method[] = Indent::_(2) . "return;";
+ $method[] = Indent::_(1) . "}";
// add to lang array
$lankey = $this->langPrefix . "_ACCESS_TO_"
. $custom_button['NAME'] . "_FAILED";
- $this->setLangContent(
- $this->lang, $lankey,
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lankey,
'Access to ' . $custom_button['link'] . ' was denied.'
);
}
@@ -15265,8 +14279,8 @@ class Interpretation extends Fields
public function setGetItemsModelMethod(&$nameSingleCode, &$nameListCode,
$config
= array('functionName' => 'getExportData',
- 'docDesc' => 'Method to get list export data.',
- 'type' => 'export')
+ 'docDesc' => 'Method to get list export data.',
+ 'type' => 'export')
)
{
// start the query string
@@ -15278,109 +14292,107 @@ class Interpretation extends Fields
&& $this->eximportView[$nameListCode])
|| !$isExport)
{
- $query = PHP_EOL . PHP_EOL . $this->_t(1) . "/**";
- $query .= PHP_EOL . $this->_t(1) . " * " . $config['docDesc'];
- $query .= PHP_EOL . $this->_t(1) . " *";
- $query .= PHP_EOL . $this->_t(1)
+ $query = PHP_EOL . PHP_EOL . Indent::_(1) . "/**";
+ $query .= PHP_EOL . Indent::_(1) . " * " . $config['docDesc'];
+ $query .= PHP_EOL . Indent::_(1) . " *";
+ $query .= PHP_EOL . Indent::_(1)
. " * @param array \$pks The ids of the items to get";
- $query .= PHP_EOL . $this->_t(1)
+ $query .= PHP_EOL . Indent::_(1)
. " * @param JUser \$user The user making the request";
- $query .= PHP_EOL . $this->_t(1) . " *";
- $query .= PHP_EOL . $this->_t(1)
+ $query .= PHP_EOL . Indent::_(1) . " *";
+ $query .= PHP_EOL . Indent::_(1)
. " * @return mixed An array of data items on success, false on failure.";
- $query .= PHP_EOL . $this->_t(1) . " */";
- $query .= PHP_EOL . $this->_t(1) . "public function "
+ $query .= PHP_EOL . Indent::_(1) . " */";
+ $query .= PHP_EOL . Indent::_(1) . "public function "
. $config['functionName'] . "(\$pks, \$user = null)";
- $query .= PHP_EOL . $this->_t(1) . "{";
- $query .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $query .= PHP_EOL . Indent::_(1) . "{";
+ $query .= PHP_EOL . Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " setup the query";
- $query .= PHP_EOL . $this->_t(2) . "if ((\$pks_size = "
- . $this->fileContentStatic[$this->hhh . 'Component'
- . $this->hhh]
+ $query .= PHP_EOL . Indent::_(2) . "if ((\$pks_size = "
+ . CFactory::_('Compiler.Builder.Content.One')->get('Component')
. "Helper::checkArray(\$pks)) !== false || 'bulk' === \$pks)";
- $query .= PHP_EOL . $this->_t(2) . "{";
- $query .= PHP_EOL . $this->_t(3) . "//" . $this->setLine(__LINE__)
+ $query .= PHP_EOL . Indent::_(2) . "{";
+ $query .= PHP_EOL . Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " Set a value to know this is " . $config['type']
. " method. (USE IN CUSTOM CODE TO ALTER OUTCOME)";
- $query .= PHP_EOL . $this->_t(3) . "\$_" . $config['type']
+ $query .= PHP_EOL . Indent::_(3) . "\$_" . $config['type']
. " = true;";
- $query .= PHP_EOL . $this->_t(3) . "//" . $this->setLine(__LINE__)
+ $query .= PHP_EOL . Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " Get the user object if not set.";
- $query .= PHP_EOL . $this->_t(3) . "if (!isset(\$user) || !"
- . $this->fileContentStatic[$this->hhh . 'Component'
- . $this->hhh] . "Helper::checkObject(\$user))";
- $query .= PHP_EOL . $this->_t(3) . "{";
- $query .= PHP_EOL . $this->_t(4) . "\$user = JFactory::getUser();";
- $query .= PHP_EOL . $this->_t(3) . "}";
- $query .= PHP_EOL . $this->_t(3) . "//" . $this->setLine(__LINE__)
+ $query .= PHP_EOL . Indent::_(3) . "if (!isset(\$user) || !"
+ . CFactory::_('Compiler.Builder.Content.One')->get('Component') . "Helper::checkObject(\$user))";
+ $query .= PHP_EOL . Indent::_(3) . "{";
+ $query .= PHP_EOL . Indent::_(4) . "\$user = JFactory::getUser();";
+ $query .= PHP_EOL . Indent::_(3) . "}";
+ $query .= PHP_EOL . Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " Create a new query object.";
- $query .= PHP_EOL . $this->_t(3) . "\$db = JFactory::getDBO();";
- $query .= PHP_EOL . $this->_t(3)
+ $query .= PHP_EOL . Indent::_(3) . "\$db = JFactory::getDBO();";
+ $query .= PHP_EOL . Indent::_(3)
. "\$query = \$db->getQuery(true);";
- $query .= PHP_EOL . PHP_EOL . $this->_t(3) . "//" . $this->setLine(
- __LINE__
+ $query .= PHP_EOL . PHP_EOL . Indent::_(3) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " Select some fields";
- $query .= PHP_EOL . $this->_t(3) . "\$query->select('a.*');";
- $query .= PHP_EOL . PHP_EOL . $this->_t(3) . "//" . $this->setLine(
- __LINE__
- ) . " From the " . $this->componentCodeName . "_"
+ $query .= PHP_EOL . Indent::_(3) . "\$query->select('a.*');";
+ $query .= PHP_EOL . PHP_EOL . Indent::_(3) . "//" . Line::_(
+ __LINE__,__CLASS__
+ ) . " From the " . CFactory::_('Config')->component_code_name . "_"
. $nameSingleCode . " table";
- $query .= PHP_EOL . $this->_t(3)
+ $query .= PHP_EOL . Indent::_(3)
. "\$query->from(\$db->quoteName('#__"
- . $this->componentCodeName . "_" . $nameSingleCode
+ . CFactory::_('Config')->component_code_name . "_" . $nameSingleCode
. "', 'a'));";
- $query .= PHP_EOL . $this->_t(3) . "//" . $this->setLine(__LINE__)
+ $query .= PHP_EOL . Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " The bulk export path";
- $query .= PHP_EOL . $this->_t(3) . "if ('bulk' === \$pks)";
- $query .= PHP_EOL . $this->_t(3)
+ $query .= PHP_EOL . Indent::_(3) . "if ('bulk' === \$pks)";
+ $query .= PHP_EOL . Indent::_(3)
. "{";
- $query .= PHP_EOL . $this->_t(4)
+ $query .= PHP_EOL . Indent::_(4)
. "\$query->where('a.id > 0');";
- $query .= PHP_EOL . $this->_t(3)
+ $query .= PHP_EOL . Indent::_(3)
. "}";
- $query .= PHP_EOL . $this->_t(3) . "//" . $this->setLine(__LINE__)
+ $query .= PHP_EOL . Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " A large array of ID's will not work out well";
- $query .= PHP_EOL . $this->_t(3) . "elseif (\$pks_size > 500)";
- $query .= PHP_EOL . $this->_t(3)
+ $query .= PHP_EOL . Indent::_(3) . "elseif (\$pks_size > 500)";
+ $query .= PHP_EOL . Indent::_(3)
. "{";
- $query .= PHP_EOL . $this->_t(4) . "//" . $this->setLine(__LINE__)
+ $query .= PHP_EOL . Indent::_(4) . "//" . Line::_(__Line__, __Class__)
. " Use lowest ID";
- $query .= PHP_EOL . $this->_t(4)
+ $query .= PHP_EOL . Indent::_(4)
. "\$query->where('a.id >= ' . (int) min(\$pks));";
- $query .= PHP_EOL . $this->_t(4) . "//" . $this->setLine(__LINE__)
+ $query .= PHP_EOL . Indent::_(4) . "//" . Line::_(__Line__, __Class__)
. " Use highest ID";
- $query .= PHP_EOL . $this->_t(4)
+ $query .= PHP_EOL . Indent::_(4)
. "\$query->where('a.id <= ' . (int) max(\$pks));";
- $query .= PHP_EOL . $this->_t(3)
+ $query .= PHP_EOL . Indent::_(3)
. "}";
- $query .= PHP_EOL . $this->_t(3) . "//" . $this->setLine(__LINE__)
+ $query .= PHP_EOL . Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " The normal default path";
- $query .= PHP_EOL . $this->_t(3) . "else";
- $query .= PHP_EOL . $this->_t(3)
+ $query .= PHP_EOL . Indent::_(3) . "else";
+ $query .= PHP_EOL . Indent::_(3)
. "{";
- $query .= PHP_EOL . $this->_t(4)
+ $query .= PHP_EOL . Indent::_(4)
. "\$query->where('a.id IN (' . implode(',',\$pks) . ')');";
- $query .= PHP_EOL . $this->_t(3)
+ $query .= PHP_EOL . Indent::_(3)
. "}";
// add custom filtering php
- $query .= $this->getCustomScriptBuilder(
+ $query .= CFactory::_('Customcode.Dispenser')->get(
'php_getlistquery', $nameSingleCode,
- PHP_EOL . PHP_EOL . $this->_t(1)
+ PHP_EOL . PHP_EOL . Indent::_(1)
);
// first check if we export of text only is avalable
if ($this->exportTextOnly)
{
// add switch
- $query .= PHP_EOL . $this->_t(3) . "//" . $this->setLine(
- __LINE__
+ $query .= PHP_EOL . Indent::_(3) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " Get global switch to activate text only export";
- $query .= PHP_EOL . $this->_t(3)
+ $query .= PHP_EOL . Indent::_(3)
. "\$export_text_only = JComponentHelper::getParams('com_"
- . $this->componentCodeName
+ . CFactory::_('Config')->component_code_name
. "')->get('export_text_only', 0);";
// first check if we have custom queries
$custom_query = $this->setCustomQuery(
- $nameListCode, $nameSingleCode, $this->_t(2), true
+ $nameListCode, $nameSingleCode, Indent::_(2), true
);
}
// if values were returned add the area
@@ -15389,33 +14401,30 @@ class Interpretation extends Fields
$custom_query
))
{
- $query .= PHP_EOL . $this->_t(3) . "//" . $this->setLine(
- __LINE__
+ $query .= PHP_EOL . Indent::_(3) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " Add these queries only if text only is required";
- $query .= PHP_EOL . $this->_t(3) . "if (\$export_text_only)";
- $query .= PHP_EOL . $this->_t(3) . "{";
+ $query .= PHP_EOL . Indent::_(3) . "if (\$export_text_only)";
+ $query .= PHP_EOL . Indent::_(3) . "{";
// add the custom fields query
$query .= $custom_query;
- $query .= PHP_EOL . $this->_t(3) . "}";
+ $query .= PHP_EOL . Indent::_(3) . "}";
}
// add access levels if the view has access set
- if (isset($this->accessBuilder[$nameSingleCode])
- && StringHelper::check(
- $this->accessBuilder[$nameSingleCode]
- ))
+ if (CFactory::_('Compiler.Builder.Access.Switch')->exists($nameSingleCode))
{
- $query .= PHP_EOL . $this->_t(3) . "//" . $this->setLine(
- __LINE__
+ $query .= PHP_EOL . Indent::_(3) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " Implement View Level Access";
- $query .= PHP_EOL . $this->_t(3)
+ $query .= PHP_EOL . Indent::_(3)
. "if (!\$user->authorise('core.options', 'com_"
- . $this->componentCodeName . "'))";
- $query .= PHP_EOL . $this->_t(3) . "{";
- $query .= PHP_EOL . $this->_t(4)
+ . CFactory::_('Config')->component_code_name . "'))";
+ $query .= PHP_EOL . Indent::_(3) . "{";
+ $query .= PHP_EOL . Indent::_(4)
. "\$groups = implode(',', \$user->getAuthorisedViewLevels());";
- $query .= PHP_EOL . $this->_t(4)
+ $query .= PHP_EOL . Indent::_(4)
. "\$query->where('a.access IN (' . \$groups . ')');";
- $query .= PHP_EOL . $this->_t(3) . "}";
+ $query .= PHP_EOL . Indent::_(3) . "}";
}
// add dynamic ordering (Exported data)
if (isset($this->viewsDefaultOrdering[$nameListCode])
@@ -15427,15 +14436,15 @@ class Interpretation extends Fields
as $order_field
)
{
- if (($order_field_name = $this->getFieldDatabaseName(
+ if (($order_field_name = CFactory::_('Field.Database.Name')->get(
$nameListCode, $order_field['field']
)) !== false)
{
- $query .= PHP_EOL . PHP_EOL . $this->_t(3) . "//"
- . $this->setLine(
- __LINE__
+ $query .= PHP_EOL . PHP_EOL . Indent::_(3) . "//"
+ . Line::_(
+ __LINE__,__CLASS__
) . " Order the results by ordering";
- $query .= PHP_EOL . $this->_t(3)
+ $query .= PHP_EOL . Indent::_(3)
. "\$query->order('"
. $order_field_name . " "
. $order_field['direction'] . "');";
@@ -15444,80 +14453,79 @@ class Interpretation extends Fields
}
else
{
- $query .= PHP_EOL . PHP_EOL . $this->_t(3) . "//"
- . $this->setLine(
- __LINE__
+ $query .= PHP_EOL . PHP_EOL . Indent::_(3) . "//"
+ . Line::_(
+ __LINE__,__CLASS__
) . " Order the results by ordering";
- $query .= PHP_EOL . $this->_t(3)
+ $query .= PHP_EOL . Indent::_(3)
. "\$query->order('a.ordering ASC');";
}
- $query .= PHP_EOL . PHP_EOL . $this->_t(3) . "//" . $this->setLine(
- __LINE__
+ $query .= PHP_EOL . PHP_EOL . Indent::_(3) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " Load the items";
- $query .= PHP_EOL . $this->_t(3) . "\$db->setQuery(\$query);";
- $query .= PHP_EOL . $this->_t(3) . "\$db->execute();";
- $query .= PHP_EOL . $this->_t(3) . "if (\$db->getNumRows())";
- $query .= PHP_EOL . $this->_t(3) . "{";
- $query .= PHP_EOL . $this->_t(4)
+ $query .= PHP_EOL . Indent::_(3) . "\$db->setQuery(\$query);";
+ $query .= PHP_EOL . Indent::_(3) . "\$db->execute();";
+ $query .= PHP_EOL . Indent::_(3) . "if (\$db->getNumRows())";
+ $query .= PHP_EOL . Indent::_(3) . "{";
+ $query .= PHP_EOL . Indent::_(4)
. "\$items = \$db->loadObjectList();";
// set the string fixing code
$query .= $this->setGetItemsMethodStringFix(
$nameSingleCode, $nameListCode,
- $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh],
- $this->_t(2), $isExport, true
+ CFactory::_('Compiler.Builder.Content.One')->get('Component'),
+ Indent::_(2), $isExport, true
);
// first check if we export of text only is avalable
if ($this->exportTextOnly)
{
$query_translations = $this->setSelectionTranslationFix(
$nameListCode,
- $this->fileContentStatic[$this->hhh . 'Component'
- . $this->hhh], $this->_t(3)
+ CFactory::_('Compiler.Builder.Content.One')->get('Component'), Indent::_(3)
);
}
// add translations
if (isset($query_translations)
&& StringHelper::check($query_translations))
{
- $query .= PHP_EOL . $this->_t(3) . "//" . $this->setLine(
- __LINE__
+ $query .= PHP_EOL . Indent::_(3) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " Add these translation only if text only is required";
- $query .= PHP_EOL . $this->_t(3) . "if (\$export_text_only)";
- $query .= PHP_EOL . $this->_t(3) . "{";
+ $query .= PHP_EOL . Indent::_(3) . "if (\$export_text_only)";
+ $query .= PHP_EOL . Indent::_(3) . "{";
$query .= $query_translations;
- $query .= PHP_EOL . $this->_t(3) . "}";
+ $query .= PHP_EOL . Indent::_(3) . "}";
}
// add custom php to getItems method after all
- $query .= $this->getCustomScriptBuilder(
+ $query .= CFactory::_('Customcode.Dispenser')->get(
'php_getitems_after_all', $nameSingleCode,
- PHP_EOL . PHP_EOL . $this->_t(2)
+ PHP_EOL . PHP_EOL . Indent::_(2)
);
// in privacy export we must return array of arrays
if ('privacy' === $config['type'])
{
- $query .= PHP_EOL . $this->_t(4)
+ $query .= PHP_EOL . Indent::_(4)
. "return json_decode(json_encode(\$items), true);";
}
else
{
- $query .= PHP_EOL . $this->_t(4) . "return \$items;";
+ $query .= PHP_EOL . Indent::_(4) . "return \$items;";
}
- $query .= PHP_EOL . $this->_t(3) . "}";
- $query .= PHP_EOL . $this->_t(2) . "}";
- $query .= PHP_EOL . $this->_t(2) . "return false;";
- $query .= PHP_EOL . $this->_t(1) . "}";
+ $query .= PHP_EOL . Indent::_(3) . "}";
+ $query .= PHP_EOL . Indent::_(2) . "}";
+ $query .= PHP_EOL . Indent::_(2) . "return false;";
+ $query .= PHP_EOL . Indent::_(1) . "}";
// get the header script
if ($isExport)
{
$header = ComponentbuilderHelper::getDynamicScripts('headers');
// add getExImPortHeaders
- $query .= $this->getCustomScriptBuilder(
+ $query .= CFactory::_('Customcode.Dispenser')->get(
'php_import_headers', 'import_' . $nameListCode,
PHP_EOL . PHP_EOL, null, true,
// set a default script for those with no custom script
- PHP_EOL . PHP_EOL . $this->setPlaceholders(
- $header, $this->placeholders
+ PHP_EOL . PHP_EOL . CFactory::_('Placeholder')->update_(
+ $header
)
);
}
@@ -15537,150 +14545,147 @@ class Interpretation extends Fields
$method = array();
// add the export method
- $method[] = PHP_EOL . PHP_EOL . $this->_t(1)
+ $method[] = PHP_EOL . PHP_EOL . Indent::_(1)
. "public function exportData()";
- $method[] = $this->_t(1) . "{";
- $method[] = $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $method[] = Indent::_(1) . "{";
+ $method[] = Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " Check for request forgeries";
- $method[] = $this->_t(2) . "JSession::checkToken() or die(JText:"
+ $method[] = Indent::_(2) . "JSession::checkToken() or die(JText:"
. ":_('JINVALID_TOKEN'));";
- $method[] = $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $method[] = Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " check if export is allowed for this user.";
- $method[] = $this->_t(2) . "\$user = JFactory::getUser();";
- $method[] = $this->_t(2) . "if (\$user->authorise('"
+ $method[] = Indent::_(2) . "\$user = JFactory::getUser();";
+ $method[] = Indent::_(2) . "if (\$user->authorise('"
. $nameSingleCode . ".export', 'com_"
- . $this->componentCodeName
+ . CFactory::_('Config')->component_code_name
. "') && \$user->authorise('core.export', 'com_"
- . $this->componentCodeName . "'))";
- $method[] = $this->_t(2) . "{";
- $method[] = $this->_t(3) . "//" . $this->setLine(__LINE__)
+ . CFactory::_('Config')->component_code_name . "'))";
+ $method[] = Indent::_(2) . "{";
+ $method[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " Get the input";
- $method[] = $this->_t(3)
+ $method[] = Indent::_(3)
. "\$input = JFactory::getApplication()->input;";
- $method[] = $this->_t(3)
+ $method[] = Indent::_(3)
. "\$pks = \$input->post->get('cid', array(), 'array');";
- $method[] = $this->_t(3) . "//" . $this->setLine(__LINE__)
+ $method[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " Sanitize the input";
- $method[] = $this->_t(3) . "\$pks = ArrayHelper::toInteger(\$pks);";
- $method[] = $this->_t(3) . "//" . $this->setLine(__LINE__)
+ $method[] = Indent::_(3) . "\$pks = ArrayHelper::toInteger(\$pks);";
+ $method[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " Get the model";
- $method[] = $this->_t(3) . "\$model = \$this->getModel('"
+ $method[] = Indent::_(3) . "\$model = \$this->getModel('"
. StringHelper::safe($nameListCode, 'F')
. "');";
- $method[] = $this->_t(3) . "//" . $this->setLine(__LINE__)
+ $method[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " get the data to export";
- $method[] = $this->_t(3)
+ $method[] = Indent::_(3)
. "\$data = \$model->getExportData(\$pks);";
- $method[] = $this->_t(3) . "if ("
- . $this->fileContentStatic[$this->hhh . 'Component'
- . $this->hhh] . "Helper::checkArray(\$data))";
- $method[] = $this->_t(3) . "{";
- $method[] = $this->_t(4) . "//" . $this->setLine(__LINE__)
+ $method[] = Indent::_(3) . "if ("
+ . CFactory::_('Compiler.Builder.Content.One')->get('Component') . "Helper::checkArray(\$data))";
+ $method[] = Indent::_(3) . "{";
+ $method[] = Indent::_(4) . "//" . Line::_(__Line__, __Class__)
. " now set the data to the spreadsheet";
- $method[] = $this->_t(4) . "\$date = JFactory::getDate();";
- $method[] = $this->_t(4) . $this->fileContentStatic[$this->hhh
- . 'Component' . $this->hhh] . "Helper::xls(\$data,'"
+ $method[] = Indent::_(4) . "\$date = JFactory::getDate();";
+ $method[] = Indent::_(4) . CFactory::_('Compiler.Builder.Content.One')->get('Component') . "Helper::xls(\$data,'"
. StringHelper::safe($nameListCode, 'F')
. "_'.\$date->format('jS_F_Y'),'"
. StringHelper::safe($nameListCode, 'Ww')
. " exported ('.\$date->format('jS F, Y').')','"
. StringHelper::safe($nameListCode, 'w')
. "');";
- $method[] = $this->_t(3) . "}";
- $method[] = $this->_t(2) . "}";
- $method[] = $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $method[] = Indent::_(3) . "}";
+ $method[] = Indent::_(2) . "}";
+ $method[] = Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " Redirect to the list screen with error.";
- $method[] = $this->_t(2) . "\$message = JText:" . ":_('"
+ $method[] = Indent::_(2) . "\$message = JText:" . ":_('"
. $this->langPrefix . "_EXPORT_FAILED');";
- $method[] = $this->_t(2)
+ $method[] = Indent::_(2)
. "\$this->setRedirect(JRoute::_('index.php?option=com_"
- . $this->componentCodeName . "&view=" . $nameListCode
+ . CFactory::_('Config')->component_code_name . "&view=" . $nameListCode
. "', false), \$message, 'error');";
- $method[] = $this->_t(2) . "return;";
- $method[] = $this->_t(1) . "}";
+ $method[] = Indent::_(2) . "return;";
+ $method[] = Indent::_(1) . "}";
// add the import method
- $method[] = PHP_EOL . PHP_EOL . $this->_t(1)
+ $method[] = PHP_EOL . PHP_EOL . Indent::_(1)
. "public function importData()";
- $method[] = $this->_t(1) . "{";
- $method[] = $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $method[] = Indent::_(1) . "{";
+ $method[] = Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " Check for request forgeries";
- $method[] = $this->_t(2) . "JSession::checkToken() or die(JText:"
+ $method[] = Indent::_(2) . "JSession::checkToken() or die(JText:"
. ":_('JINVALID_TOKEN'));";
- $method[] = $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $method[] = Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " check if import is allowed for this user.";
- $method[] = $this->_t(2) . "\$user = JFactory::getUser();";
- $method[] = $this->_t(2) . "if (\$user->authorise('"
+ $method[] = Indent::_(2) . "\$user = JFactory::getUser();";
+ $method[] = Indent::_(2) . "if (\$user->authorise('"
. $nameSingleCode . ".import', 'com_"
- . $this->componentCodeName
+ . CFactory::_('Config')->component_code_name
. "') && \$user->authorise('core.import', 'com_"
- . $this->componentCodeName . "'))";
- $method[] = $this->_t(2) . "{";
- $method[] = $this->_t(3) . "//" . $this->setLine(__LINE__)
+ . CFactory::_('Config')->component_code_name . "'))";
+ $method[] = Indent::_(2) . "{";
+ $method[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " Get the import model";
- $method[] = $this->_t(3) . "\$model = \$this->getModel('"
+ $method[] = Indent::_(3) . "\$model = \$this->getModel('"
. StringHelper::safe($nameListCode, 'F')
. "');";
- $method[] = $this->_t(3) . "//" . $this->setLine(__LINE__)
+ $method[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " get the headers to import";
- $method[] = $this->_t(3)
+ $method[] = Indent::_(3)
. "\$headers = \$model->getExImPortHeaders();";
- $method[] = $this->_t(3) . "if ("
- . $this->fileContentStatic[$this->hhh . 'Component'
- . $this->hhh] . "Helper::checkObject(\$headers))";
- $method[] = $this->_t(3) . "{";
- $method[] = $this->_t(4) . "//" . $this->setLine(__LINE__)
+ $method[] = Indent::_(3) . "if ("
+ . CFactory::_('Compiler.Builder.Content.One')->get('Component') . "Helper::checkObject(\$headers))";
+ $method[] = Indent::_(3) . "{";
+ $method[] = Indent::_(4) . "//" . Line::_(__Line__, __Class__)
. " Load headers to session.";
- $method[] = $this->_t(4) . "\$session = JFactory::getSession();";
- $method[] = $this->_t(4) . "\$headers = json_encode(\$headers);";
- $method[] = $this->_t(4) . "\$session->set('" . $nameSingleCode
+ $method[] = Indent::_(4) . "\$session = JFactory::getSession();";
+ $method[] = Indent::_(4) . "\$headers = json_encode(\$headers);";
+ $method[] = Indent::_(4) . "\$session->set('" . $nameSingleCode
. "_VDM_IMPORTHEADERS', \$headers);";
- $method[] = $this->_t(4) . "\$session->set('backto_VDM_IMPORT', '"
+ $method[] = Indent::_(4) . "\$session->set('backto_VDM_IMPORT', '"
. $nameListCode . "');";
- $method[] = $this->_t(4)
+ $method[] = Indent::_(4)
. "\$session->set('dataType_VDM_IMPORTINTO', '"
. $nameSingleCode . "');";
- $method[] = $this->_t(4) . "//" . $this->setLine(__LINE__)
+ $method[] = Indent::_(4) . "//" . Line::_(__Line__, __Class__)
. " Redirect to import view.";
// add to lang array
$selectImportFileNote = $this->langPrefix
. "_IMPORT_SELECT_FILE_FOR_"
. StringHelper::safe($nameListCode, 'U');
- $this->setLangContent(
- $this->lang, $selectImportFileNote,
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $selectImportFileNote,
'Select the file to import data to ' . $nameListCode . '.'
);
- $method[] = $this->_t(4) . "\$message = JText:" . ":_('"
+ $method[] = Indent::_(4) . "\$message = JText:" . ":_('"
. $selectImportFileNote . "');";
// if this view has custom script it must have as custom import (model, veiw, controller)
if (isset($this->importCustomScripts[$nameListCode])
&& $this->importCustomScripts[$nameListCode])
{
- $method[] = $this->_t(4)
+ $method[] = Indent::_(4)
. "\$this->setRedirect(JRoute::_('index.php?option=com_"
- . $this->componentCodeName . "&view=import_"
+ . CFactory::_('Config')->component_code_name . "&view=import_"
. $nameListCode . "', false), \$message);";
}
else
{
- $method[] = $this->_t(4)
+ $method[] = Indent::_(4)
. "\$this->setRedirect(JRoute::_('index.php?option=com_"
- . $this->componentCodeName
+ . CFactory::_('Config')->component_code_name
. "&view=import', false), \$message);";
}
- $method[] = $this->_t(4) . "return;";
- $method[] = $this->_t(3) . "}";
- $method[] = $this->_t(2) . "}";
- $method[] = $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $method[] = Indent::_(4) . "return;";
+ $method[] = Indent::_(3) . "}";
+ $method[] = Indent::_(2) . "}";
+ $method[] = Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " Redirect to the list screen with error.";
- $method[] = $this->_t(2) . "\$message = JText:" . ":_('"
+ $method[] = Indent::_(2) . "\$message = JText:" . ":_('"
. $this->langPrefix . "_IMPORT_FAILED');";
- $method[] = $this->_t(2)
+ $method[] = Indent::_(2)
. "\$this->setRedirect(JRoute::_('index.php?option=com_"
- . $this->componentCodeName . "&view=" . $nameListCode
+ . CFactory::_('Config')->component_code_name . "&view=" . $nameListCode
. "', false), \$message, 'error');";
- $method[] = $this->_t(2) . "return;";
- $method[] = $this->_t(1) . "}";
+ $method[] = Indent::_(2) . "return;";
+ $method[] = Indent::_(1) . "}";
return implode(PHP_EOL, $method);
}
@@ -15698,16 +14703,16 @@ class Interpretation extends Fields
$langExport = $this->langPrefix . '_'
. StringHelper::safe('Export Data', 'U');
// add to lang array
- $this->setLangContent($this->lang, $langExport, 'Export Data');
+ CFactory::_('Language')->set(CFactory::_('Config')->lang_target, $langExport, 'Export Data');
$button = array();
- $button[] = PHP_EOL . PHP_EOL . $this->_t(3)
+ $button[] = PHP_EOL . PHP_EOL . Indent::_(3)
. "if (\$this->canDo->get('core.export') && \$this->canDo->get('"
. $nameSingleCode . ".export'))";
- $button[] = $this->_t(3) . "{";
- $button[] = $this->_t(4) . "JToolBarHelper::custom('"
+ $button[] = Indent::_(3) . "{";
+ $button[] = Indent::_(4) . "JToolBarHelper::custom('"
. $nameListCode . ".exportData', 'download', '', '"
. $langExport . "', true);";
- $button[] = $this->_t(3) . "}";
+ $button[] = Indent::_(3) . "}";
return implode(PHP_EOL, $button);
}
@@ -15725,17 +14730,17 @@ class Interpretation extends Fields
$langImport = $this->langPrefix . '_'
. StringHelper::safe('Import Data', 'U');
// add to lang array
- $this->setLangContent($this->lang, $langImport, 'Import Data');
+ CFactory::_('Language')->set(CFactory::_('Config')->lang_target, $langImport, 'Import Data');
$button = array();
- $button[] = PHP_EOL . PHP_EOL . $this->_t(2)
+ $button[] = PHP_EOL . PHP_EOL . Indent::_(2)
. "if (\$this->canDo->get('core.import') && \$this->canDo->get('"
. $nameSingleCode . ".import'))";
- $button[] = $this->_t(2) . "{";
- $button[] = $this->_t(3) . "JToolBarHelper::custom('"
+ $button[] = Indent::_(2) . "{";
+ $button[] = Indent::_(3) . "JToolBarHelper::custom('"
. $nameListCode . ".importData', 'upload', '', '"
. $langImport
. "', false);";
- $button[] = $this->_t(2) . "}";
+ $button[] = Indent::_(2) . "}";
return implode(PHP_EOL, $button);
}
@@ -15747,94 +14752,73 @@ class Interpretation extends Fields
{
// setup Ajax files
$target = array('admin' => 'import_' . $nameListCode);
- $this->buildDynamique($target, 'customimport');
+ CFactory::_('Utilities.Structure')->build($target, 'customimport');
// load the custom script to the files
// IMPORT_EXT_METHOD <<>>
- $this->fileContentDynamic['import_' . $nameListCode][$this->hhh
- . 'IMPORT_EXT_METHOD' . $this->hhh]
- = $this->getCustomScriptBuilder(
+ CFactory::_('Compiler.Builder.Content.Multi')->set('import_' . $nameListCode . '|IMPORT_EXT_METHOD', CFactory::_('Customcode.Dispenser')->get(
'php_import_ext', 'import_' . $nameListCode, PHP_EOL, null,
true
- );
+ ));
// IMPORT_DISPLAY_METHOD_CUSTOM <<>>
- $this->fileContentDynamic['import_' . $nameListCode][$this->hhh
- . 'IMPORT_DISPLAY_METHOD_CUSTOM' . $this->hhh]
- = $this->getCustomScriptBuilder(
+ CFactory::_('Compiler.Builder.Content.Multi')->set('import_' . $nameListCode . '|IMPORT_DISPLAY_METHOD_CUSTOM', CFactory::_('Customcode.Dispenser')->get(
'php_import_display', 'import_' . $nameListCode, PHP_EOL,
null,
true
- );
+ ));
// IMPORT_SETDATA_METHOD <<>>
- $this->fileContentDynamic['import_' . $nameListCode][$this->hhh
- . 'IMPORT_SETDATA_METHOD' . $this->hhh]
- = $this->getCustomScriptBuilder(
+ CFactory::_('Compiler.Builder.Content.Multi')->set('import_' . $nameListCode . '|IMPORT_SETDATA_METHOD', CFactory::_('Customcode.Dispenser')->get(
'php_import_setdata', 'import_' . $nameListCode, PHP_EOL,
null,
true
- );
+ ));
// IMPORT_METHOD_CUSTOM <<>>
- $this->fileContentDynamic['import_' . $nameListCode][$this->hhh
- . 'IMPORT_METHOD_CUSTOM' . $this->hhh]
- = $this->getCustomScriptBuilder(
+ CFactory::_('Compiler.Builder.Content.Multi')->set('import_' . $nameListCode . '|IMPORT_METHOD_CUSTOM', CFactory::_('Customcode.Dispenser')->get(
'php_import', 'import_' . $nameListCode, PHP_EOL, null,
true
- );
+ ));
// IMPORT_SAVE_METHOD <<>>
- $this->fileContentDynamic['import_' . $nameListCode][$this->hhh
- . 'IMPORT_SAVE_METHOD' . $this->hhh]
- = $this->getCustomScriptBuilder(
+ CFactory::_('Compiler.Builder.Content.Multi')->set('import_' . $nameListCode . '|IMPORT_SAVE_METHOD', CFactory::_('Customcode.Dispenser')->get(
'php_import_save', 'import_' . $nameListCode, PHP_EOL,
null,
true
- );
+ ));
// IMPORT_DEFAULT_VIEW_CUSTOM <<>>
- $this->fileContentDynamic['import_' . $nameListCode][$this->hhh
- . 'IMPORT_DEFAULT_VIEW_CUSTOM' . $this->hhh]
- = $this->getCustomScriptBuilder(
+ CFactory::_('Compiler.Builder.Content.Multi')->set('import_' . $nameListCode . '|IMPORT_DEFAULT_VIEW_CUSTOM', CFactory::_('Customcode.Dispenser')->get(
'html_import_view', 'import_' . $nameListCode, PHP_EOL,
null,
true
- );
+ ));
// insure we have the view placeholders setup
- $this->fileContentDynamic['import_' . $nameListCode][$this->hhh
- . 'VIEW' . $this->hhh]
- = 'IMPORT_' . $this->placeholders[$this->hhh . 'VIEWS'
- . $this->hhh];
- $this->fileContentDynamic['import_' . $nameListCode][$this->hhh
- . 'View' . $this->hhh]
- = 'Import_' . $this->placeholders[$this->hhh . 'views'
- . $this->hhh];
- $this->fileContentDynamic['import_' . $nameListCode][$this->hhh
- . 'view' . $this->hhh]
- = 'import_' . $this->placeholders[$this->hhh . 'views'
- . $this->hhh];
- $this->fileContentDynamic['import_' . $nameListCode][$this->hhh
- . 'VIEWS' . $this->hhh]
- = 'IMPORT_' . $this->placeholders[$this->hhh . 'VIEWS'
- . $this->hhh];
- $this->fileContentDynamic['import_' . $nameListCode][$this->hhh
- . 'Views' . $this->hhh]
- = 'Import_' . $this->placeholders[$this->hhh . 'views'
- . $this->hhh];
- $this->fileContentDynamic['import_' . $nameListCode][$this->hhh
- . 'views' . $this->hhh]
- = 'import_' . $this->placeholders[$this->hhh . 'views'
- . $this->hhh];
+ CFactory::_('Compiler.Builder.Content.Multi')->set('import_' . $nameListCode . '|VIEW', 'IMPORT_' . CFactory::_('Placeholder')->get_h('VIEWS'));
+ CFactory::_('Compiler.Builder.Content.Multi')->set('import_' . $nameListCode . '|View', 'Import_' . CFactory::_('Placeholder')->get_h('views'));
+ CFactory::_('Compiler.Builder.Content.Multi')->set('import_' . $nameListCode . '|view', 'import_' . CFactory::_('Placeholder')->get_h('views'));
+ CFactory::_('Compiler.Builder.Content.Multi')->set('import_' . $nameListCode . '|VIEWS', 'IMPORT_' . CFactory::_('Placeholder')->get_h('VIEWS'));
+ CFactory::_('Compiler.Builder.Content.Multi')->set('import_' . $nameListCode . '|Views', 'Import_' . CFactory::_('Placeholder')->get_h('views'));
+ CFactory::_('Compiler.Builder.Content.Multi')->set('import_' . $nameListCode . '|views', 'import_' . CFactory::_('Placeholder')->get_h('views'));
+
+ // IMPORT_CUSTOM_CONTROLLER_HEADER <<>> add the header details for the controller
+ CFactory::_('Compiler.Builder.Content.Multi')->set('import_' . $nameListCode . '|IMPORT_CUSTOM_CONTROLLER_HEADER', $this->setFileHeader(
+ 'import.custom.controller',
+ $nameListCode
+ ));
+
+ // IMPORT_CUSTOM_MODEL_HEADER <<>> add the header details for the model
+ CFactory::_('Compiler.Builder.Content.Multi')->set('import_' . $nameListCode . '|IMPORT_CUSTOM_MODEL_HEADER', $this->setFileHeader(
+ 'import.custom.model',
+ $nameListCode
+ ));
}
public function setListQuery(&$nameSingleCode, &$nameListCode)
{
// check if this view has category added
- if (isset($this->categoryBuilder[$nameListCode])
- && ArrayHelper::check(
- $this->categoryBuilder[$nameListCode]
- ))
+ if (CFactory::_('Compiler.Builder.Category')->exists("{$nameListCode}.code"))
{
- $categoryCodeName = $this->categoryBuilder[$nameListCode]['code'];
+ $categoryCodeName = CFactory::_('Compiler.Builder.Category')->get("{$nameListCode}.code");
$addCategory = true;
$addCategoryFilter
- = $this->categoryBuilder[$nameListCode]['filter'];
+ = CFactory::_('Compiler.Builder.Category')->get("{$nameListCode}.filter", 'error');
}
else
{
@@ -15842,113 +14826,109 @@ class Interpretation extends Fields
$addCategoryFilter = 0;
}
// setup the query
- $query = "//" . $this->setLine(__LINE__) . " Get the user object.";
- $query .= PHP_EOL . $this->_t(2) . "\$user = JFactory::getUser();";
- $query .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $query = "//" . Line::_(__Line__, __Class__) . " Get the user object.";
+ $query .= PHP_EOL . Indent::_(2) . "\$user = JFactory::getUser();";
+ $query .= PHP_EOL . Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " Create a new query object.";
- $query .= PHP_EOL . $this->_t(2) . "\$db = JFactory::getDBO();";
- $query .= PHP_EOL . $this->_t(2) . "\$query = \$db->getQuery(true);";
- $query .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(
- __LINE__
+ $query .= PHP_EOL . Indent::_(2) . "\$db = JFactory::getDBO();";
+ $query .= PHP_EOL . Indent::_(2) . "\$query = \$db->getQuery(true);";
+ $query .= PHP_EOL . PHP_EOL . Indent::_(2) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " Select some fields";
- $query .= PHP_EOL . $this->_t(2) . "\$query->select('a.*');";
+ $query .= PHP_EOL . Indent::_(2) . "\$query->select('a.*');";
// add the category
if ($addCategory)
{
- $query .= PHP_EOL . $this->_t(2)
+ $query .= PHP_EOL . Indent::_(2)
. "\$query->select(\$db->quoteName('c.title','category_title'));";
}
- $query .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(
- __LINE__
- ) . " From the " . $this->componentCodeName . "_item table";
- $query .= PHP_EOL . $this->_t(2) . "\$query->from(\$db->quoteName('#__"
- . $this->componentCodeName . "_" . $nameSingleCode . "', 'a'));";
+ $query .= PHP_EOL . PHP_EOL . Indent::_(2) . "//" . Line::_(
+ __LINE__,__CLASS__
+ ) . " From the " . CFactory::_('Config')->component_code_name . "_item table";
+ $query .= PHP_EOL . Indent::_(2) . "\$query->from(\$db->quoteName('#__"
+ . CFactory::_('Config')->component_code_name . "_" . $nameSingleCode . "', 'a'));";
// add the category
if ($addCategory)
{
- $query .= PHP_EOL . $this->_t(2)
+ $query .= PHP_EOL . Indent::_(2)
. "\$query->join('LEFT', \$db->quoteName('#__categories', 'c') . ' ON (' . \$db->quoteName('a."
. $categoryCodeName
. "') . ' = ' . \$db->quoteName('c.id') . ')');";
}
// add custom filtering php
- $query .= $this->getCustomScriptBuilder(
+ $query .= CFactory::_('Customcode.Dispenser')->get(
'php_getlistquery', $nameSingleCode, PHP_EOL . PHP_EOL
);
// add the custom fields query
$query .= $this->setCustomQuery($nameListCode, $nameSingleCode);
- $query .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(
- __LINE__
+ $query .= PHP_EOL . PHP_EOL . Indent::_(2) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " Filter by published state";
- $query .= PHP_EOL . $this->_t(2)
+ $query .= PHP_EOL . Indent::_(2)
. "\$published = \$this->getState('filter.published');";
- $query .= PHP_EOL . $this->_t(2) . "if (is_numeric(\$published))";
- $query .= PHP_EOL . $this->_t(2) . "{";
- $query .= PHP_EOL . $this->_t(3)
+ $query .= PHP_EOL . Indent::_(2) . "if (is_numeric(\$published))";
+ $query .= PHP_EOL . Indent::_(2) . "{";
+ $query .= PHP_EOL . Indent::_(3)
. "\$query->where('a.published = ' . (int) \$published);";
- $query .= PHP_EOL . $this->_t(2) . "}";
- $query .= PHP_EOL . $this->_t(2) . "elseif (\$published === '')";
- $query .= PHP_EOL . $this->_t(2) . "{";
- $query .= PHP_EOL . $this->_t(3)
+ $query .= PHP_EOL . Indent::_(2) . "}";
+ $query .= PHP_EOL . Indent::_(2) . "elseif (\$published === '')";
+ $query .= PHP_EOL . Indent::_(2) . "{";
+ $query .= PHP_EOL . Indent::_(3)
. "\$query->where('(a.published = 0 OR a.published = 1)');";
- $query .= PHP_EOL . $this->_t(2) . "}";
- if (isset($this->accessBuilder[$nameSingleCode])
- && StringHelper::check(
- $this->accessBuilder[$nameSingleCode]
- ))
+ $query .= PHP_EOL . Indent::_(2) . "}";
+ if (CFactory::_('Compiler.Builder.Access.Switch')->exists($nameSingleCode))
{
- $query .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(
- __LINE__
+ $query .= PHP_EOL . PHP_EOL . Indent::_(2) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " Join over the asset groups.";
- $query .= PHP_EOL . $this->_t(2)
+ $query .= PHP_EOL . Indent::_(2)
. "\$query->select('ag.title AS access_level');";
- $query .= PHP_EOL . $this->_t(2)
+ $query .= PHP_EOL . Indent::_(2)
. "\$query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');";
// check if the access field was over ridden
- if (!isset($this->fieldsNames[$nameSingleCode]['access']))
+ if (!CFactory::_('Compiler.Builder.Field.Names')->isString($nameSingleCode . '.access'))
{
// component helper name
- $Helper = $this->fileContentStatic[$this->hhh . 'Component'
- . $this->hhh] . 'Helper';
+ $Helper = CFactory::_('Compiler.Builder.Content.One')->get('Component') . 'Helper';
// load the access filter query code
- $query .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(
- __LINE__
+ $query .= PHP_EOL . Indent::_(2) . "//" . Line::_(
+ __LINE__,__CLASS__
)
. " Filter by access level.";
- $query .= PHP_EOL . $this->_t(2)
+ $query .= PHP_EOL . Indent::_(2)
. "\$_access = \$this->getState('filter.access');";
- $query .= PHP_EOL . $this->_t(2)
+ $query .= PHP_EOL . Indent::_(2)
. "if (\$_access && is_numeric(\$_access))";
- $query .= PHP_EOL . $this->_t(2) . "{";
- $query .= PHP_EOL . $this->_t(3)
+ $query .= PHP_EOL . Indent::_(2) . "{";
+ $query .= PHP_EOL . Indent::_(3)
. "\$query->where('a.access = ' . (int) \$_access);";
- $query .= PHP_EOL . $this->_t(2) . "}";
- $query .= PHP_EOL . $this->_t(2) . "elseif ("
+ $query .= PHP_EOL . Indent::_(2) . "}";
+ $query .= PHP_EOL . Indent::_(2) . "elseif ("
. $Helper . "::checkArray(\$_access))";
- $query .= PHP_EOL . $this->_t(2) . "{";
- $query .= PHP_EOL . $this->_t(3) . "//"
- . $this->setLine(__LINE__)
+ $query .= PHP_EOL . Indent::_(2) . "{";
+ $query .= PHP_EOL . Indent::_(3) . "//"
+ . Line::_(__Line__, __Class__)
. " Secure the array for the query";
- $query .= PHP_EOL . $this->_t(3)
+ $query .= PHP_EOL . Indent::_(3)
. "\$_access = ArrayHelper::toInteger(\$_access);";
- $query .= PHP_EOL . $this->_t(3) . "//"
- . $this->setLine(__LINE__) . " Filter by the Access Array.";
- $query .= PHP_EOL . $this->_t(3)
+ $query .= PHP_EOL . Indent::_(3) . "//"
+ . Line::_(__Line__, __Class__) . " Filter by the Access Array.";
+ $query .= PHP_EOL . Indent::_(3)
. "\$query->where('a.access IN (' . implode(',', \$_access) . ')');";
- $query .= PHP_EOL . $this->_t(2) . "}";
+ $query .= PHP_EOL . Indent::_(2) . "}";
}
// TODO the following will fight against the above access filter
- $query .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $query .= PHP_EOL . Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " Implement View Level Access";
- $query .= PHP_EOL . $this->_t(2)
+ $query .= PHP_EOL . Indent::_(2)
. "if (!\$user->authorise('core.options', 'com_"
- . $this->componentCodeName . "'))";
- $query .= PHP_EOL . $this->_t(2) . "{";
- $query .= PHP_EOL . $this->_t(3)
+ . CFactory::_('Config')->component_code_name . "'))";
+ $query .= PHP_EOL . Indent::_(2) . "{";
+ $query .= PHP_EOL . Indent::_(3)
. "\$groups = implode(',', \$user->getAuthorisedViewLevels());";
- $query .= PHP_EOL . $this->_t(3)
+ $query .= PHP_EOL . Indent::_(3)
. "\$query->where('a.access IN (' . \$groups . ')');";
- $query .= PHP_EOL . $this->_t(2) . "}";
+ $query .= PHP_EOL . Indent::_(2) . "}";
}
// set the search query
$query .= $this->setSearchQuery($nameListCode);
@@ -15957,38 +14937,38 @@ class Interpretation extends Fields
// add the category
if ($addCategory && $addCategoryFilter >= 1)
{
- $query .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(
- __LINE__
+ $query .= PHP_EOL . PHP_EOL . Indent::_(2) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " Filter by a single or group of categories.";
- $query .= PHP_EOL . $this->_t(2) . "\$baselevel = 1;";
- $query .= PHP_EOL . $this->_t(2)
+ $query .= PHP_EOL . Indent::_(2) . "\$baselevel = 1;";
+ $query .= PHP_EOL . Indent::_(2)
. "\$categoryId = \$this->getState('filter.category_id');";
$query .= PHP_EOL;
- $query .= PHP_EOL . $this->_t(2) . "if (is_numeric(\$categoryId))";
- $query .= PHP_EOL . $this->_t(2) . "{";
- $query .= PHP_EOL . $this->_t(3)
+ $query .= PHP_EOL . Indent::_(2) . "if (is_numeric(\$categoryId))";
+ $query .= PHP_EOL . Indent::_(2) . "{";
+ $query .= PHP_EOL . Indent::_(3)
. "\$cat_tbl = JTable::getInstance('Category', 'JTable');";
- $query .= PHP_EOL . $this->_t(3) . "\$cat_tbl->load(\$categoryId);";
- $query .= PHP_EOL . $this->_t(3) . "\$rgt = \$cat_tbl->rgt;";
- $query .= PHP_EOL . $this->_t(3) . "\$lft = \$cat_tbl->lft;";
- $query .= PHP_EOL . $this->_t(3)
+ $query .= PHP_EOL . Indent::_(3) . "\$cat_tbl->load(\$categoryId);";
+ $query .= PHP_EOL . Indent::_(3) . "\$rgt = \$cat_tbl->rgt;";
+ $query .= PHP_EOL . Indent::_(3) . "\$lft = \$cat_tbl->lft;";
+ $query .= PHP_EOL . Indent::_(3)
. "\$baselevel = (int) \$cat_tbl->level;";
- $query .= PHP_EOL . $this->_t(3)
+ $query .= PHP_EOL . Indent::_(3)
. "\$query->where('c.lft >= ' . (int) \$lft)";
- $query .= PHP_EOL . $this->_t(4)
+ $query .= PHP_EOL . Indent::_(4)
. "->where('c.rgt <= ' . (int) \$rgt);";
- $query .= PHP_EOL . $this->_t(2) . "}";
- $query .= PHP_EOL . $this->_t(2)
+ $query .= PHP_EOL . Indent::_(2) . "}";
+ $query .= PHP_EOL . Indent::_(2)
. "elseif (is_array(\$categoryId))";
- $query .= PHP_EOL . $this->_t(2) . "{";
- $query .= PHP_EOL . $this->_t(3)
+ $query .= PHP_EOL . Indent::_(2) . "{";
+ $query .= PHP_EOL . Indent::_(3)
. "\$categoryId = ArrayHelper::toInteger(\$categoryId);";
- $query .= PHP_EOL . $this->_t(3)
+ $query .= PHP_EOL . Indent::_(3)
. "\$categoryId = implode(',', \$categoryId);";
- $query .= PHP_EOL . $this->_t(3)
+ $query .= PHP_EOL . Indent::_(3)
. "\$query->where('a." . $categoryCodeName
. " IN (' . \$categoryId . ')');";
- $query .= PHP_EOL . $this->_t(2) . "}";
+ $query .= PHP_EOL . Indent::_(2) . "}";
$query .= PHP_EOL;
}
// setup values for the view ordering
@@ -16004,7 +14984,7 @@ class Interpretation extends Fields
as $order_field
)
{
- if (($order_field_name = $this->getFieldDatabaseName(
+ if (($order_field_name = CFactory::_('Field.Database.Name')->get(
$nameListCode, $order_field['field']
)) !== false)
{
@@ -16012,30 +14992,30 @@ class Interpretation extends Fields
{
// just the first field is based on state
$order_first = false;
- $query .= PHP_EOL . PHP_EOL . $this->_t(2) . "//"
- . $this->setLine(
- __LINE__
+ $query .= PHP_EOL . PHP_EOL . Indent::_(2) . "//"
+ . Line::_(
+ __LINE__,__CLASS__
) . " Add the list ordering clause.";
- $query .= PHP_EOL . $this->_t(2)
+ $query .= PHP_EOL . Indent::_(2)
. "\$orderCol = \$this->state->get('list.ordering', '"
. $order_field_name . "');";
- $query .= PHP_EOL . $this->_t(2)
+ $query .= PHP_EOL . Indent::_(2)
. "\$orderDirn = \$this->state->get('list.direction', '"
. $order_field['direction'] . "');";
- $query .= PHP_EOL . $this->_t(2)
+ $query .= PHP_EOL . Indent::_(2)
. "if (\$orderCol != '')";
- $query .= PHP_EOL . $this->_t(2) . "{";
- $query .= PHP_EOL . $this->_t(3)
+ $query .= PHP_EOL . Indent::_(2) . "{";
+ $query .= PHP_EOL . Indent::_(3)
. "\$query->order(\$db->escape(\$orderCol . ' ' . \$orderDirn));";
- $query .= PHP_EOL . $this->_t(2) . "}";
+ $query .= PHP_EOL . Indent::_(2) . "}";
}
else
{
- $query .= PHP_EOL . PHP_EOL . $this->_t(2) . "//"
- . $this->setLine(
- __LINE__
+ $query .= PHP_EOL . PHP_EOL . Indent::_(2) . "//"
+ . Line::_(
+ __LINE__,__CLASS__
) . " Add a permanent list ordering.";
- $query .= PHP_EOL . $this->_t(2)
+ $query .= PHP_EOL . Indent::_(2)
. "\$query->order(\$db->escape('"
. $order_field_name . " "
. $order_field['direction'] . "'));";
@@ -16045,35 +15025,32 @@ class Interpretation extends Fields
}
else
{
- $query .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(
- __LINE__
+ $query .= PHP_EOL . PHP_EOL . Indent::_(2) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " Add the list ordering clause.";
- $query .= PHP_EOL . $this->_t(2)
+ $query .= PHP_EOL . Indent::_(2)
. "\$orderCol = \$this->state->get('list.ordering', 'a.id');";
- $query .= PHP_EOL . $this->_t(2)
+ $query .= PHP_EOL . Indent::_(2)
. "\$orderDirn = \$this->state->get('list.direction', 'desc');";
- $query .= PHP_EOL . $this->_t(2) . "if (\$orderCol != '')";
- $query .= PHP_EOL . $this->_t(2) . "{";
- $query .= PHP_EOL . $this->_t(3)
+ $query .= PHP_EOL . Indent::_(2) . "if (\$orderCol != '')";
+ $query .= PHP_EOL . Indent::_(2) . "{";
+ $query .= PHP_EOL . Indent::_(3)
. "\$query->order(\$db->escape(\$orderCol . ' ' . \$orderDirn));";
- $query .= PHP_EOL . $this->_t(2) . "}";
+ $query .= PHP_EOL . Indent::_(2) . "}";
}
$query .= PHP_EOL;
- $query .= PHP_EOL . $this->_t(2) . "return \$query;";
+ $query .= PHP_EOL . Indent::_(2) . "return \$query;";
return $query;
}
public function setSearchQuery($nameListCode)
{
- if (isset($this->searchBuilder[$nameListCode])
- && ArrayHelper::check(
- $this->searchBuilder[$nameListCode]
- ))
+ if (CFactory::_('Compiler.Builder.Search')->exists($nameListCode))
{
// setup the searh options
$search = "'(";
- foreach ($this->searchBuilder[$nameListCode] as $nr => $array)
+ foreach (CFactory::_('Compiler.Builder.Search')->get($nameListCode) as $nr => $array)
{
// array( 'type' => $typeName, 'code' => $name, 'custom' => $custom, 'list' => $field['list']);
if ($nr == 0)
@@ -16099,26 +15076,26 @@ class Interpretation extends Fields
}
$search .= ")'";
// now setup query
- $query = PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $query = PHP_EOL . Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " Filter by search.";
- $query .= PHP_EOL . $this->_t(2)
+ $query .= PHP_EOL . Indent::_(2)
. "\$search = \$this->getState('filter.search');";
- $query .= PHP_EOL . $this->_t(2) . "if (!empty(\$search))";
- $query .= PHP_EOL . $this->_t(2) . "{";
- $query .= PHP_EOL . $this->_t(3)
+ $query .= PHP_EOL . Indent::_(2) . "if (!empty(\$search))";
+ $query .= PHP_EOL . Indent::_(2) . "{";
+ $query .= PHP_EOL . Indent::_(3)
. "if (stripos(\$search, 'id:') === 0)";
- $query .= PHP_EOL . $this->_t(3) . "{";
- $query .= PHP_EOL . $this->_t(4)
+ $query .= PHP_EOL . Indent::_(3) . "{";
+ $query .= PHP_EOL . Indent::_(4)
. "\$query->where('a.id = ' . (int) substr(\$search, 3));";
- $query .= PHP_EOL . $this->_t(3) . "}";
- $query .= PHP_EOL . $this->_t(3) . "else";
- $query .= PHP_EOL . $this->_t(3) . "{";
- $query .= PHP_EOL . $this->_t(4)
+ $query .= PHP_EOL . Indent::_(3) . "}";
+ $query .= PHP_EOL . Indent::_(3) . "else";
+ $query .= PHP_EOL . Indent::_(3) . "{";
+ $query .= PHP_EOL . Indent::_(4)
. "\$search = \$db->quote('%' . \$db->escape(\$search) . '%');";
- $query .= PHP_EOL . $this->_t(4) . "\$query->where(" . $search
+ $query .= PHP_EOL . Indent::_(4) . "\$query->where(" . $search
. ");";
- $query .= PHP_EOL . $this->_t(3) . "}";
- $query .= PHP_EOL . $this->_t(2) . "}";
+ $query .= PHP_EOL . Indent::_(3) . "}";
+ $query .= PHP_EOL . Indent::_(2) . "}";
$query .= PHP_EOL;
return $query;
@@ -16132,36 +15109,22 @@ class Interpretation extends Fields
$just_text = false
)
{
- if (isset($this->customBuilder[$nameListCode])
- && ArrayHelper::check(
- $this->customBuilder[$nameListCode]
- ))
+ if (CFactory::_('Compiler.Builder.Custom.Field')->exists($nameListCode))
{
$query = "";
- foreach ($this->customBuilder[$nameListCode] as $filter)
+ foreach (CFactory::_('Compiler.Builder.Custom.Field')->get($nameListCode) as $filter)
{
// only load this if table is set
- if ((isset($this->customBuilderList[$nameListCode])
- && ArrayHelper::check(
- $this->customBuilderList[$nameListCode]
- )
- && in_array(
- $filter['code'],
- $this->customBuilderList[$nameListCode]
- )
+ if ((CFactory::_('Compiler.Builder.Custom.List')->exists($nameSingleCode . '.' . $filter['code'])
&& isset($filter['custom']['table'])
- && StringHelper::check(
- $filter['custom']['table']
- )
+ && StringHelper::check($filter['custom']['table'])
&& $filter['method'] == 0)
|| ($just_text && isset($filter['custom']['table'])
- && StringHelper::check(
- $filter['custom']['table']
- )
+ && StringHelper::check($filter['custom']['table'])
&& $filter['method'] == 0))
{
- $query .= PHP_EOL . PHP_EOL . $this->_t(2) . $tab . "//"
- . $this->setLine(__LINE__) . " From the "
+ $query .= PHP_EOL . PHP_EOL . Indent::_(2) . $tab . "//"
+ . Line::_(__Line__, __Class__) . " From the "
. StringHelper::safe(
StringHelper::safe(
$filter['custom']['table'], 'w'
@@ -16174,7 +15137,7 @@ class Interpretation extends Fields
// we want to at times just have the words and not the ids as well
if ($just_text)
{
- $query .= PHP_EOL . $this->_t(2) . $tab
+ $query .= PHP_EOL . Indent::_(2) . $tab
. "\$query->select(\$db->quoteName(['"
. $filter['custom']['db'] . "."
. $filter['custom']['text'] . "','"
@@ -16184,7 +15147,7 @@ class Interpretation extends Fields
}
else
{
- $query .= PHP_EOL . $this->_t(2) . $tab
+ $query .= PHP_EOL . Indent::_(2) . $tab
. "\$query->select(\$db->quoteName(['"
. $filter['custom']['db'] . "."
. $filter['custom']['text'] . "','"
@@ -16198,7 +15161,7 @@ class Interpretation extends Fields
// we want to at times just have the words and not the ids as well
if ($just_text)
{
- $query .= PHP_EOL . $this->_t(2) . $tab
+ $query .= PHP_EOL . Indent::_(2) . $tab
. "\$query->select(\$db->quoteName('"
. $filter['custom']['db'] . "."
. $filter['custom']['text'] . "','"
@@ -16206,7 +15169,7 @@ class Interpretation extends Fields
}
else
{
- $query .= PHP_EOL . $this->_t(2) . $tab
+ $query .= PHP_EOL . Indent::_(2) . $tab
. "\$query->select(\$db->quoteName('"
. $filter['custom']['db'] . "."
. $filter['custom']['text'] . "','"
@@ -16214,7 +15177,7 @@ class Interpretation extends Fields
. "'));";
}
}
- $query .= PHP_EOL . $this->_t(2) . $tab
+ $query .= PHP_EOL . Indent::_(2) . $tab
. "\$query->join('LEFT', \$db->quoteName('"
. $filter['custom']['table'] . "', '"
. $filter['custom']['db']
@@ -16224,7 +15187,7 @@ class Interpretation extends Fields
. $filter['custom']['id'] . "') . ')');";
}
// build the field type file
- $this->setCustomFieldTypeFile(
+ CFactory::_('Compiler.Creator.Custom.Field.Type.File')->set(
$filter, $nameListCode, $nameSingleCode
);
}
@@ -16243,28 +15206,23 @@ class Interpretation extends Fields
*/
public function setFilterQuery($nameListCode)
{
- if (isset($this->filterBuilder[$nameListCode])
- && ArrayHelper::check(
- $this->filterBuilder[$nameListCode]
- ))
+ if (CFactory::_('Compiler.Builder.Filter')->exists($nameListCode))
{
// component helper name
- $Helper = $this->fileContentStatic[$this->hhh . 'Component'
- . $this->hhh] . 'Helper';
+ $Helper = CFactory::_('Compiler.Builder.Content.One')->get('Component') . 'Helper';
// start building the filter query
$filterQuery = "";
- foreach ($this->filterBuilder[$nameListCode] as $filter)
+ foreach (CFactory::_('Compiler.Builder.Filter')->get($nameListCode) as $filter)
{
// only add for none category fields
if ($filter['type'] != 'category')
{
- $filterQuery .= PHP_EOL . $this->_t(2) . "//"
- . $this->setLine(__LINE__) . " Filter by "
- . ucwords($filter['code']) . ".";
+ $filterQuery .= PHP_EOL . Indent::_(2) . "//"
+ . Line::_(__Line__, __Class__) . " Filter by "
+ . ucwords((string) $filter['code']) . ".";
// we only add multi filter option if new filter type
// and we have multi filter set for this field (2 = topbar)
- if (isset($this->adminFilterType[$nameListCode])
- && $this->adminFilterType[$nameListCode] == 2
+ if (CFactory::_('Compiler.Builder.Admin.Filter.Type')->get($nameListCode, 1) == 2
&& isset($filter['multi'])
&& $filter['multi'] == 2)
{
@@ -16299,34 +15257,34 @@ class Interpretation extends Fields
*/
protected function setSingleFilterQuery($filter, $Helper, $a = "a")
{
- $filterQuery = PHP_EOL . $this->_t(2) . "\$_"
+ $filterQuery = PHP_EOL . Indent::_(2) . "\$_"
. $filter['code'] . " = \$this->getState('filter."
. $filter['code'] . "');";
- $filterQuery .= PHP_EOL . $this->_t(2) . "if (is_numeric(\$_"
+ $filterQuery .= PHP_EOL . Indent::_(2) . "if (is_numeric(\$_"
. $filter['code'] . "))";
- $filterQuery .= PHP_EOL . $this->_t(2) . "{";
- $filterQuery .= PHP_EOL . $this->_t(3) . "if (is_float(\$_"
+ $filterQuery .= PHP_EOL . Indent::_(2) . "{";
+ $filterQuery .= PHP_EOL . Indent::_(3) . "if (is_float(\$_"
. $filter['code'] . "))";
- $filterQuery .= PHP_EOL . $this->_t(3) . "{";
- $filterQuery .= PHP_EOL . $this->_t(4)
+ $filterQuery .= PHP_EOL . Indent::_(3) . "{";
+ $filterQuery .= PHP_EOL . Indent::_(4)
. "\$query->where('" . $a . "." . $filter['code']
. " = ' . (float) \$_" . $filter['code'] . ");";
- $filterQuery .= PHP_EOL . $this->_t(3) . "}";
- $filterQuery .= PHP_EOL . $this->_t(3) . "else";
- $filterQuery .= PHP_EOL . $this->_t(3) . "{";
- $filterQuery .= PHP_EOL . $this->_t(4)
+ $filterQuery .= PHP_EOL . Indent::_(3) . "}";
+ $filterQuery .= PHP_EOL . Indent::_(3) . "else";
+ $filterQuery .= PHP_EOL . Indent::_(3) . "{";
+ $filterQuery .= PHP_EOL . Indent::_(4)
. "\$query->where('" . $a . "." . $filter['code']
. " = ' . (int) \$_" . $filter['code'] . ");";
- $filterQuery .= PHP_EOL . $this->_t(3) . "}";
- $filterQuery .= PHP_EOL . $this->_t(2) . "}";
- $filterQuery .= PHP_EOL . $this->_t(2) . "elseif ("
+ $filterQuery .= PHP_EOL . Indent::_(3) . "}";
+ $filterQuery .= PHP_EOL . Indent::_(2) . "}";
+ $filterQuery .= PHP_EOL . Indent::_(2) . "elseif ("
. $Helper . "::checkString(\$_" . $filter['code'] . "))";
- $filterQuery .= PHP_EOL . $this->_t(2) . "{";
- $filterQuery .= PHP_EOL . $this->_t(3)
+ $filterQuery .= PHP_EOL . Indent::_(2) . "{";
+ $filterQuery .= PHP_EOL . Indent::_(3)
. "\$query->where('" . $a . "." . $filter['code']
. " = ' . \$db->quote(\$db->escape(\$_" . $filter['code']
. ")));";
- $filterQuery .= PHP_EOL . $this->_t(2) . "}";
+ $filterQuery .= PHP_EOL . Indent::_(2) . "}";
return $filterQuery;
}
@@ -16343,71 +15301,71 @@ class Interpretation extends Fields
*/
protected function setMultiFilterQuery($filter, $Helper, $a = "a")
{
- $filterQuery = PHP_EOL . $this->_t(2) . "\$_"
+ $filterQuery = PHP_EOL . Indent::_(2) . "\$_"
. $filter['code'] . " = \$this->getState('filter."
. $filter['code'] . "');";
- $filterQuery .= PHP_EOL . $this->_t(2) . "if (is_numeric(\$_"
+ $filterQuery .= PHP_EOL . Indent::_(2) . "if (is_numeric(\$_"
. $filter['code'] . "))";
- $filterQuery .= PHP_EOL . $this->_t(2) . "{";
- $filterQuery .= PHP_EOL . $this->_t(3) . "if (is_float(\$_"
+ $filterQuery .= PHP_EOL . Indent::_(2) . "{";
+ $filterQuery .= PHP_EOL . Indent::_(3) . "if (is_float(\$_"
. $filter['code'] . "))";
- $filterQuery .= PHP_EOL . $this->_t(3) . "{";
- $filterQuery .= PHP_EOL . $this->_t(4)
+ $filterQuery .= PHP_EOL . Indent::_(3) . "{";
+ $filterQuery .= PHP_EOL . Indent::_(4)
. "\$query->where('" . $a . "." . $filter['code']
. " = ' . (float) \$_" . $filter['code'] . ");";
- $filterQuery .= PHP_EOL . $this->_t(3) . "}";
- $filterQuery .= PHP_EOL . $this->_t(3) . "else";
- $filterQuery .= PHP_EOL . $this->_t(3) . "{";
- $filterQuery .= PHP_EOL . $this->_t(4)
+ $filterQuery .= PHP_EOL . Indent::_(3) . "}";
+ $filterQuery .= PHP_EOL . Indent::_(3) . "else";
+ $filterQuery .= PHP_EOL . Indent::_(3) . "{";
+ $filterQuery .= PHP_EOL . Indent::_(4)
. "\$query->where('" . $a . "." . $filter['code']
. " = ' . (int) \$_" . $filter['code'] . ");";
- $filterQuery .= PHP_EOL . $this->_t(3) . "}";
- $filterQuery .= PHP_EOL . $this->_t(2) . "}";
- $filterQuery .= PHP_EOL . $this->_t(2) . "elseif ("
+ $filterQuery .= PHP_EOL . Indent::_(3) . "}";
+ $filterQuery .= PHP_EOL . Indent::_(2) . "}";
+ $filterQuery .= PHP_EOL . Indent::_(2) . "elseif ("
. $Helper . "::checkString(\$_" . $filter['code'] . "))";
- $filterQuery .= PHP_EOL . $this->_t(2) . "{";
- $filterQuery .= PHP_EOL . $this->_t(3)
+ $filterQuery .= PHP_EOL . Indent::_(2) . "{";
+ $filterQuery .= PHP_EOL . Indent::_(3)
. "\$query->where('" . $a . "." . $filter['code']
. " = ' . \$db->quote(\$db->escape(\$_" . $filter['code']
. ")));";
- $filterQuery .= PHP_EOL . $this->_t(2) . "}";
- $filterQuery .= PHP_EOL . $this->_t(2) . "elseif ("
+ $filterQuery .= PHP_EOL . Indent::_(2) . "}";
+ $filterQuery .= PHP_EOL . Indent::_(2) . "elseif ("
. $Helper . "::checkArray(\$_" . $filter['code'] . "))";
- $filterQuery .= PHP_EOL . $this->_t(2) . "{";
+ $filterQuery .= PHP_EOL . Indent::_(2) . "{";
- $filterQuery .= PHP_EOL . $this->_t(3) . "//"
- . $this->setLine(__LINE__) . " Secure the array for the query";
+ $filterQuery .= PHP_EOL . Indent::_(3) . "//"
+ . Line::_(__Line__, __Class__) . " Secure the array for the query";
- $filterQuery .= PHP_EOL . $this->_t(3) . "\$_" . $filter['code']
+ $filterQuery .= PHP_EOL . Indent::_(3) . "\$_" . $filter['code']
. " = array_map( function (\$val) use(&\$db) {";
- $filterQuery .= PHP_EOL . $this->_t(4) . "if (is_numeric(\$val))";
- $filterQuery .= PHP_EOL . $this->_t(4) . "{";
- $filterQuery .= PHP_EOL . $this->_t(5) . "if (is_float(\$val))";
- $filterQuery .= PHP_EOL . $this->_t(5) . "{";
- $filterQuery .= PHP_EOL . $this->_t(6) . "return (float) \$val;";
- $filterQuery .= PHP_EOL . $this->_t(5) . "}";
- $filterQuery .= PHP_EOL . $this->_t(5) . "else";
- $filterQuery .= PHP_EOL . $this->_t(5) . "{";
- $filterQuery .= PHP_EOL . $this->_t(6) . "return (int) \$val;";
- $filterQuery .= PHP_EOL . $this->_t(5) . "}";
- $filterQuery .= PHP_EOL . $this->_t(4) . "}";
- $filterQuery .= PHP_EOL . $this->_t(4) . "elseif ("
+ $filterQuery .= PHP_EOL . Indent::_(4) . "if (is_numeric(\$val))";
+ $filterQuery .= PHP_EOL . Indent::_(4) . "{";
+ $filterQuery .= PHP_EOL . Indent::_(5) . "if (is_float(\$val))";
+ $filterQuery .= PHP_EOL . Indent::_(5) . "{";
+ $filterQuery .= PHP_EOL . Indent::_(6) . "return (float) \$val;";
+ $filterQuery .= PHP_EOL . Indent::_(5) . "}";
+ $filterQuery .= PHP_EOL . Indent::_(5) . "else";
+ $filterQuery .= PHP_EOL . Indent::_(5) . "{";
+ $filterQuery .= PHP_EOL . Indent::_(6) . "return (int) \$val;";
+ $filterQuery .= PHP_EOL . Indent::_(5) . "}";
+ $filterQuery .= PHP_EOL . Indent::_(4) . "}";
+ $filterQuery .= PHP_EOL . Indent::_(4) . "elseif ("
. $Helper . "::checkString(\$val))";
- $filterQuery .= PHP_EOL . $this->_t(4) . "{";
- $filterQuery .= PHP_EOL . $this->_t(5)
+ $filterQuery .= PHP_EOL . Indent::_(4) . "{";
+ $filterQuery .= PHP_EOL . Indent::_(5)
. "return \$db->quote(\$db->escape(\$val));";
- $filterQuery .= PHP_EOL . $this->_t(4) . "}";
- $filterQuery .= PHP_EOL . $this->_t(3) . "}, \$_"
+ $filterQuery .= PHP_EOL . Indent::_(4) . "}";
+ $filterQuery .= PHP_EOL . Indent::_(3) . "}, \$_"
. $filter['code'] . ");";
- $filterQuery .= PHP_EOL . $this->_t(3) . "//"
- . $this->setLine(__LINE__) . " Filter by the "
- . ucwords($filter['code']) . " Array.";
+ $filterQuery .= PHP_EOL . Indent::_(3) . "//"
+ . Line::_(__Line__, __Class__) . " Filter by the "
+ . ucwords((string) $filter['code']) . " Array.";
- $filterQuery .= PHP_EOL . $this->_t(3)
+ $filterQuery .= PHP_EOL . Indent::_(3)
. "\$query->where('" . $a . "." . $filter['code']
. " IN (' . implode(',', \$_" . $filter['code'] . ") . ')');";
- $filterQuery .= PHP_EOL . $this->_t(2) . "}";
+ $filterQuery .= PHP_EOL . Indent::_(2) . "}";
return $filterQuery;
}
@@ -16459,7 +15417,7 @@ class Interpretation extends Fields
$behaviors[$matchName] = $targetBehavior;
$defaults[$matchName] = $targetDefault;
$toggleSwitch[$matchName]
- = ($condition['target_behavior']
+ = ($condition['target_behavior']
== 1
|| $condition['target_behavior'] == 2) ? true
: false;
@@ -16468,7 +15426,7 @@ class Interpretation extends Fields
// set function array
$functions[$uniqueVar][0] = $matchName;
$matchNames[$matchName]
- = $condition['match_name'];
+ = $condition['match_name'];
// get the select value
$getValue[$matchName] = $this->getValueScript(
$condition['match_type'],
@@ -16507,20 +15465,20 @@ class Interpretation extends Fields
// set function array
$functions[$uniqueVar][] = $relationName;
$matchNames[$relationName]
- = $relation['match_name'];
+ = $relation['match_name'];
// get the relation option
$relationOptions = $this->getOptionsScript(
$relation['match_type'],
$relation['match_options']
);
$getValue[$relationName]
- = $this->getValueScript(
+ = $this->getValueScript(
$relation['match_type'],
$relation['match_name'],
$condition['match_extends'], $uniqueVar
);
$ifValue[$relationName]
- = $this->ifValueScript(
+ = $this->ifValueScript(
$relationName,
$relation['match_behavior'],
$relation['match_type'],
@@ -16536,7 +15494,7 @@ class Interpretation extends Fields
$behaviors[$matchName] = $targetBehavior;
$defaults[$matchName] = $targetDefault;
$toggleSwitch[$matchName]
- = ($condition['target_behavior']
+ = ($condition['target_behavior']
== 1
|| $condition['target_behavior'] == 2) ? true
: false;
@@ -16579,7 +15537,7 @@ class Interpretation extends Fields
if (ArrayHelper::check($functions))
{
// now build the initial script
- $initial .= "//" . $this->setLine(__LINE__) . " Initial Script"
+ $initial .= "//" . Line::_(__Line__, __Class__) . " Initial Script"
. PHP_EOL . "jQuery(document).ready(function()";
$initial .= PHP_EOL . "{";
foreach ($functions as $function => $matchKeys)
@@ -16604,31 +15562,19 @@ class Interpretation extends Fields
$l_function, $l_matchKeys, $getValue
);
- if (isset($this->setScriptMediaSwitch)
- && ArrayHelper::check(
- $this->setScriptMediaSwitch
- )
- && in_array(
- $matchTypeKey, $this->setScriptMediaSwitch
- ))
+ if (CFactory::_('Compiler.Builder.Script.Media.Switch')->inArray($matchTypeKey))
{
$modal .= $funcCall['code'];
}
else
{
- if (isset($this->setScriptUserSwitch)
- && ArrayHelper::check(
- $this->setScriptUserSwitch
- )
- && in_array(
- $matchTypeKey, $this->setScriptUserSwitch
- ))
+ if (CFactory::_('Compiler.Builder.Script.User.Switch')->inArray($matchTypeKey))
{
$name = $name . '_id';
}
- $listener .= PHP_EOL . "//" . $this->setLine(
- __LINE__
+ $listener .= PHP_EOL . "//" . Line::_(
+ __LINE__,__CLASS__
) . " #jform_" . $name . " listeners for "
. $l_matchKey . " function";
$listener .= PHP_EOL . "jQuery('#jform_" . $name
@@ -16640,7 +15586,7 @@ class Interpretation extends Fields
. "jQuery('#adminForm').on('change', '#jform_"
. $name . "',function (e)";
$listener .= PHP_EOL . "{";
- $listener .= PHP_EOL . $this->_t(1)
+ $listener .= PHP_EOL . Indent::_(1)
. "e.preventDefault();";
$listener .= $funcCall['code'];
$listener .= PHP_EOL . "});" . PHP_EOL;
@@ -16650,9 +15596,9 @@ class Interpretation extends Fields
if (StringHelper::check($modal))
{
$listener .= PHP_EOL . "window.SqueezeBox.initialize({";
- $listener .= PHP_EOL . $this->_t(1) . "onClose:function(){";
+ $listener .= PHP_EOL . Indent::_(1) . "onClose:function(){";
$listener .= $modal;
- $listener .= PHP_EOL . $this->_t(1) . "}";
+ $listener .= PHP_EOL . Indent::_(1) . "}";
$listener .= PHP_EOL . "});" . PHP_EOL;
}
@@ -16672,7 +15618,7 @@ class Interpretation extends Fields
{
$addArray = true;
}
- $func .= PHP_EOL . "//" . $this->setLine(__LINE__)
+ $func .= PHP_EOL . "//" . Line::_(__Line__, __Class__)
. " the " . $f_function . " function";
$func .= PHP_EOL . "function " . $f_function . "(";
$fucounter = 0;
@@ -16698,52 +15644,52 @@ class Interpretation extends Fields
foreach ($f_matchKeys as $a_matchKey)
{
$name = $matchNames[$a_matchKey];
- $func .= PHP_EOL . $this->_t(1) . "if (isSet("
+ $func .= PHP_EOL . Indent::_(1) . "if (isSet("
. $a_matchKey . ") && " . $a_matchKey
. ".constructor !== Array)" . PHP_EOL
- . $this->_t(1) . "{" . PHP_EOL . $this->_t(2)
+ . Indent::_(1) . "{" . PHP_EOL . Indent::_(2)
. "var temp_" . $f_function . " = "
- . $a_matchKey . ";" . PHP_EOL . $this->_t(2)
+ . $a_matchKey . ";" . PHP_EOL . Indent::_(2)
. "var " . $a_matchKey . " = [];" . PHP_EOL
- . $this->_t(2) . $a_matchKey . ".push(temp_"
- . $f_function . ");" . PHP_EOL . $this->_t(1)
+ . Indent::_(2) . $a_matchKey . ".push(temp_"
+ . $f_function . ");" . PHP_EOL . Indent::_(1)
. "}";
- $func .= PHP_EOL . $this->_t(1) . "else if (!isSet("
- . $a_matchKey . "))" . PHP_EOL . $this->_t(1)
+ $func .= PHP_EOL . Indent::_(1) . "else if (!isSet("
+ . $a_matchKey . "))" . PHP_EOL . Indent::_(1)
. "{";
- $func .= PHP_EOL . $this->_t(2) . "var "
+ $func .= PHP_EOL . Indent::_(2) . "var "
. $a_matchKey . " = [];";
- $func .= PHP_EOL . $this->_t(1) . "}";
- $func .= PHP_EOL . $this->_t(1) . "var " . $name
+ $func .= PHP_EOL . Indent::_(1) . "}";
+ $func .= PHP_EOL . Indent::_(1) . "var " . $name
. " = " . $a_matchKey . ".some(" . $a_matchKey
. "_SomeFunc);" . PHP_EOL;
// setup the map function
- $map .= PHP_EOL . "//" . $this->setLine(__LINE__)
+ $map .= PHP_EOL . "//" . Line::_(__Line__, __Class__)
. " the " . $f_function . " Some function";
$map .= PHP_EOL . "function " . $a_matchKey
. "_SomeFunc(" . $a_matchKey . ")";
$map .= PHP_EOL . "{";
- $map .= PHP_EOL . $this->_t(1) . "//"
- . $this->setLine(__LINE__)
+ $map .= PHP_EOL . Indent::_(1) . "//"
+ . Line::_(__Line__, __Class__)
. " set the function logic";
- $map .= PHP_EOL . $this->_t(1) . "if (";
+ $map .= PHP_EOL . Indent::_(1) . "if (";
$if = $ifValue[$a_matchKey];
if (StringHelper::check($if))
{
$map .= $if;
}
$map .= ")";
- $map .= PHP_EOL . $this->_t(1) . "{";
- $map .= PHP_EOL . $this->_t(2) . "return true;";
- $map .= PHP_EOL . $this->_t(1) . "}" . PHP_EOL
- . $this->_t(1) . "return false;";
+ $map .= PHP_EOL . Indent::_(1) . "{";
+ $map .= PHP_EOL . Indent::_(2) . "return true;";
+ $map .= PHP_EOL . Indent::_(1) . "}" . PHP_EOL
+ . Indent::_(1) . "return false;";
$map .= PHP_EOL . "}" . PHP_EOL;
}
- $func .= PHP_EOL . PHP_EOL . $this->_t(1) . "//"
- . $this->setLine(__LINE__)
+ $func .= PHP_EOL . PHP_EOL . Indent::_(1) . "//"
+ . Line::_(__Line__, __Class__)
. " set this function logic";
- $func .= PHP_EOL . $this->_t(1) . "if (";
+ $func .= PHP_EOL . Indent::_(1) . "if (";
// set if counter
$aifcounter = 0;
foreach ($f_matchKeys as $af_matchKey)
@@ -16759,14 +15705,14 @@ class Interpretation extends Fields
}
$aifcounter++;
}
- $func .= ")" . PHP_EOL . $this->_t(1) . "{";
+ $func .= ")" . PHP_EOL . Indent::_(1) . "{";
}
else
{
- $func .= PHP_EOL . $this->_t(1) . "//" . $this->setLine(
- __LINE__
+ $func .= PHP_EOL . Indent::_(1) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " set the function logic";
- $func .= PHP_EOL . $this->_t(1) . "if (";
+ $func .= PHP_EOL . Indent::_(1) . "if (";
// set if counter
$ifcounter = 0;
foreach ($f_matchKeys as $f_matchKey)
@@ -16785,7 +15731,7 @@ class Interpretation extends Fields
$ifcounter++;
}
}
- $func .= ")" . PHP_EOL . $this->_t(1) . "{";
+ $func .= ")" . PHP_EOL . Indent::_(1) . "{";
}
// get the controles
$controls = $targetControls[$f_matchKeys[0]];
@@ -16807,8 +15753,8 @@ class Interpretation extends Fields
// check if this is a toggle switch
if ($toggleSwitch[$f_matchKeys[0]])
{
- $func .= PHP_EOL . $this->_t(1) . "}" . PHP_EOL
- . $this->_t(1) . "else" . PHP_EOL . $this->_t(1)
+ $func .= PHP_EOL . Indent::_(1) . "}" . PHP_EOL
+ . Indent::_(1) . "else" . PHP_EOL . Indent::_(1)
. "{";
// load the default behavior
foreach ($controls as $target => $action)
@@ -16822,7 +15768,7 @@ class Interpretation extends Fields
}
}
}
- $func .= PHP_EOL . $this->_t(1) . "}" . PHP_EOL . "}"
+ $func .= PHP_EOL . Indent::_(1) . "}" . PHP_EOL . "}"
. PHP_EOL . $map;
}
// add the needed validation to file
@@ -16834,69 +15780,69 @@ class Interpretation extends Fields
$validation .= PHP_EOL . "// update fields required";
$validation .= PHP_EOL
. "function updateFieldRequired(name, status) {";
- $validation .= PHP_EOL . $this->_t(1)
+ $validation .= PHP_EOL . Indent::_(1)
. "// check if not_required exist";
- $validation .= PHP_EOL . $this->_t(1)
+ $validation .= PHP_EOL . Indent::_(1)
. "if (jQuery('#jform_not_required').length > 0) {";
- $validation .= PHP_EOL . $this->_t(2)
+ $validation .= PHP_EOL . Indent::_(2)
. "var not_required = jQuery('#jform_not_required').val().split(\",\");";
- $validation .= PHP_EOL . PHP_EOL . $this->_t(2)
+ $validation .= PHP_EOL . PHP_EOL . Indent::_(2)
. "if(status == 1)";
- $validation .= PHP_EOL . $this->_t(2) . "{";
- $validation .= PHP_EOL . $this->_t(3)
+ $validation .= PHP_EOL . Indent::_(2) . "{";
+ $validation .= PHP_EOL . Indent::_(3)
. "not_required.push(name);";
- $validation .= PHP_EOL . $this->_t(2) . "}";
- $validation .= PHP_EOL . $this->_t(2) . "else";
- $validation .= PHP_EOL . $this->_t(2) . "{";
- $validation .= PHP_EOL . $this->_t(3)
+ $validation .= PHP_EOL . Indent::_(2) . "}";
+ $validation .= PHP_EOL . Indent::_(2) . "else";
+ $validation .= PHP_EOL . Indent::_(2) . "{";
+ $validation .= PHP_EOL . Indent::_(3)
. "not_required = removeFieldFromNotRequired(not_required, name);";
- $validation .= PHP_EOL . $this->_t(2) . "}";
- $validation .= PHP_EOL . PHP_EOL . $this->_t(2)
+ $validation .= PHP_EOL . Indent::_(2) . "}";
+ $validation .= PHP_EOL . PHP_EOL . Indent::_(2)
. "jQuery('#jform_not_required').val(fixNotRequiredArray(not_required).toString());";
- $validation .= PHP_EOL . $this->_t(1) . "}";
+ $validation .= PHP_EOL . Indent::_(1) . "}";
$validation .= PHP_EOL . "}" . PHP_EOL;
$validation .= PHP_EOL
. "// remove field from not_required";
$validation .= PHP_EOL
. "function removeFieldFromNotRequired(array, what) {";
- $validation .= PHP_EOL . $this->_t(1)
+ $validation .= PHP_EOL . Indent::_(1)
. "return array.filter(function(element){";
- $validation .= PHP_EOL . $this->_t(2)
+ $validation .= PHP_EOL . Indent::_(2)
. "return element !== what;";
- $validation .= PHP_EOL . $this->_t(1) . "});";
+ $validation .= PHP_EOL . Indent::_(1) . "});";
$validation .= PHP_EOL . "}" . PHP_EOL;
$validation .= PHP_EOL . "// fix not required array";
$validation .= PHP_EOL
. "function fixNotRequiredArray(array) {";
- $validation .= PHP_EOL . $this->_t(1) . "var seen = {};";
- $validation .= PHP_EOL . $this->_t(1)
+ $validation .= PHP_EOL . Indent::_(1) . "var seen = {};";
+ $validation .= PHP_EOL . Indent::_(1)
. "return removeEmptyFromNotRequiredArray(array).filter(function(item) {";
- $validation .= PHP_EOL . $this->_t(2)
+ $validation .= PHP_EOL . Indent::_(2)
. "return seen.hasOwnProperty(item) ? false : (seen[item] = true);";
- $validation .= PHP_EOL . $this->_t(1) . "});";
+ $validation .= PHP_EOL . Indent::_(1) . "});";
$validation .= PHP_EOL . "}" . PHP_EOL;
$validation .= PHP_EOL
. "// remove empty from not_required array";
$validation .= PHP_EOL
. "function removeEmptyFromNotRequiredArray(array) {";
- $validation .= PHP_EOL . $this->_t(1)
+ $validation .= PHP_EOL . Indent::_(1)
. "return array.filter(function (el) {";
- $validation .= PHP_EOL . $this->_t(2)
+ $validation .= PHP_EOL . Indent::_(2)
. "// remove ( äž_äž) as well - lol";
- $validation .= PHP_EOL . $this->_t(2)
+ $validation .= PHP_EOL . Indent::_(2)
. "return (el.length > 0 && 'äž_äž' !== el);";
- $validation .= PHP_EOL . $this->_t(1) . "});";
+ $validation .= PHP_EOL . Indent::_(1) . "});";
$validation .= PHP_EOL . "}" . PHP_EOL;
}
// set the isSet function
$isSet = PHP_EOL . "// the isSet function";
$isSet .= PHP_EOL . "function isSet(val)";
$isSet .= PHP_EOL . "{";
- $isSet .= PHP_EOL . $this->_t(1)
+ $isSet .= PHP_EOL . Indent::_(1)
. "if ((val != undefined) && (val != null) && 0 !== val.length){";
- $isSet .= PHP_EOL . $this->_t(2) . "return true;";
- $isSet .= PHP_EOL . $this->_t(1) . "}";
- $isSet .= PHP_EOL . $this->_t(1) . "return false;";
+ $isSet .= PHP_EOL . Indent::_(2) . "return true;";
+ $isSet .= PHP_EOL . Indent::_(1) . "}";
+ $isSet .= PHP_EOL . Indent::_(1) . "return false;";
$isSet .= PHP_EOL . "}";
}
// load to this buket
@@ -16908,18 +15854,17 @@ class Interpretation extends Fields
{
$fileScript = '';
}
- $fileScript .= $this->getCustomScriptBuilder(
+ $fileScript .= CFactory::_('Customcode.Dispenser')->get(
'view_file', $nameSingleCode, PHP_EOL . PHP_EOL, null, true, ''
);
// add custom script to footer
- if (isset($this->customScriptBuilder['view_footer'][$nameSingleCode])
+ if (isset(CFactory::_('Customcode.Dispenser')->hub['view_footer'][$nameSingleCode])
&& StringHelper::check(
- $this->customScriptBuilder['view_footer'][$nameSingleCode]
+ CFactory::_('Customcode.Dispenser')->hub['view_footer'][$nameSingleCode]
))
{
- $customFooterScript = PHP_EOL . PHP_EOL . $this->setPlaceholders(
- $this->customScriptBuilder['view_footer'][$nameSingleCode],
- $this->placeholders
+ $customFooterScript = PHP_EOL . PHP_EOL . CFactory::_('Placeholder')->update_(
+ CFactory::_('Customcode.Dispenser')->hub['view_footer'][$nameSingleCode]
);
if (strpos($customFooterScript, 'name_list_code;
// add custom script to list view JS file
- if (($list_fileScript = $this->getCustomScriptBuilder(
+ if (($list_fileScript = CFactory::_('Customcode.Dispenser')->get(
'views_file', $nameSingleCode, PHP_EOL . PHP_EOL, null, true,
false
)) !== false
&& StringHelper::check($list_fileScript))
{
// get dates
- $_created = $this->getCreatedDate($viewArray);
- $_modified = $this->getLastModifiedDate($viewArray);
+ $_created = CFactory::_('Model.Createdate')->get($viewArray);
+ $_modified = CFactory::_('Model.Modifieddate')->get($viewArray);
// add file to view
- $_target = array($this->target => $nameListCode);
- $_config = array($this->hhh . 'CREATIONDATE'
- . $this->hhh => $_created,
- $this->hhh . 'BUILDDATE'
- . $this->hhh => $_modified,
- $this->hhh . 'VERSION'
- . $this->hhh => $viewArray['settings']->version);
- $this->buildDynamique($_target, 'javascript_file', false, $_config);
+ $_target = array(CFactory::_('Config')->build_target => $nameListCode);
+ $_config = array(Placefix::_h('CREATIONDATE') => $_created,
+ Placefix::_h('BUILDDATE') => $_modified,
+ Placefix::_h('VERSION') => $viewArray['settings']->version);
+ CFactory::_('Utilities.Structure')->build($_target, 'javascript_file', false, $_config);
// set path
- $_path = '/administrator/components/com_' . $this->componentCodeName
+ $_path = '/administrator/components/com_' . CFactory::_('Config')->component_code_name
. '/assets/js/' . $nameListCode . '.js';
// load the file to the list view
- $this->fileContentDynamic[$nameListCode][$this->hhh
- . 'ADMIN_ADD_JAVASCRIPT_FILE' . $this->hhh]
- = PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(
- __LINE__
- ) . " Add List View JavaScript File" . PHP_EOL . $this->_t(2)
- . $this->setIncludeLibScript($_path);
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameListCode . '|ADMIN_ADD_JAVASCRIPT_FILE', PHP_EOL . PHP_EOL . Indent::_(2) . "//" . Line::_(
+ __LINE__,__CLASS__
+ ) . " Add List View JavaScript File" . PHP_EOL . Indent::_(2)
+ . $this->setIncludeLibScript($_path)
+ );
}
else
{
$list_fileScript = '';
- $this->fileContentDynamic[$nameListCode][$this->hhh
- . 'ADMIN_ADD_JAVASCRIPT_FILE' . $this->hhh]
- = '';
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameListCode . '|ADMIN_ADD_JAVASCRIPT_FILE', '');
}
- // minfy the script
- if ($this->minify && isset($list_fileScript)
+ // minify the script
+ if (CFactory::_('Config')->get('minify', 0) && isset($list_fileScript)
&& StringHelper::check($list_fileScript))
{
- // minify the fielScript javscript
- $minifier = new JS;
- $minifier->add($list_fileScript);
- $list_fileScript = $minifier->minify();
+ // minify the fileScript javascript
+ $list_fileScript = Minify::js($list_fileScript);
}
- // minfy the script
- if ($this->minify && isset($fileScript)
+ // minify the script
+ if (CFactory::_('Config')->get('minify', 0) && isset($fileScript)
&& StringHelper::check($fileScript))
{
- // minify the fielScript javscript
- $minifier = new JS;
- $minifier->add($fileScript);
- $fileScript = $minifier->minify();
+ // minify the fileScript javascript
+ $fileScript = Minify::js($fileScript);
}
- // minfy the script
- if ($this->minify && isset($footerScript)
+ // minify the script
+ if (CFactory::_('Config')->get('minify', 0) && isset($footerScript)
&& StringHelper::check($footerScript))
{
- // minify the footerScript javscript
- $minifier = new JS;
- $minifier->add($footerScript);
- $footerScript = $minifier->minify();
+ // minify the footerScript javascript
+ $footerScript = Minify::js($footerScript);
}
// make sure there is script to add
if (isset($list_fileScript)
@@ -17047,7 +15980,7 @@ class Interpretation extends Fields
. PHP_EOL . '";
$this->viewScriptBuilder[$nameSingleCode]['footerScript']
- = $footerScript;
+ = $footerScript;
}
}
@@ -17061,13 +15994,13 @@ class Interpretation extends Fields
$value = $getValue[$matchKey];
if ($value['isArray'])
{
- $initial .= PHP_EOL . $this->_t(1) . $value['get'];
+ $initial .= PHP_EOL . Indent::_(1) . $value['get'];
$funcsets[] = $matchKey;
$array = true;
}
else
{
- $initial .= PHP_EOL . $this->_t(1) . $value['get'];
+ $initial .= PHP_EOL . Indent::_(1) . $value['get'];
$funcsets[] = $matchKey;
}
}
@@ -17075,7 +16008,7 @@ class Interpretation extends Fields
// make sure that the function is loaded only once
if (ArrayHelper::check($funcsets))
{
- $initial .= PHP_EOL . $this->_t(1) . $function . "(";
+ $initial .= PHP_EOL . Indent::_(1) . $function . "(";
$initial .= implode(',', $funcsets);
$initial .= ");" . PHP_EOL;
}
@@ -17120,7 +16053,7 @@ class Interpretation extends Fields
if (in_array($target['name'], $currentTargets))
{
$this->targetRelationControl[$view][$target['name']]
- = array($relation['match_name'],
+ = array($relation['match_name'],
$condition['match_name']);
$found = true;
break;
@@ -17208,7 +16141,7 @@ class Interpretation extends Fields
}
// set target type
$targetTypeSufix = "";
- if (ComponentbuilderHelper::fieldCheck(
+ if (CFactory::_('Field.Groups')->check(
$target['type'], 'spacer'
))
{
@@ -17229,13 +16162,13 @@ class Interpretation extends Fields
$targetType = "#jform_";
}
// set the target behavior
- $bucket[$target['name']]['behavior'] = PHP_EOL . $this->_t(
+ $bucket[$target['name']]['behavior'] = PHP_EOL . Indent::_(
2
) . "jQuery('" . $targetType . $target['name']
. $targetTypeSufix . "').closest('.control-group')."
. $targetBehavior . "();";
// set the target default
- $bucket[$target['name']]['default'] = PHP_EOL . $this->_t(2)
+ $bucket[$target['name']]['default'] = PHP_EOL . Indent::_(2)
. "jQuery('" . $targetType . $target['name']
. $targetTypeSufix . "').closest('.control-group')."
. $targetDefault . "();";
@@ -17245,112 +16178,112 @@ class Interpretation extends Fields
if ($toggleSwitch)
{
$hide = PHP_EOL
- . $this->_t(2) . "//" . $this->setLine(__LINE__)
+ . Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " remove required attribute from "
. $target['name'] . " field";
$hide .= PHP_EOL
- . $this->_t(2) . "if (!jform_" . $unique
+ . Indent::_(2) . "if (!jform_" . $unique
. "_required)";
$hide .= PHP_EOL
- . $this->_t(2) . "{";
+ . Indent::_(2) . "{";
$hide .= PHP_EOL
- . $this->_t(3) . "updateFieldRequired('"
+ . Indent::_(3) . "updateFieldRequired('"
. $target['name'] . "',1);";
$hide .= PHP_EOL
- . $this->_t(3) . "jQuery('#jform_"
+ . Indent::_(3) . "jQuery('#jform_"
. $target['name']
. "').removeAttr('required');";
$hide .= PHP_EOL
- . $this->_t(3) . "jQuery('#jform_"
+ . Indent::_(3) . "jQuery('#jform_"
. $target['name']
. "').removeAttr('aria-required');";
$hide .= PHP_EOL
- . $this->_t(3) . "jQuery('#jform_"
+ . Indent::_(3) . "jQuery('#jform_"
. $target['name']
. "').removeClass('required');";
$hide .= PHP_EOL
- . $this->_t(3) . "jform_" . $unique
+ . Indent::_(3) . "jform_" . $unique
. "_required = true;";
$hide .= PHP_EOL
- . $this->_t(2) . "}";
+ . Indent::_(2) . "}";
$bucket[$target['name']]['hide'] = $hide;
// the show required function
$show = PHP_EOL
- . $this->_t(2) . "//" . $this->setLine(__LINE__)
+ . Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " add required attribute to "
. $target['name'] . " field";
$show .= PHP_EOL
- . $this->_t(2) . "if (jform_" . $unique
+ . Indent::_(2) . "if (jform_" . $unique
. "_required)";
$show .= PHP_EOL
- . $this->_t(2) . "{";
+ . Indent::_(2) . "{";
$show .= PHP_EOL
- . $this->_t(3) . "updateFieldRequired('"
+ . Indent::_(3) . "updateFieldRequired('"
. $target['name'] . "',0);";
$show .= PHP_EOL
- . $this->_t(3) . "jQuery('#jform_"
+ . Indent::_(3) . "jQuery('#jform_"
. $target['name']
. "').prop('required','required');";
$show .= PHP_EOL
- . $this->_t(3) . "jQuery('#jform_"
+ . Indent::_(3) . "jQuery('#jform_"
. $target['name']
. "').attr('aria-required',true);";
$show .= PHP_EOL
- . $this->_t(3) . "jQuery('#jform_"
+ . Indent::_(3) . "jQuery('#jform_"
. $target['name'] . "').addClass('required');";
$show .= PHP_EOL
- . $this->_t(3) . "jform_" . $unique
+ . Indent::_(3) . "jform_" . $unique
. "_required = false;";
$show .= PHP_EOL
- . $this->_t(2) . "}";
+ . Indent::_(2) . "}";
$bucket[$target['name']]['show'] = $show;
}
else
{
$hide = PHP_EOL
- . $this->_t(2) . "//" . $this->setLine(__LINE__)
+ . Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " remove required attribute from "
. $target['name'] . " field";
$hide .= PHP_EOL
- . $this->_t(2) . "updateFieldRequired('"
+ . Indent::_(2) . "updateFieldRequired('"
. $target['name'] . "',1);";
$hide .= PHP_EOL
- . $this->_t(2) . "jQuery('#jform_"
+ . Indent::_(2) . "jQuery('#jform_"
. $target['name']
. "').removeAttr('required');";
$hide .= PHP_EOL
- . $this->_t(2) . "jQuery('#jform_"
+ . Indent::_(2) . "jQuery('#jform_"
. $target['name']
. "').removeAttr('aria-required');";
$hide .= PHP_EOL
- . $this->_t(2) . "jQuery('#jform_"
+ . Indent::_(2) . "jQuery('#jform_"
. $target['name']
. "').removeClass('required');";
$hide .= PHP_EOL
- . $this->_t(2) . "jform_" . $unique
+ . Indent::_(2) . "jform_" . $unique
. "_required = true;" . PHP_EOL;
$bucket[$target['name']]['hide'] = $hide;
// the show required function
$show = PHP_EOL
- . $this->_t(2) . "//" . $this->setLine(__LINE__)
+ . Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " add required attribute to "
. $target['name'] . " field";
$show .= PHP_EOL
- . $this->_t(2) . "updateFieldRequired('"
+ . Indent::_(2) . "updateFieldRequired('"
. $target['name'] . "',0);";
$show .= PHP_EOL
- . $this->_t(2) . "jQuery('#jform_"
+ . Indent::_(2) . "jQuery('#jform_"
. $target['name']
. "').prop('required','required');";
$show .= PHP_EOL
- . $this->_t(2) . "jQuery('#jform_"
+ . Indent::_(2) . "jQuery('#jform_"
. $target['name']
. "').attr('aria-required',true);";
$show .= PHP_EOL
- . $this->_t(2) . "jQuery('#jform_"
+ . Indent::_(2) . "jQuery('#jform_"
. $target['name'] . "').addClass('required');";
$show .= PHP_EOL
- . $this->_t(2) . "jform_" . $unique
+ . Indent::_(2) . "jform_" . $unique
. "_required = false;" . PHP_EOL;
$bucket[$target['name']]['show'] = $show;
}
@@ -17379,9 +16312,9 @@ class Interpretation extends Fields
{
case 1: // Is
// only 4 list/radio/checkboxes
- if (ComponentbuilderHelper::fieldCheck($type, 'list')
- || ComponentbuilderHelper::fieldCheck($type, 'dynamic')
- || !ComponentbuilderHelper::fieldCheck($type))
+ if (CFactory::_('Field.Groups')->check($type, 'list')
+ || CFactory::_('Field.Groups')->check($type, 'dynamic')
+ || !CFactory::_('Field.Groups')->check($type))
{
if (ArrayHelper::check($options))
{
@@ -17412,9 +16345,9 @@ class Interpretation extends Fields
break;
case 2: // Is Not
// only 4 list/radio/checkboxes
- if (ComponentbuilderHelper::fieldCheck($type, 'list')
- || ComponentbuilderHelper::fieldCheck($type, 'dynamic')
- || !ComponentbuilderHelper::fieldCheck($type))
+ if (CFactory::_('Field.Groups')->check($type, 'list')
+ || CFactory::_('Field.Groups')->check($type, 'dynamic')
+ || !CFactory::_('Field.Groups')->check($type))
{
if (ArrayHelper::check($options))
{
@@ -17445,9 +16378,9 @@ class Interpretation extends Fields
break;
case 3: // Any Selection
// only 4 list/radio/checkboxes/dynamic_list
- if (ComponentbuilderHelper::fieldCheck($type, 'list')
- || ComponentbuilderHelper::fieldCheck($type, 'dynamic')
- || !ComponentbuilderHelper::fieldCheck($type))
+ if (CFactory::_('Field.Groups')->check($type, 'list')
+ || CFactory::_('Field.Groups')->check($type, 'dynamic')
+ || !CFactory::_('Field.Groups')->check($type))
{
if (ArrayHelper::check($options))
{
@@ -17473,11 +16406,7 @@ class Interpretation extends Fields
else
{
$userFix = '';
- if (isset($this->setScriptUserSwitch)
- && ArrayHelper::check(
- $this->setScriptUserSwitch
- )
- && in_array($type, $this->setScriptUserSwitch))
+ if (CFactory::_('Compiler.Builder.Script.User.Switch')->inArray($type))
{
// TODO this needs a closer look, a bit buggy
$userFix = " && " . $value . " != 0";
@@ -17488,21 +16417,21 @@ class Interpretation extends Fields
break;
case 4: // Active (not empty)
// only 4 text_field
- if (ComponentbuilderHelper::fieldCheck($type, 'text'))
+ if (CFactory::_('Field.Groups')->check($type, 'text'))
{
$string .= 'isSet(' . $value . ')';
}
break;
case 5: // Unactive (empty)
// only 4 text_field
- if (ComponentbuilderHelper::fieldCheck($type, 'text'))
+ if (CFactory::_('Field.Groups')->check($type, 'text'))
{
$string .= '!isSet(' . $value . ')';
}
break;
case 6: // Key Word All (case-sensitive)
// only 4 text_field
- if (ComponentbuilderHelper::fieldCheck($type, 'text'))
+ if (CFactory::_('Field.Groups')->check($type, 'text'))
{
if (ArrayHelper::check(
$options['keywords']
@@ -17530,7 +16459,7 @@ class Interpretation extends Fields
break;
case 7: // Key Word Any (case-sensitive)
// only 4 text_field
- if (ComponentbuilderHelper::fieldCheck($type, 'text'))
+ if (CFactory::_('Field.Groups')->check($type, 'text'))
{
if (ArrayHelper::check(
$options['keywords']
@@ -17558,7 +16487,7 @@ class Interpretation extends Fields
break;
case 8: // Key Word All (case-insensitive)
// only 4 text_field
- if (ComponentbuilderHelper::fieldCheck($type, 'text'))
+ if (CFactory::_('Field.Groups')->check($type, 'text'))
{
if (ArrayHelper::check(
$options['keywords']
@@ -17590,7 +16519,7 @@ class Interpretation extends Fields
break;
case 9: // Key Word Any (case-insensitive)
// only 4 text_field
- if (ComponentbuilderHelper::fieldCheck($type, 'text'))
+ if (CFactory::_('Field.Groups')->check($type, 'text'))
{
if (ArrayHelper::check(
$options['keywords']
@@ -17622,7 +16551,7 @@ class Interpretation extends Fields
break;
case 10: // Min Length
// only 4 text_field
- if (ComponentbuilderHelper::fieldCheck($type, 'text'))
+ if (CFactory::_('Field.Groups')->check($type, 'text'))
{
if (ArrayHelper::check($options))
{
@@ -17640,7 +16569,7 @@ class Interpretation extends Fields
break;
case 11: // Max Length
// only 4 text_field
- if (ComponentbuilderHelper::fieldCheck($type, 'text'))
+ if (CFactory::_('Field.Groups')->check($type, 'text'))
{
if (ArrayHelper::check($options))
{
@@ -17658,7 +16587,7 @@ class Interpretation extends Fields
break;
case 12: // Exact Length
// only 4 text_field
- if (ComponentbuilderHelper::fieldCheck($type, 'text'))
+ if (CFactory::_('Field.Groups')->check($type, 'text'))
{
if (ArrayHelper::check($options))
{
@@ -17688,12 +16617,12 @@ class Interpretation extends Fields
$buket = array();
if (StringHelper::check($options))
{
- if (ComponentbuilderHelper::fieldCheck($type, 'list')
- || ComponentbuilderHelper::fieldCheck($type, 'dynamic')
- || !ComponentbuilderHelper::fieldCheck($type))
+ if (CFactory::_('Field.Groups')->check($type, 'list')
+ || CFactory::_('Field.Groups')->check($type, 'dynamic')
+ || !CFactory::_('Field.Groups')->check($type))
{
$optionsArray = array_map(
- 'trim', (array) explode(PHP_EOL, $options)
+ 'trim', (array) explode(PHP_EOL, (string) $options)
);
if (!ArrayHelper::check($optionsArray))
{
@@ -17714,7 +16643,7 @@ class Interpretation extends Fields
}
}
}
- elseif (ComponentbuilderHelper::fieldCheck($type, 'text'))
+ elseif (CFactory::_('Field.Groups')->check($type, 'text'))
{
// check to get the key words if set
$keywords = GetHelper::between(
@@ -17722,10 +16651,10 @@ class Interpretation extends Fields
);
if (StringHelper::check($keywords))
{
- if (strpos($keywords, ',') !== false)
+ if (strpos((string) $keywords, ',') !== false)
{
$keywords = array_map(
- 'trim', (array) explode(',', $keywords)
+ 'trim', (array) explode(',', (string) $keywords)
);
foreach ($keywords as $keyword)
{
@@ -17734,7 +16663,7 @@ class Interpretation extends Fields
}
else
{
- $buket['keywords'][] = trim($keywords);
+ $buket['keywords'][] = trim((string) $keywords);
}
}
// check to ket string length if set
@@ -17762,14 +16691,14 @@ class Interpretation extends Fields
$keyName = $name . '_' . $unique;
if ($type === 'checkboxes' || $extends === 'checkboxes')
{
- $select = "var " . $keyName . " = [];" . PHP_EOL . $this->_t(1)
+ $select = "var " . $keyName . " = [];" . PHP_EOL . Indent::_(1)
. "jQuery('#jform_" . $name
. " input[type=checkbox]').each(function()" . PHP_EOL
- . $this->_t(1) . "{" . PHP_EOL . $this->_t(2)
- . "if (jQuery(this).is(':checked'))" . PHP_EOL . $this->_t(2)
- . "{" . PHP_EOL . $this->_t(3) . $keyName
- . ".push(jQuery(this).prop('value'));" . PHP_EOL . $this->_t(2)
- . "}" . PHP_EOL . $this->_t(1) . "});";
+ . Indent::_(1) . "{" . PHP_EOL . Indent::_(2)
+ . "if (jQuery(this).is(':checked'))" . PHP_EOL . Indent::_(2)
+ . "{" . PHP_EOL . Indent::_(3) . $keyName
+ . ".push(jQuery(this).prop('value'));" . PHP_EOL . Indent::_(2)
+ . "}" . PHP_EOL . Indent::_(1) . "});";
$isArray = true;
}
elseif ($type === 'checkbox')
@@ -17782,25 +16711,23 @@ class Interpretation extends Fields
$select = 'var ' . $keyName . ' = jQuery("#jform_' . $name
. ' input[type=\'radio\']:checked").val();';
}
- elseif (isset($this->setScriptUserSwitch)
- && ArrayHelper::check($this->setScriptUserSwitch)
- && in_array($type, $this->setScriptUserSwitch))
+ elseif (CFactory::_('Compiler.Builder.Script.User.Switch')->inArray($type))
{
// this is only since 3.3.4
$select = 'var ' . $keyName . ' = jQuery("#jform_' . $name
. '_id").val();';
}
elseif ($type === 'list'
- || ComponentbuilderHelper::fieldCheck(
+ || CFactory::_('Field.Groups')->check(
$type, 'dynamic'
)
- || !ComponentbuilderHelper::fieldCheck($type))
+ || !CFactory::_('Field.Groups')->check($type))
{
$select = 'var ' . $keyName . ' = jQuery("#jform_' . $name
. '").val();';
$isArray = true;
}
- elseif (ComponentbuilderHelper::fieldCheck($type, 'text'))
+ elseif (CFactory::_('Field.Groups')->check($type, 'text'))
{
$select = 'var ' . $keyName . ' = jQuery("#jform_' . $name
. '").val();';
@@ -17850,60 +16777,60 @@ class Interpretation extends Fields
$this->validationFixBuilder[$view]
))
{
- $fix .= PHP_EOL . PHP_EOL . $this->_t(1) . "/**";
- $fix .= PHP_EOL . $this->_t(1)
+ $fix .= PHP_EOL . PHP_EOL . Indent::_(1) . "/**";
+ $fix .= PHP_EOL . Indent::_(1)
. " * Method to validate the form data.";
- $fix .= PHP_EOL . $this->_t(1) . " *";
- $fix .= PHP_EOL . $this->_t(1)
+ $fix .= PHP_EOL . Indent::_(1) . " *";
+ $fix .= PHP_EOL . Indent::_(1)
. " * @param JForm \$form The form to validate against.";
- $fix .= PHP_EOL . $this->_t(1)
+ $fix .= PHP_EOL . Indent::_(1)
. " * @param array \$data The data to validate.";
- $fix .= PHP_EOL . $this->_t(1)
+ $fix .= PHP_EOL . Indent::_(1)
. " * @param string \$group The name of the field group to validate.";
- $fix .= PHP_EOL . $this->_t(1) . " *";
- $fix .= PHP_EOL . $this->_t(1)
+ $fix .= PHP_EOL . Indent::_(1) . " *";
+ $fix .= PHP_EOL . Indent::_(1)
. " * @return mixed Array of filtered data if valid, false otherwise.";
- $fix .= PHP_EOL . $this->_t(1) . " *";
- $fix .= PHP_EOL . $this->_t(1) . " * @see JFormRule";
- $fix .= PHP_EOL . $this->_t(1) . " * @see JFilterInput";
- $fix .= PHP_EOL . $this->_t(1) . " * @since 12.2";
- $fix .= PHP_EOL . $this->_t(1) . " */";
- $fix .= PHP_EOL . $this->_t(1)
+ $fix .= PHP_EOL . Indent::_(1) . " *";
+ $fix .= PHP_EOL . Indent::_(1) . " * @see JFormRule";
+ $fix .= PHP_EOL . Indent::_(1) . " * @see JFilterInput";
+ $fix .= PHP_EOL . Indent::_(1) . " * @since 12.2";
+ $fix .= PHP_EOL . Indent::_(1) . " */";
+ $fix .= PHP_EOL . Indent::_(1)
. "public function validate(\$form, \$data, \$group = null)";
- $fix .= PHP_EOL . $this->_t(1) . "{";
- $fix .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $fix .= PHP_EOL . Indent::_(1) . "{";
+ $fix .= PHP_EOL . Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " check if the not_required field is set";
- $fix .= PHP_EOL . $this->_t(2)
+ $fix .= PHP_EOL . Indent::_(2)
. "if (isset(\$data['not_required']) && " . $Component
. "Helper::checkString(\$data['not_required']))";
- $fix .= PHP_EOL . $this->_t(2) . "{";
- $fix .= PHP_EOL . $this->_t(3)
+ $fix .= PHP_EOL . Indent::_(2) . "{";
+ $fix .= PHP_EOL . Indent::_(3)
. "\$requiredFields = (array) explode(',',(string) \$data['not_required']);";
- $fix .= PHP_EOL . $this->_t(3)
+ $fix .= PHP_EOL . Indent::_(3)
. "\$requiredFields = array_unique(\$requiredFields);";
- $fix .= PHP_EOL . $this->_t(3) . "//" . $this->setLine(__LINE__)
+ $fix .= PHP_EOL . Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " now change the required field attributes value";
- $fix .= PHP_EOL . $this->_t(3)
+ $fix .= PHP_EOL . Indent::_(3)
. "foreach (\$requiredFields as \$requiredField)";
- $fix .= PHP_EOL . $this->_t(3) . "{";
- $fix .= PHP_EOL . $this->_t(4) . "//" . $this->setLine(__LINE__)
+ $fix .= PHP_EOL . Indent::_(3) . "{";
+ $fix .= PHP_EOL . Indent::_(4) . "//" . Line::_(__Line__, __Class__)
. " make sure there is a string value";
- $fix .= PHP_EOL . $this->_t(4) . "if (" . $Component
+ $fix .= PHP_EOL . Indent::_(4) . "if (" . $Component
. "Helper::checkString(\$requiredField))";
- $fix .= PHP_EOL . $this->_t(4) . "{";
- $fix .= PHP_EOL . $this->_t(5) . "//" . $this->setLine(__LINE__)
+ $fix .= PHP_EOL . Indent::_(4) . "{";
+ $fix .= PHP_EOL . Indent::_(5) . "//" . Line::_(__Line__, __Class__)
. " change to false";
- $fix .= PHP_EOL . $this->_t(5)
+ $fix .= PHP_EOL . Indent::_(5)
. "\$form->setFieldAttribute(\$requiredField, 'required', 'false');";
- $fix .= PHP_EOL . $this->_t(5) . "//" . $this->setLine(__LINE__)
+ $fix .= PHP_EOL . Indent::_(5) . "//" . Line::_(__Line__, __Class__)
. " also clear the data set";
- $fix .= PHP_EOL . $this->_t(5) . "\$data[\$requiredField] = '';";
- $fix .= PHP_EOL . $this->_t(4) . "}";
- $fix .= PHP_EOL . $this->_t(3) . "}";
- $fix .= PHP_EOL . $this->_t(2) . "}";
- $fix .= PHP_EOL . $this->_t(2)
+ $fix .= PHP_EOL . Indent::_(5) . "\$data[\$requiredField] = '';";
+ $fix .= PHP_EOL . Indent::_(4) . "}";
+ $fix .= PHP_EOL . Indent::_(3) . "}";
+ $fix .= PHP_EOL . Indent::_(2) . "}";
+ $fix .= PHP_EOL . Indent::_(2)
. "return parent::validate(\$form, \$data, \$group);";
- $fix .= PHP_EOL . $this->_t(1) . "}";
+ $fix .= PHP_EOL . Indent::_(1) . "}";
}
return $fix;
@@ -17912,12 +16839,12 @@ class Interpretation extends Fields
public function setAjaxToke(&$view)
{
$fix = '';
- if (isset($this->customScriptBuilder['token'][$view])
- && $this->customScriptBuilder['token'][$view])
+ if (isset(CFactory::_('Customcode.Dispenser')->hub['token'][$view])
+ && CFactory::_('Customcode.Dispenser')->hub['token'][$view])
{
- $fix .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $fix .= PHP_EOL . Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " Add Ajax Token";
- $fix .= PHP_EOL . $this->_t(2)
+ $fix .= PHP_EOL . Indent::_(2)
. "\$this->document->addScriptDeclaration(\"var token = '\".JSession::getFormToken().\"';\");";
}
@@ -17927,14 +16854,14 @@ class Interpretation extends Fields
public function setRegisterAjaxTask($target)
{
$tasks = '';
- if (isset($this->customScriptBuilder[$target]['ajax_controller'])
+ if (isset(CFactory::_('Customcode.Dispenser')->hub[$target]['ajax_controller'])
&& ArrayHelper::check(
- $this->customScriptBuilder[$target]['ajax_controller']
+ CFactory::_('Customcode.Dispenser')->hub[$target]['ajax_controller']
))
{
$taskArray = array();
foreach (
- $this->customScriptBuilder[$target]['ajax_controller'] as $view
+ CFactory::_('Customcode.Dispenser')->hub[$target]['ajax_controller'] as $view
)
{
foreach ($view as $task)
@@ -17946,7 +16873,7 @@ class Interpretation extends Fields
{
foreach ($taskArray as $name)
{
- $tasks .= PHP_EOL . $this->_t(2) . "\$this->registerTask('"
+ $tasks .= PHP_EOL . Indent::_(2) . "\$this->registerTask('"
. $name . "', 'ajax');";
}
}
@@ -17958,9 +16885,9 @@ class Interpretation extends Fields
public function setAjaxInputReturn($target)
{
$cases = '';
- if (isset($this->customScriptBuilder[$target]['ajax_controller'])
+ if (isset(CFactory::_('Customcode.Dispenser')->hub[$target]['ajax_controller'])
&& ArrayHelper::check(
- $this->customScriptBuilder[$target]['ajax_controller']
+ CFactory::_('Customcode.Dispenser')->hub[$target]['ajax_controller']
))
{
$input = array();
@@ -17969,7 +16896,7 @@ class Interpretation extends Fields
$getModel = array();
$userCheck = array();
foreach (
- $this->customScriptBuilder[$target]['ajax_controller'] as $view
+ CFactory::_('Customcode.Dispenser')->hub[$target]['ajax_controller'] as $view
)
{
foreach ($view as $task)
@@ -17981,9 +16908,8 @@ class Interpretation extends Fields
$valueArray[$task['task_name']][] = "\$"
. $task['value_name'] . "Value";
$getModel[$task['task_name']]
- = "\$result = \$this->getModel('ajax')->"
- . $task['method_name'] . "(" . $this->bbb . "valueArray"
- . $this->ddd . ");";
+ = "\$result = \$this->getModel('ajax')->"
+ . $task['method_name'] . "(" . Placefix::_("valueArray") . ");";
// check if null or zero is allowed
if (!isset($task['allow_zero']) || 1 != $task['allow_zero'])
{
@@ -18007,18 +16933,18 @@ class Interpretation extends Fields
{
foreach ($getModel as $task => $getMethod)
{
- $cases .= PHP_EOL . $this->_t(4) . "case '" . $task . "':";
- $cases .= PHP_EOL . $this->_t(5) . "try";
- $cases .= PHP_EOL . $this->_t(5) . "{";
+ $cases .= PHP_EOL . Indent::_(4) . "case '" . $task . "':";
+ $cases .= PHP_EOL . Indent::_(5) . "try";
+ $cases .= PHP_EOL . Indent::_(5) . "{";
foreach ($input[$task] as $string)
{
- $cases .= PHP_EOL . $this->_t(6) . $string;
+ $cases .= PHP_EOL . Indent::_(6) . $string;
}
// set the values
$values = implode(', ', $valueArray[$task]);
// set the values to method
$getMethod = str_replace(
- $this->bbb . 'valueArray' . $this->ddd, $values,
+ Placefix::_('valueArray'), $values,
$getMethod
);
// check if we have some values to check
@@ -18028,59 +16954,59 @@ class Interpretation extends Fields
// set if string
$ifvalues = implode(' && ', $ifArray[$task]);
// add to case
- $cases .= PHP_EOL . $this->_t(6) . "if(" . $ifvalues
+ $cases .= PHP_EOL . Indent::_(6) . "if(" . $ifvalues
. ")";
- $cases .= PHP_EOL . $this->_t(6) . "{";
- $cases .= PHP_EOL . $this->_t(7) . $getMethod;
- $cases .= PHP_EOL . $this->_t(6) . "}";
- $cases .= PHP_EOL . $this->_t(6) . "else";
- $cases .= PHP_EOL . $this->_t(6) . "{";
- $cases .= PHP_EOL . $this->_t(7) . "\$result = false;";
- $cases .= PHP_EOL . $this->_t(6) . "}";
+ $cases .= PHP_EOL . Indent::_(6) . "{";
+ $cases .= PHP_EOL . Indent::_(7) . $getMethod;
+ $cases .= PHP_EOL . Indent::_(6) . "}";
+ $cases .= PHP_EOL . Indent::_(6) . "else";
+ $cases .= PHP_EOL . Indent::_(6) . "{";
+ $cases .= PHP_EOL . Indent::_(7) . "\$result = false;";
+ $cases .= PHP_EOL . Indent::_(6) . "}";
}
else
{
- $cases .= PHP_EOL . $this->_t(6) . $getMethod;
+ $cases .= PHP_EOL . Indent::_(6) . $getMethod;
}
// continue the build
- $cases .= PHP_EOL . $this->_t(6)
+ $cases .= PHP_EOL . Indent::_(6)
. "if(\$callback)";
- $cases .= PHP_EOL . $this->_t(6) . "{";
- $cases .= PHP_EOL . $this->_t(7)
+ $cases .= PHP_EOL . Indent::_(6) . "{";
+ $cases .= PHP_EOL . Indent::_(7)
. "echo \$callback . \"(\".json_encode(\$result).\");\";";
- $cases .= PHP_EOL . $this->_t(6) . "}";
- $cases .= PHP_EOL . $this->_t(6) . "elseif(\$returnRaw)";
- $cases .= PHP_EOL . $this->_t(6) . "{";
- $cases .= PHP_EOL . $this->_t(7)
+ $cases .= PHP_EOL . Indent::_(6) . "}";
+ $cases .= PHP_EOL . Indent::_(6) . "elseif(\$returnRaw)";
+ $cases .= PHP_EOL . Indent::_(6) . "{";
+ $cases .= PHP_EOL . Indent::_(7)
. "echo json_encode(\$result);";
- $cases .= PHP_EOL . $this->_t(6) . "}";
- $cases .= PHP_EOL . $this->_t(6) . "else";
- $cases .= PHP_EOL . $this->_t(6) . "{";
- $cases .= PHP_EOL . $this->_t(7)
+ $cases .= PHP_EOL . Indent::_(6) . "}";
+ $cases .= PHP_EOL . Indent::_(6) . "else";
+ $cases .= PHP_EOL . Indent::_(6) . "{";
+ $cases .= PHP_EOL . Indent::_(7)
. "echo \"(\".json_encode(\$result).\");\";";
- $cases .= PHP_EOL . $this->_t(6) . "}";
- $cases .= PHP_EOL . $this->_t(5) . "}";
- $cases .= PHP_EOL . $this->_t(5) . "catch(Exception \$e)";
- $cases .= PHP_EOL . $this->_t(5) . "{";
- $cases .= PHP_EOL . $this->_t(6)
+ $cases .= PHP_EOL . Indent::_(6) . "}";
+ $cases .= PHP_EOL . Indent::_(5) . "}";
+ $cases .= PHP_EOL . Indent::_(5) . "catch(Exception \$e)";
+ $cases .= PHP_EOL . Indent::_(5) . "{";
+ $cases .= PHP_EOL . Indent::_(6)
. "if(\$callback)";
- $cases .= PHP_EOL . $this->_t(6) . "{";
- $cases .= PHP_EOL . $this->_t(7)
+ $cases .= PHP_EOL . Indent::_(6) . "{";
+ $cases .= PHP_EOL . Indent::_(7)
. "echo \$callback.\"(\".json_encode(\$e).\");\";";
- $cases .= PHP_EOL . $this->_t(6) . "}";
- $cases .= PHP_EOL . $this->_t(6)
+ $cases .= PHP_EOL . Indent::_(6) . "}";
+ $cases .= PHP_EOL . Indent::_(6)
. "elseif(\$returnRaw)";
- $cases .= PHP_EOL . $this->_t(6) . "{";
- $cases .= PHP_EOL . $this->_t(7)
+ $cases .= PHP_EOL . Indent::_(6) . "{";
+ $cases .= PHP_EOL . Indent::_(7)
. "echo json_encode(\$e);";
- $cases .= PHP_EOL . $this->_t(6) . "}";
- $cases .= PHP_EOL . $this->_t(6) . "else";
- $cases .= PHP_EOL . $this->_t(6) . "{";
- $cases .= PHP_EOL . $this->_t(7)
+ $cases .= PHP_EOL . Indent::_(6) . "}";
+ $cases .= PHP_EOL . Indent::_(6) . "else";
+ $cases .= PHP_EOL . Indent::_(6) . "{";
+ $cases .= PHP_EOL . Indent::_(7)
. "echo \"(\".json_encode(\$e).\");\";";
- $cases .= PHP_EOL . $this->_t(6) . "}";
- $cases .= PHP_EOL . $this->_t(5) . "}";
- $cases .= PHP_EOL . $this->_t(4) . "break;";
+ $cases .= PHP_EOL . Indent::_(6) . "}";
+ $cases .= PHP_EOL . Indent::_(5) . "}";
+ $cases .= PHP_EOL . Indent::_(4) . "break;";
}
}
}
@@ -18091,20 +17017,20 @@ class Interpretation extends Fields
public function setAjaxModelMethods($target)
{
$methods = '';
- if (isset($this->customScriptBuilder[$target]['ajax_model'])
+ if (isset(CFactory::_('Customcode.Dispenser')->hub[$target]['ajax_model'])
&& ArrayHelper::check(
- $this->customScriptBuilder[$target]['ajax_model']
+ CFactory::_('Customcode.Dispenser')->hub[$target]['ajax_model']
))
{
foreach (
- $this->customScriptBuilder[$target]['ajax_model'] as $view =>
+ CFactory::_('Customcode.Dispenser')->hub[$target]['ajax_model'] as $view =>
$method
)
{
- $methods .= PHP_EOL . PHP_EOL . $this->_t(1) . "//"
- . $this->setLine(__LINE__) . " Used in " . $view . PHP_EOL;
- $methods .= $this->setPlaceholders(
- $method, $this->placeholders
+ $methods .= PHP_EOL . PHP_EOL . Indent::_(1) . "//"
+ . Line::_(__Line__, __Class__) . " Used in " . $view . PHP_EOL;
+ $methods .= CFactory::_('Placeholder')->update_(
+ $method
);
}
}
@@ -18124,23 +17050,19 @@ class Interpretation extends Fields
public function setFilterFieldHelper(&$nameSingleCode, &$nameListCode)
{
// the old filter type uses these functions
- if (isset($this->filterBuilder[$nameListCode])
- && ArrayHelper::check(
- $this->filterBuilder[$nameListCode]
- ))
+ if (CFactory::_('Compiler.Builder.Filter')->exists($nameListCode))
{
// set the function or file path (2 = topbar)
$funtion_path = true;
- if (isset($this->adminFilterType[$nameListCode])
- && $this->adminFilterType[$nameListCode] == 2)
+ if (CFactory::_('Compiler.Builder.Admin.Filter.Type')->get($nameListCode, 1) == 2)
{
$funtion_path = false;
}
$function = array();
// set component name
- $component = $this->componentCodeName;
- $Component = ucfirst($component);
- foreach ($this->filterBuilder[$nameListCode] as $filter)
+ $component = CFactory::_('Config')->component_code_name;
+ $Component = ucfirst((string) $component);
+ foreach (CFactory::_('Compiler.Builder.Filter')->get($nameListCode) as $filter)
{
if ($filter['type'] != 'category'
&& ArrayHelper::check($filter['custom'])
@@ -18149,267 +17071,261 @@ class Interpretation extends Fields
// add if this is a function path
if ($funtion_path)
{
- $function[] = PHP_EOL . $this->_t(1)
+ $function[] = PHP_EOL . Indent::_(1)
. "protected function getThe" . $filter['function']
. StringHelper::safe(
$filter['custom']['text'], 'F'
) . "Selections()";
- $function[] = $this->_t(1) . "{";
+ $function[] = Indent::_(1) . "{";
}
- $function[] = $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $function[] = Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " Get a db connection.";
- $function[] = $this->_t(2) . "\$db = JFactory::getDbo();";
- $function[] = PHP_EOL . $this->_t(2) . "//"
- . $this->setLine(__LINE__)
+ $function[] = Indent::_(2) . "\$db = JFactory::getDbo();";
+ $function[] = PHP_EOL . Indent::_(2) . "//"
+ . Line::_(__Line__, __Class__)
. " Create a new query object.";
- $function[] = $this->_t(2)
+ $function[] = Indent::_(2)
. "\$query = \$db->getQuery(true);";
- $function[] = PHP_EOL . $this->_t(2) . "//"
- . $this->setLine(__LINE__) . " Select the text.";
- $function[] = $this->_t(2)
+ $function[] = PHP_EOL . Indent::_(2) . "//"
+ . Line::_(__Line__, __Class__) . " Select the text.";
+ $function[] = Indent::_(2)
. "\$query->select(\$db->quoteName(array('a."
. $filter['custom']['id'] . "','a."
. $filter['custom']['text'] . "')));";
- $function[] = $this->_t(2)
+ $function[] = Indent::_(2)
. "\$query->from(\$db->quoteName('"
. $filter['custom']['table'] . "', 'a'));";
- $function[] = $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $function[] = Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " get the targeted groups";
- $function[] = $this->_t(2)
+ $function[] = Indent::_(2)
. "\$groups= JComponentHelper::getParams('com_"
. $component . "')->get('" . $filter['type'] . "');";
- $function[] = $this->_t(2)
+ $function[] = Indent::_(2)
. "if (!empty(\$groups) && count((array) \$groups) > 0)";
- $function[] = $this->_t(2) . "{";
- $function[] = $this->_t(3)
+ $function[] = Indent::_(2) . "{";
+ $function[] = Indent::_(3)
. "\$query->join('LEFT', \$db->quoteName('#__user_usergroup_map', 'group') . ' ON (' . \$db->quoteName('group.user_id') . ' = ' . \$db->quoteName('a.id') . ')');";
- $function[] = $this->_t(3)
+ $function[] = Indent::_(3)
. "\$query->where('group.group_id IN (' . implode(',', \$groups) . ')');";
- $function[] = $this->_t(2) . "}";
- $function[] = $this->_t(2) . "\$query->order('a."
+ $function[] = Indent::_(2) . "}";
+ $function[] = Indent::_(2) . "\$query->order('a."
. $filter['custom']['text'] . " ASC');";
- $function[] = PHP_EOL . $this->_t(2) . "//"
- . $this->setLine(__LINE__)
+ $function[] = PHP_EOL . Indent::_(2) . "//"
+ . Line::_(__Line__, __Class__)
. " Reset the query using our newly populated query object.";
- $function[] = $this->_t(2) . "\$db->setQuery(\$query);";
- $function[] = PHP_EOL . $this->_t(2)
+ $function[] = Indent::_(2) . "\$db->setQuery(\$query);";
+ $function[] = PHP_EOL . Indent::_(2)
. "\$results = \$db->loadObjectList();";
- $function[] = $this->_t(2) . "\$_filter = array();";
+ $function[] = Indent::_(2) . "\$_filter = array();";
// if this is not a multi field
if (!$funtion_path && $filter['multi'] == 1)
{
- $function[] = $this->_t(2)
+ $function[] = Indent::_(2)
. "\$_filter[] = JHtml::_('select.option', '', '- Select ' . JText:"
. ":_('" . $filter['lang'] . "') . ' -');";
}
- $function[] = $this->_t(2) . "if (\$results)";
- $function[] = $this->_t(2) . "{";
- $function[] = $this->_t(3)
+ $function[] = Indent::_(2) . "if (\$results)";
+ $function[] = Indent::_(2) . "{";
+ $function[] = Indent::_(3)
. "foreach (\$results as \$result)";
- $function[] = $this->_t(3) . "{";
- $function[] = $this->_t(4)
+ $function[] = Indent::_(3) . "{";
+ $function[] = Indent::_(4)
. "\$_filter[] = JHtml::_('select.option', \$result->"
. $filter['custom']['id'] . ", \$result->"
. $filter['custom']['text'] . ");";
- $function[] = $this->_t(3) . "}";
- $function[] = $this->_t(2) . "}";
- $function[] = $this->_t(2) . "return \$_filter;";
+ $function[] = Indent::_(3) . "}";
+ $function[] = Indent::_(2) . "}";
+ $function[] = Indent::_(2) . "return \$_filter;";
// add if this is a function path
if ($funtion_path)
{
- $function[] = $this->_t(1) . "}";
+ $function[] = Indent::_(1) . "}";
}
/* else
{
- $function[] = PHP_EOL.$this->_t(1) . "protected function getThe".$filter['function'].StringHelper::safe($filter['custom']['text'],'F')."Selections()";
- $function[] = $this->_t(1) . "{";
- $function[] = $this->_t(2) . "//".$this->setLine(__LINE__)." Get a db connection.";
- $function[] = $this->_t(2) . "\$db = JFactory::getDbo();";
- $function[] = PHP_EOL.$this->_t(2) . "//".$this->setLine(__LINE__)." Select the text.";
- $function[] = $this->_t(2) . "\$query = \$db->getQuery(true);";
- $function[] = PHP_EOL.$this->_t(2) . "//".$this->setLine(__LINE__)." Select the text.";
- $function[] = $this->_t(2) . "\$query->select(\$db->quoteName(array('".$filter['custom']['id']."','".$filter['custom']['text']."')));";
- $function[] = $this->_t(2) . "\$query->from(\$db->quoteName('".$filter['custom']['table']."'));";
- $function[] = $this->_t(2) . "\$query->where(\$db->quoteName('published') . ' = 1');";
- $function[] = $this->_t(2) . "\$query->order(\$db->quoteName('".$filter['custom']['text']."') . ' ASC');";
- $function[] = PHP_EOL.$this->_t(2) . "//".$this->setLine(__LINE__)." Reset the query using our newly populated query object.";
- $function[] = $this->_t(2) . "\$db->setQuery(\$query);";
- $function[] = PHP_EOL.$this->_t(2) . "\$results = \$db->loadObjectList();";
- $function[] = PHP_EOL.$this->_t(2) . "if (\$results)";
- $function[] = $this->_t(2) . "{";
- $function[] = $this->_t(3) . "\$filter = array();";
- $function[] = $this->_t(3) . "\$batch = array();";
- $function[] = $this->_t(3) . "foreach (\$results as \$result)";
- $function[] = $this->_t(3) . "{";
+ $function[] = PHP_EOL.Indent::_(1) . "protected function getThe".$filter['function'].StringHelper::safe($filter['custom']['text'],'F')."Selections()";
+ $function[] = Indent::_(1) . "{";
+ $function[] = Indent::_(2) . "//".Line::_(__Line__, __Class__)." Get a db connection.";
+ $function[] = Indent::_(2) . "\$db = JFactory::getDbo();";
+ $function[] = PHP_EOL.Indent::_(2) . "//".Line::_(__Line__, __Class__)." Select the text.";
+ $function[] = Indent::_(2) . "\$query = \$db->getQuery(true);";
+ $function[] = PHP_EOL.Indent::_(2) . "//".Line::_(__Line__, __Class__)." Select the text.";
+ $function[] = Indent::_(2) . "\$query->select(\$db->quoteName(array('".$filter['custom']['id']."','".$filter['custom']['text']."')));";
+ $function[] = Indent::_(2) . "\$query->from(\$db->quoteName('".$filter['custom']['table']."'));";
+ $function[] = Indent::_(2) . "\$query->where(\$db->quoteName('published') . ' = 1');";
+ $function[] = Indent::_(2) . "\$query->order(\$db->quoteName('".$filter['custom']['text']."') . ' ASC');";
+ $function[] = PHP_EOL.Indent::_(2) . "//".Line::_(__Line__, __Class__)." Reset the query using our newly populated query object.";
+ $function[] = Indent::_(2) . "\$db->setQuery(\$query);";
+ $function[] = PHP_EOL.Indent::_(2) . "\$results = \$db->loadObjectList();";
+ $function[] = PHP_EOL.Indent::_(2) . "if (\$results)";
+ $function[] = Indent::_(2) . "{";
+ $function[] = Indent::_(3) . "\$filter = array();";
+ $function[] = Indent::_(3) . "\$batch = array();";
+ $function[] = Indent::_(3) . "foreach (\$results as \$result)";
+ $function[] = Indent::_(3) . "{";
if ($filter['custom']['text'] === 'user')
{
- $function[] = $this->_t(4) . "\$filter[] = JHtml::_('select.option', \$result->".$filter['custom']['text'].", JFactory::getUser(\$result->".$filter['custom']['text'].")->name);";
- $function[] = $this->_t(4) . "\$batch[] = JHtml::_('select.option', \$result->".$filter['custom']['id'].", JFactory::getUser(\$result->".$filter['custom']['text'].")->name);";
+ $function[] = Indent::_(4) . "\$filter[] = JHtml::_('select.option', \$result->".$filter['custom']['text'].", JFactory::getUser(\$result->".$filter['custom']['text'].")->name);";
+ $function[] = Indent::_(4) . "\$batch[] = JHtml::_('select.option', \$result->".$filter['custom']['id'].", JFactory::getUser(\$result->".$filter['custom']['text'].")->name);";
}
else
{
- $function[] = $this->_t(4) . "\$filter[] = JHtml::_('select.option', \$result->".$filter['custom']['text'].", \$result->".$filter['custom']['text'].");";
- $function[] = $this->_t(4) . "\$batch[] = JHtml::_('select.option', \$result->".$filter['custom']['id'].", \$result->".$filter['custom']['text'].");";
+ $function[] = Indent::_(4) . "\$filter[] = JHtml::_('select.option', \$result->".$filter['custom']['text'].", \$result->".$filter['custom']['text'].");";
+ $function[] = Indent::_(4) . "\$batch[] = JHtml::_('select.option', \$result->".$filter['custom']['id'].", \$result->".$filter['custom']['text'].");";
}
- $function[] = $this->_t(3) . "}";
- $function[] = $this->_t(3) . "return array('filter' => \$filter, 'batch' => \$batch);";
- $function[] = $this->_t(2) . "}";
- $function[] = $this->_t(2) . "return false;";
- $function[] = $this->_t(1) . "}";
+ $function[] = Indent::_(3) . "}";
+ $function[] = Indent::_(3) . "return array('filter' => \$filter, 'batch' => \$batch);";
+ $function[] = Indent::_(2) . "}";
+ $function[] = Indent::_(2) . "return false;";
+ $function[] = Indent::_(1) . "}";
} */
}
elseif ($filter['type'] != 'category'
&& !ArrayHelper::check($filter['custom']))
{
$translation = false;
- if (isset($this->selectionTranslationFixBuilder[$nameListCode])
- && ArrayHelper::check(
- $this->selectionTranslationFixBuilder[$nameListCode]
- )
- && array_key_exists(
- $filter['code'],
- $this->selectionTranslationFixBuilder[$nameListCode]
- ))
+ if (CFactory::_('Compiler.Builder.Selection.Translation')->
+ exists($nameListCode . '.' . $filter['code']))
{
$translation = true;
}
// add if this is a function path
if ($funtion_path)
{
- $function[] = PHP_EOL . $this->_t(1)
+ $function[] = PHP_EOL . Indent::_(1)
. "protected function getThe" . $filter['function']
. "Selections()";
- $function[] = $this->_t(1) . "{";
- $function[] = $this->_t(2) . "//" . $this->setLine(
- __LINE__
+ $function[] = Indent::_(1) . "{";
+ $function[] = Indent::_(2) . "//" . Line::_(
+ __LINE__,__CLASS__
)
. " Get a db connection.";
}
else
{
- $function[] = "//" . $this->setLine(__LINE__)
+ $function[] = "//" . Line::_(__Line__, __Class__)
. " Get a db connection.";
}
- $function[] = $this->_t(2) . "\$db = JFactory::getDbo();";
- $function[] = PHP_EOL . $this->_t(2) . "//"
- . $this->setLine(__LINE__)
+ $function[] = Indent::_(2) . "\$db = JFactory::getDbo();";
+ $function[] = PHP_EOL . Indent::_(2) . "//"
+ . Line::_(__Line__, __Class__)
. " Create a new query object.";
- $function[] = $this->_t(2)
+ $function[] = Indent::_(2)
. "\$query = \$db->getQuery(true);";
// check if usergroup as we change to an object query
if ($filter['type'] === 'usergroup')
{
- $function[] = PHP_EOL . $this->_t(2) . "//"
- . $this->setLine(__LINE__) . " Select the text.";
- $function[] = $this->_t(2)
+ $function[] = PHP_EOL . Indent::_(2) . "//"
+ . Line::_(__Line__, __Class__) . " Select the text.";
+ $function[] = Indent::_(2)
. "\$query->select(\$db->quoteName('g."
. $filter['code'] . "', 'id'));";
- $function[] = $this->_t(2)
+ $function[] = Indent::_(2)
. "\$query->select(\$db->quoteName('ug.title', 'title'));";
- $function[] = $this->_t(2)
+ $function[] = Indent::_(2)
. "\$query->from(\$db->quoteName('#__" . $component
. "_" . $filter['database'] . "', 'g'));";
- $function[] = $this->_t(2)
+ $function[] = Indent::_(2)
. "\$query->join('LEFT', \$db->quoteName('#__usergroups', 'ug') . ' ON (' . (\$db->quoteName('g."
. $filter['code']
. "') . ' = ' . \$db->quoteName('ug.id') . ')'));";
- $function[] = $this->_t(2)
+ $function[] = Indent::_(2)
. "\$query->order(\$db->quoteName('title') . ' ASC');";
- $function[] = $this->_t(2)
+ $function[] = Indent::_(2)
. "\$query->group(\$db->quoteName('ug.id'));";
- $function[] = PHP_EOL . $this->_t(2) . "//"
- . $this->setLine(__LINE__)
+ $function[] = PHP_EOL . Indent::_(2) . "//"
+ . Line::_(__Line__, __Class__)
. " Reset the query using our newly populated query object.";
- $function[] = $this->_t(2) . "\$db->setQuery(\$query);";
- $function[] = PHP_EOL . $this->_t(2)
- . "\$results = \$db->loadObjectList();";
+ $function[] = Indent::_(2) . "\$db->setQuery(\$query);";
+ $function[] = PHP_EOL . Indent::_(2)
+ . "\$_results = \$db->loadObjectList();";
}
else
{
- $function[] = PHP_EOL . $this->_t(2) . "//"
- . $this->setLine(__LINE__) . " Select the text.";
- $function[] = $this->_t(2)
+ $function[] = PHP_EOL . Indent::_(2) . "//"
+ . Line::_(__Line__, __Class__) . " Select the text.";
+ $function[] = Indent::_(2)
. "\$query->select(\$db->quoteName('"
. $filter['code'] . "'));";
- $function[] = $this->_t(2)
+ $function[] = Indent::_(2)
. "\$query->from(\$db->quoteName('#__" . $component
. "_" . $filter['database'] . "'));";
- $function[] = $this->_t(2)
+ $function[] = Indent::_(2)
. "\$query->order(\$db->quoteName('"
. $filter['code'] . "') . ' ASC');";
- $function[] = PHP_EOL . $this->_t(2) . "//"
- . $this->setLine(__LINE__)
+ $function[] = PHP_EOL . Indent::_(2) . "//"
+ . Line::_(__Line__, __Class__)
. " Reset the query using our newly populated query object.";
- $function[] = $this->_t(2) . "\$db->setQuery(\$query);";
- $function[] = PHP_EOL . $this->_t(2)
- . "\$results = \$db->loadColumn();";
+ $function[] = Indent::_(2) . "\$db->setQuery(\$query);";
+ $function[] = PHP_EOL . Indent::_(2)
+ . "\$_results = \$db->loadColumn();";
}
- $function[] = $this->_t(2) . "\$_filter = array();";
+ $function[] = Indent::_(2) . "\$_filter = array();";
// if this is not a multi field
if (!$funtion_path && $filter['multi'] == 1)
{
- $function[] = $this->_t(2)
+ $function[] = Indent::_(2)
. "\$_filter[] = JHtml::_('select.option', '', '- ' . JText:"
. ":_('" . $filter['lang_select'] . "') . ' -');";
}
- $function[] = PHP_EOL . $this->_t(2) . "if (\$results)";
- $function[] = $this->_t(2) . "{";
+ $function[] = PHP_EOL . Indent::_(2) . "if (\$_results)";
+ $function[] = Indent::_(2) . "{";
// check if translated value is used
if ($funtion_path && $translation)
{
- $function[] = $this->_t(3) . "//" . $this->setLine(
- __LINE__
+ $function[] = Indent::_(3) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " get model";
- $function[] = $this->_t(3)
- . "\$model = \$this->getModel();";
+ $function[] = Indent::_(3)
+ . "\$_model = \$this->getModel();";
}
elseif ($translation)
{
- $function[] = $this->_t(3) . "//" . $this->setLine(
- __LINE__
+ $function[] = Indent::_(3) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " get " . $nameListCode . "model";
- $function[] = $this->_t(3)
- . "\$model = " . $Component . "Helper::getModel('"
+ $function[] = Indent::_(3)
+ . "\$_model = " . $Component . "Helper::getModel('"
. $nameListCode . "');";
}
// check if usergroup as we change to an object query
if ($filter['type'] !== 'usergroup')
{
- $function[] = $this->_t(3)
- . "\$results = array_unique(\$results);";
+ $function[] = Indent::_(3)
+ . "\$_results = array_unique(\$_results);";
}
- $function[] = $this->_t(3) . "foreach (\$results as \$"
+ $function[] = Indent::_(3) . "foreach (\$_results as \$"
. $filter['code'] . ")";
- $function[] = $this->_t(3) . "{";
+ $function[] = Indent::_(3) . "{";
// check if translated value is used
if ($translation)
{
- $function[] = $this->_t(4) . "//" . $this->setLine(
- __LINE__
+ $function[] = Indent::_(4) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " Translate the " . $filter['code']
. " selection";
- $function[] = $this->_t(4)
- . "\$text = \$model->selectionTranslation(\$"
+ $function[] = Indent::_(4)
+ . "\$_text = \$_model->selectionTranslation(\$"
. $filter['code'] . ",'" . $filter['code'] . "');";
- $function[] = $this->_t(4) . "//" . $this->setLine(
- __LINE__
+ $function[] = Indent::_(4) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " Now add the " . $filter['code']
. " and its text to the options array";
- $function[] = $this->_t(4)
+ $function[] = Indent::_(4)
. "\$_filter[] = JHtml::_('select.option', \$"
- . $filter['code'] . ", JText:" . ":_(\$text));";
+ . $filter['code'] . ", JText:" . ":_(\$_text));";
}
elseif ($filter['type'] === 'user')
{
- $function[] = $this->_t(4) . "//" . $this->setLine(
- __LINE__
+ $function[] = Indent::_(4) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " Now add the " . $filter['code']
. " and its text to the options array";
- $function[] = $this->_t(4)
+ $function[] = Indent::_(4)
. "\$_filter[] = JHtml::_('select.option', \$"
. $filter['code'] . ", JFactory::getUser(\$"
. $filter['code'] . ")->name);";
@@ -18418,34 +17334,34 @@ class Interpretation extends Fields
{
if ($filter['type'] === 'usergroup')
{
- $function[] = $this->_t(4) . "//" . $this->setLine(
- __LINE__
+ $function[] = Indent::_(4) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " Now add the " . $filter['code']
. " and its text to the options array";
- $function[] = $this->_t(4)
+ $function[] = Indent::_(4)
. "\$_filter[] = JHtml::_('select.option', \$"
. $filter['code'] . "->id, \$" . $filter['code']
. "->title);";
}
else
{
- $function[] = $this->_t(4) . "//" . $this->setLine(
- __LINE__
+ $function[] = Indent::_(4) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " Now add the " . $filter['code']
. " and its text to the options array";
- $function[] = $this->_t(4)
+ $function[] = Indent::_(4)
. "\$_filter[] = JHtml::_('select.option', \$"
. $filter['code'] . ", \$" . $filter['code']
. ");";
}
}
- $function[] = $this->_t(3) . "}";
- $function[] = $this->_t(2) . "}";
- $function[] = $this->_t(2) . "return \$_filter;";
+ $function[] = Indent::_(3) . "}";
+ $function[] = Indent::_(2) . "}";
+ $function[] = Indent::_(2) . "return \$_filter;";
// add if this is a function path
if ($funtion_path)
{
- $function[] = $this->_t(1) . "}";
+ $function[] = Indent::_(1) . "}";
}
}
// we check if this is a multi field
@@ -18460,9 +17376,9 @@ class Interpretation extends Fields
$filter['custom']
)['JFORM_TYPE_PHP'];
// check for the [JHtml::_('select.option', '',] code
- if (strpos($field_code, "JHtml::_('select.option', '',")
+ if (strpos((string) $field_code, "JHtml::_('select.option', '',")
!== false
- && strpos($field_code, '($this->multiple === false)')
+ && strpos((string) $field_code, '($this->multiple === false)')
=== false)
{
// for now we just give an error message (don't fix it)
@@ -18471,11 +17387,11 @@ class Interpretation extends Fields
'Error'
);
$field_url
- = '"index.php?option=com_componentbuilder&view=fields&task=field.edit&id='
+ = '"index.php?option=com_componentbuilder&view=fields&task=field.edit&id='
. $filter['id'] . '" target="_blank"';
$field_fix
- = "if (\$this->multiple === false) { // <-- this if statement is needed";
- $field_fix .= PHP_EOL . $this->_t(1)
+ = "if (\$this->multiple === false) { // <-- this if statement is needed";
+ $field_fix .= PHP_EOL . Indent::_(1)
. "\$options[] = JHtml::_('select.option', '', 'Select an option'); // <-- the empty option";
$field_fix .= PHP_EOL . "}";
$this->app->enqueueMessage(
@@ -18516,44 +17432,43 @@ class Interpretation extends Fields
public function setUniqueFields(&$view)
{
$fields = array();
- $fields[] = PHP_EOL . PHP_EOL . $this->_t(1) . "/**";
- $fields[] = $this->_t(1)
+ $fields[] = PHP_EOL . PHP_EOL . Indent::_(1) . "/**";
+ $fields[] = Indent::_(1)
. " * Method to get the unique fields of this table.";
- $fields[] = $this->_t(1) . " *";
- $fields[] = $this->_t(1)
+ $fields[] = Indent::_(1) . " *";
+ $fields[] = Indent::_(1)
. " * @return mixed An array of field names, boolean false if none is set.";
- $fields[] = $this->_t(1) . " *";
- $fields[] = $this->_t(1) . " * @since 3.0";
- $fields[] = $this->_t(1) . " */";
- $fields[] = $this->_t(1) . "protected function getUniqueFields()";
- $fields[] = $this->_t(1) . "{";
- if (isset($this->dbUniqueKeys[$view])
- && ArrayHelper::check($this->dbUniqueKeys[$view]))
+ $fields[] = Indent::_(1) . " *";
+ $fields[] = Indent::_(1) . " * @since 3.0";
+ $fields[] = Indent::_(1) . " */";
+ $fields[] = Indent::_(1) . "protected function getUniqueFields()";
+ $fields[] = Indent::_(1) . "{";
+ if (CFactory::_('Compiler.Builder.Database.Unique.Keys')->exists($view))
{
// if guid should also be added
- if (isset($this->dbUniqueGuid[$view]))
+ if (CFactory::_('Compiler.Builder.Database.Unique.Guid')->exists($view))
{
- $fields[] = $this->_t(2) . "return array('" . implode(
- "','", $this->dbUniqueKeys[$view]
+ $fields[] = Indent::_(2) . "return array('" . implode(
+ "','", CFactory::_('Compiler.Builder.Database.Unique.Keys')->get($view)
) . "', 'guid');";
}
else
{
- $fields[] = $this->_t(2) . "return array('" . implode(
- "','", $this->dbUniqueKeys[$view]
+ $fields[] = Indent::_(2) . "return array('" . implode(
+ "','", CFactory::_('Compiler.Builder.Database.Unique.Keys')->get($view)
) . "');";
}
}
// if only GUID is found
- elseif (isset($this->dbUniqueGuid[$view]))
+ elseif (CFactory::_('Compiler.Builder.Database.Unique.Guid')->exists($view))
{
- $fields[] = $this->_t(2) . "return array('guid');";
+ $fields[] = Indent::_(2) . "return array('guid');";
}
else
{
- $fields[] = $this->_t(2) . "return false;";
+ $fields[] = Indent::_(2) . "return false;";
}
- $fields[] = $this->_t(1) . "}";
+ $fields[] = Indent::_(1) . "}";
// return the unique fields
return implode(PHP_EOL, $fields);
@@ -18581,18 +17496,13 @@ class Interpretation extends Fields
// add the category filter stuff
$this->setCategorySidebarFilterHelper($fieldFilters, $nameListCode);
// check if filter fields are added (1 = sidebar)
- if (isset($this->adminFilterType[$nameListCode])
- && $this->adminFilterType[$nameListCode] == 1
- && isset($this->filterBuilder[$nameListCode])
- && ArrayHelper::check(
- $this->filterBuilder[$nameListCode]
- ))
+ if (CFactory::_('Compiler.Builder.Admin.Filter.Type')->get($nameListCode, 1) == 1
+ && CFactory::_('Compiler.Builder.Filter')->exists($nameListCode))
{
// get component name
- $Component = $this->fileContentStatic[$this->hhh . 'Component'
- . $this->hhh];
+ $Component = CFactory::_('Compiler.Builder.Content.One')->get('Component');
// load the rest of the filters
- foreach ($this->filterBuilder[$nameListCode] as $filter)
+ foreach (CFactory::_('Compiler.Builder.Filter')->get($nameListCode) as $filter)
{
if ($filter['type'] != 'category'
&& ArrayHelper::check($filter['custom'])
@@ -18608,53 +17518,53 @@ class Interpretation extends Fields
$type = StringHelper::safe(
$filter['custom']['type'], 'F'
);
- $fieldFilters[] = PHP_EOL . $this->_t(2) . "//"
- . $this->setLine(__LINE__) . " Set " . $CodeName
+ $fieldFilters[] = PHP_EOL . Indent::_(2) . "//"
+ . Line::_(__Line__, __Class__) . " Set " . $CodeName
. " Selection";
- $fieldFilters[] = $this->_t(2) . "\$this->" . $codeName
+ $fieldFilters[] = Indent::_(2) . "\$this->" . $codeName
. "Options = JFormHelper::loadFieldType('" . $type
. "')->options;";
- $fieldFilters[] = $this->_t(2) . "//" . $this->setLine(
- __LINE__
+ $fieldFilters[] = Indent::_(2) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " We do some sanitation for " . $CodeName
. " filter";
- $fieldFilters[] = $this->_t(2) . "if (" . $Component
+ $fieldFilters[] = Indent::_(2) . "if (" . $Component
. "Helper::checkArray(\$this->" . $codeName
. "Options) &&";
- $fieldFilters[] = $this->_t(3) . "isset(\$this->"
+ $fieldFilters[] = Indent::_(3) . "isset(\$this->"
. $codeName
. "Options[0]->value) &&";
- $fieldFilters[] = $this->_t(3) . "!" . $Component
+ $fieldFilters[] = Indent::_(3) . "!" . $Component
. "Helper::checkString(\$this->" . $codeName
. "Options[0]->value))";
- $fieldFilters[] = $this->_t(2) . "{";
- $fieldFilters[] = $this->_t(3) . "unset(\$this->"
+ $fieldFilters[] = Indent::_(2) . "{";
+ $fieldFilters[] = Indent::_(3) . "unset(\$this->"
. $codeName
. "Options[0]);";
- $fieldFilters[] = $this->_t(2) . "}";
- $fieldFilters[] = $this->_t(2) . "//" . $this->setLine(
- __LINE__
+ $fieldFilters[] = Indent::_(2) . "}";
+ $fieldFilters[] = Indent::_(2) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " Only load " . $CodeName
. " filter if it has values";
- $fieldFilters[] = $this->_t(2) . "if (" . $Component
+ $fieldFilters[] = Indent::_(2) . "if (" . $Component
. "Helper::checkArray(\$this->" . $codeName
. "Options))";
- $fieldFilters[] = $this->_t(2) . "{";
- $fieldFilters[] = $this->_t(3) . "//" . $this->setLine(
- __LINE__
+ $fieldFilters[] = Indent::_(2) . "{";
+ $fieldFilters[] = Indent::_(3) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " " . $CodeName . " Filter";
- $fieldFilters[] = $this->_t(3) . "JHtmlSidebar::addFilter(";
- $fieldFilters[] = $this->_t(4) . "'- Select ' . JText:"
+ $fieldFilters[] = Indent::_(3) . "JHtmlSidebar::addFilter(";
+ $fieldFilters[] = Indent::_(4) . "'- Select ' . JText:"
. ":_('" . $filter['lang'] . "') . ' -',";
- $fieldFilters[] = $this->_t(4) . "'filter_"
+ $fieldFilters[] = Indent::_(4) . "'filter_"
. $filter['code']
. "',";
- $fieldFilters[] = $this->_t(4)
+ $fieldFilters[] = Indent::_(4)
. "JHtml::_('select.options', \$this->" . $codeName
. "Options, 'value', 'text', \$this->state->get('filter."
. $filter['code'] . "'))";
- $fieldFilters[] = $this->_t(3) . ");";
- $fieldFilters[] = $this->_t(2) . "}";
+ $fieldFilters[] = Indent::_(3) . ");";
+ $fieldFilters[] = Indent::_(2) . "}";
}
elseif ($filter['type'] != 'category')
{
@@ -18675,53 +17585,53 @@ class Interpretation extends Fields
$functionName = "\$this->getThe" . $filter['function']
. "Selections();";
}
- $fieldFilters[] = PHP_EOL . $this->_t(2) . "//"
- . $this->setLine(__LINE__) . " Set " . $Codename
+ $fieldFilters[] = PHP_EOL . Indent::_(2) . "//"
+ . Line::_(__Line__, __Class__) . " Set " . $Codename
. " Selection";
- $fieldFilters[] = $this->_t(2) . "\$this->"
+ $fieldFilters[] = Indent::_(2) . "\$this->"
. $filter['code']
. "Options = " . $functionName;
- $fieldFilters[] = $this->_t(2) . "//" . $this->setLine(
- __LINE__
+ $fieldFilters[] = Indent::_(2) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " We do some sanitation for " . $Codename
. " filter";
- $fieldFilters[] = $this->_t(2) . "if (" . $Component
+ $fieldFilters[] = Indent::_(2) . "if (" . $Component
. "Helper::checkArray(\$this->" . $filter['code']
. "Options) &&";
- $fieldFilters[] = $this->_t(3) . "isset(\$this->"
+ $fieldFilters[] = Indent::_(3) . "isset(\$this->"
. $filter['code'] . "Options[0]->value) &&";
- $fieldFilters[] = $this->_t(3) . "!" . $Component
+ $fieldFilters[] = Indent::_(3) . "!" . $Component
. "Helper::checkString(\$this->" . $filter['code']
. "Options[0]->value))";
- $fieldFilters[] = $this->_t(2) . "{";
- $fieldFilters[] = $this->_t(3) . "unset(\$this->"
+ $fieldFilters[] = Indent::_(2) . "{";
+ $fieldFilters[] = Indent::_(3) . "unset(\$this->"
. $filter['code'] . "Options[0]);";
- $fieldFilters[] = $this->_t(2) . "}";
- $fieldFilters[] = $this->_t(2) . "//" . $this->setLine(
- __LINE__
+ $fieldFilters[] = Indent::_(2) . "}";
+ $fieldFilters[] = Indent::_(2) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " Only load " . $Codename
. " filter if it has values";
- $fieldFilters[] = $this->_t(2) . "if (" . $Component
+ $fieldFilters[] = Indent::_(2) . "if (" . $Component
. "Helper::checkArray(\$this->" . $filter['code']
. "Options))";
- $fieldFilters[] = $this->_t(2) . "{";
- $fieldFilters[] = $this->_t(3) . "//" . $this->setLine(
- __LINE__
+ $fieldFilters[] = Indent::_(2) . "{";
+ $fieldFilters[] = Indent::_(3) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " " . $Codename . " Filter";
- $fieldFilters[] = $this->_t(3) . "JHtmlSidebar::addFilter(";
- $fieldFilters[] = $this->_t(4) . "'- Select '.JText:"
+ $fieldFilters[] = Indent::_(3) . "JHtmlSidebar::addFilter(";
+ $fieldFilters[] = Indent::_(4) . "'- Select '.JText:"
. ":_('" . $filter['lang'] . "').' -',";
- $fieldFilters[] = $this->_t(4) . "'filter_"
+ $fieldFilters[] = Indent::_(4) . "'filter_"
. $filter['code']
. "',";
- $fieldFilters[] = $this->_t(4)
+ $fieldFilters[] = Indent::_(4)
. "JHtml::_('select.options', \$this->"
. $filter['code']
. "Options, 'value', 'text', \$this->state->get('filter."
. $filter['code'] . "'))";
- $fieldFilters[] = $this->_t(3) . ");";
+ $fieldFilters[] = Indent::_(3) . ");";
- $fieldFilters[] = $this->_t(2) . "}";
+ $fieldFilters[] = Indent::_(2) . "}";
}
}
}
@@ -18750,38 +17660,34 @@ class Interpretation extends Fields
)
{
// add the default filters if we are on the old filter paths (1 = sidebar)
- if (isset($this->adminFilterType[$nameListCode])
- && $this->adminFilterType[$nameListCode] == 1)
+ if (CFactory::_('Compiler.Builder.Admin.Filter.Type')->get($nameListCode, 1) == 1)
{
// set batch
- $filter[] = PHP_EOL . $this->_t(2)
- . "//" . $this->setLine(__LINE__)
+ $filter[] = PHP_EOL . Indent::_(2)
+ . "//" . Line::_(__Line__, __Class__)
. " Only load publish filter if state change is allowed";
- $filter[] = $this->_t(2)
+ $filter[] = Indent::_(2)
. "if (\$this->canState)";
- $filter[] = $this->_t(2) . "{";
- $filter[] = $this->_t(3) . "JHtmlSidebar::addFilter(";
- $filter[] = $this->_t(4) . "JText:"
+ $filter[] = Indent::_(2) . "{";
+ $filter[] = Indent::_(3) . "JHtmlSidebar::addFilter(";
+ $filter[] = Indent::_(4) . "JText:"
. ":_('JOPTION_SELECT_PUBLISHED'),";
- $filter[] = $this->_t(4) . "'filter_published',";
- $filter[] = $this->_t(4)
+ $filter[] = Indent::_(4) . "'filter_published',";
+ $filter[] = Indent::_(4)
. "JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', \$this->state->get('filter.published'), true)";
- $filter[] = $this->_t(3) . ");";
- $filter[] = $this->_t(2) . "}";
+ $filter[] = Indent::_(3) . ");";
+ $filter[] = Indent::_(2) . "}";
// check if view has access
- if (isset($this->accessBuilder[$nameSingleCode])
- && StringHelper::check(
- $this->accessBuilder[$nameSingleCode]
- )
- && !isset($this->fieldsNames[$nameSingleCode]['access']))
+ if (CFactory::_('Compiler.Builder.Access.Switch')->exists($nameSingleCode)
+ && !CFactory::_('Compiler.Builder.Field.Names')->isString($nameSingleCode . '.access'))
{
- $filter[] = PHP_EOL . $this->_t(2) . "JHtmlSidebar::addFilter(";
- $filter[] = $this->_t(3) . "JText:"
+ $filter[] = PHP_EOL . Indent::_(2) . "JHtmlSidebar::addFilter(";
+ $filter[] = Indent::_(3) . "JText:"
. ":_('JOPTION_SELECT_ACCESS'),";
- $filter[] = $this->_t(3) . "'filter_access',";
- $filter[] = $this->_t(3)
+ $filter[] = Indent::_(3) . "'filter_access',";
+ $filter[] = Indent::_(3)
. "JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', \$this->state->get('filter.access'))";
- $filter[] = $this->_t(2) . ");";
+ $filter[] = Indent::_(2) . ");";
}
}
}
@@ -18798,28 +17704,22 @@ class Interpretation extends Fields
protected function setCategorySidebarFilterHelper(&$filter, &$nameListCode)
{
// add the category filter if we are on the old filter paths (1 = sidebar)
- if (isset($this->adminFilterType[$nameListCode])
- && $this->adminFilterType[$nameListCode] == 1
- && isset($this->categoryBuilder[$nameListCode])
- && ArrayHelper::check(
- $this->categoryBuilder[$nameListCode]
- )
- && isset($this->categoryBuilder[$nameListCode]['extension'])
- && isset($this->categoryBuilder[$nameListCode]['filter'])
- && $this->categoryBuilder[$nameListCode]['filter'] >= 1)
+ if (CFactory::_('Compiler.Builder.Admin.Filter.Type')->get($nameListCode, 1) == 1
+ && CFactory::_('Compiler.Builder.Category')->exists("{$nameListCode}.extension")
+ && CFactory::_('Compiler.Builder.Category')->get("{$nameListCode}.filter", 0) >= 1)
{
// set filter
- $filter[] = PHP_EOL . $this->_t(2) . "//"
- . $this->setLine(__LINE__) . " Category Filter.";
- $filter[] = $this->_t(2) . "JHtmlSidebar::addFilter(";
- $filter[] = $this->_t(3) . "JText:"
+ $filter[] = PHP_EOL . Indent::_(2) . "//"
+ . Line::_(__Line__, __Class__) . " Category Filter.";
+ $filter[] = Indent::_(2) . "JHtmlSidebar::addFilter(";
+ $filter[] = Indent::_(3) . "JText:"
. ":_('JOPTION_SELECT_CATEGORY'),";
- $filter[] = $this->_t(3) . "'filter_category_id',";
- $filter[] = $this->_t(3)
+ $filter[] = Indent::_(3) . "'filter_category_id',";
+ $filter[] = Indent::_(3)
. "JHtml::_('select.options', JHtml::_('category.options', '"
- . $this->categoryBuilder[$nameListCode]['extension']
+ . CFactory::_('Compiler.Builder.Category')->get("{$nameListCode}.extension")
. "'), 'value', 'text', \$this->state->get('filter.category_id'))";
- $filter[] = $this->_t(2) . ");";
+ $filter[] = Indent::_(2) . ");";
}
}
@@ -18841,24 +17741,19 @@ class Interpretation extends Fields
// add the category filter stuff
$this->setCategoryBatchHelper($fieldBatch, $nameListCode);
// check if we have other batch options to add
- if (isset($this->filterBuilder[$nameListCode])
- && ArrayHelper::check(
- $this->filterBuilder[$nameListCode]
- ))
+ if (CFactory::_('Compiler.Builder.Filter')->exists($nameListCode))
{
// check if we should add some help to get the values (2 = topbar)
$get_values = false;
- if (isset($this->adminFilterType[$nameListCode])
- && $this->adminFilterType[$nameListCode] == 2)
+ if (CFactory::_('Compiler.Builder.Admin.Filter.Type')->get($nameListCode, 1) == 2)
{
// since the old path is not used, we need to add those values here
$get_values = true;
}
// get component name
- $Component = $this->fileContentStatic[$this->hhh . 'Component'
- . $this->hhh];
+ $Component = CFactory::_('Compiler.Builder.Content.One')->get('Component');
// load the rest of the batch options
- foreach ($this->filterBuilder[$nameListCode] as $filter)
+ foreach (CFactory::_('Compiler.Builder.Filter')->get($nameListCode) as $filter)
{
if ($filter['type'] != 'category'
&& ArrayHelper::check($filter['custom'])
@@ -18871,58 +17766,58 @@ class Interpretation extends Fields
. StringHelper::safe(
$filter['custom']['text'], 'F'
);
- $fieldBatch[] = PHP_EOL . $this->_t(2)
- . "//" . $this->setLine(__LINE__)
+ $fieldBatch[] = PHP_EOL . Indent::_(2)
+ . "//" . Line::_(__Line__, __Class__)
. " Only load " . $CodeName
. " batch if create, edit, and batch is allowed";
- $fieldBatch[] = $this->_t(2)
+ $fieldBatch[] = Indent::_(2)
. "if (\$this->canBatch && \$this->canCreate && \$this->canEdit)";
- $fieldBatch[] = $this->_t(2) . "{";
+ $fieldBatch[] = Indent::_(2) . "{";
// add the get values here
if ($get_values)
{
$type = StringHelper::safe(
$filter['custom']['type'], 'F'
);
- $fieldBatch[] = $this->_t(3) . "//"
- . $this->setLine(__LINE__) . " Set " . $CodeName
+ $fieldBatch[] = Indent::_(3) . "//"
+ . Line::_(__Line__, __Class__) . " Set " . $CodeName
. " Selection";
- $fieldBatch[] = $this->_t(3) . "\$this->" . $codeName
+ $fieldBatch[] = Indent::_(3) . "\$this->" . $codeName
. "Options = JFormHelper::loadFieldType('" . $type
. "')->options;";
- $fieldBatch[] = $this->_t(3) . "//" . $this->setLine(
- __LINE__
+ $fieldBatch[] = Indent::_(3) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " We do some sanitation for " . $CodeName
. " filter";
- $fieldBatch[] = $this->_t(3) . "if (" . $Component
+ $fieldBatch[] = Indent::_(3) . "if (" . $Component
. "Helper::checkArray(\$this->" . $codeName
. "Options) &&";
- $fieldBatch[] = $this->_t(4) . "isset(\$this->"
+ $fieldBatch[] = Indent::_(4) . "isset(\$this->"
. $codeName
. "Options[0]->value) &&";
- $fieldBatch[] = $this->_t(4) . "!" . $Component
+ $fieldBatch[] = Indent::_(4) . "!" . $Component
. "Helper::checkString(\$this->" . $codeName
. "Options[0]->value))";
- $fieldBatch[] = $this->_t(3) . "{";
- $fieldBatch[] = $this->_t(4) . "unset(\$this->"
+ $fieldBatch[] = Indent::_(3) . "{";
+ $fieldBatch[] = Indent::_(4) . "unset(\$this->"
. $codeName
. "Options[0]);";
- $fieldBatch[] = $this->_t(3) . "}";
+ $fieldBatch[] = Indent::_(3) . "}";
}
- $fieldBatch[] = $this->_t(3) . "//" . $this->setLine(
- __LINE__
+ $fieldBatch[] = Indent::_(3) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " " . $CodeName . " Batch Selection";
- $fieldBatch[] = $this->_t(3)
+ $fieldBatch[] = Indent::_(3)
. "JHtmlBatch_::addListSelection(";
- $fieldBatch[] = $this->_t(4) . "'- Keep Original '.JText:"
+ $fieldBatch[] = Indent::_(4) . "'- Keep Original '.JText:"
. ":_('" . $filter['lang'] . "').' -',";
- $fieldBatch[] = $this->_t(4) . "'batch[" . $filter['code']
+ $fieldBatch[] = Indent::_(4) . "'batch[" . $filter['code']
. "]',";
- $fieldBatch[] = $this->_t(4)
+ $fieldBatch[] = Indent::_(4)
. "JHtml::_('select.options', \$this->" . $codeName
. "Options, 'value', 'text')";
- $fieldBatch[] = $this->_t(3) . ");";
- $fieldBatch[] = $this->_t(2) . "}";
+ $fieldBatch[] = Indent::_(3) . ");";
+ $fieldBatch[] = Indent::_(2) . "}";
}
elseif ($filter['type'] != 'category')
{
@@ -18930,55 +17825,55 @@ class Interpretation extends Fields
$filter['code'], 'W'
);
- $fieldBatch[] = PHP_EOL . $this->_t(2)
- . "//" . $this->setLine(__LINE__)
+ $fieldBatch[] = PHP_EOL . Indent::_(2)
+ . "//" . Line::_(__Line__, __Class__)
. " Only load " . $CodeName
. " batch if create, edit, and batch is allowed";
- $fieldBatch[] = $this->_t(2)
+ $fieldBatch[] = Indent::_(2)
. "if (\$this->canBatch && \$this->canCreate && \$this->canEdit)";
- $fieldBatch[] = $this->_t(2) . "{";
+ $fieldBatch[] = Indent::_(2) . "{";
// add the get values here
if ($get_values)
{
- $fieldBatch[] = $this->_t(3) . "//"
- . $this->setLine(__LINE__) . " Set " . $CodeName
+ $fieldBatch[] = Indent::_(3) . "//"
+ . Line::_(__Line__, __Class__) . " Set " . $CodeName
. " Selection";
- $fieldBatch[] = $this->_t(3) . "\$this->"
+ $fieldBatch[] = Indent::_(3) . "\$this->"
. $filter['code']
. "Options = JFormHelper::loadFieldType('"
. $filter['filter_type']
. "')->options;";
- $fieldBatch[] = $this->_t(3) . "//" . $this->setLine(
- __LINE__
+ $fieldBatch[] = Indent::_(3) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " We do some sanitation for " . $CodeName
. " filter";
- $fieldBatch[] = $this->_t(3) . "if (" . $Component
+ $fieldBatch[] = Indent::_(3) . "if (" . $Component
. "Helper::checkArray(\$this->" . $filter['code']
. "Options) &&";
- $fieldBatch[] = $this->_t(4) . "isset(\$this->"
+ $fieldBatch[] = Indent::_(4) . "isset(\$this->"
. $filter['code'] . "Options[0]->value) &&";
- $fieldBatch[] = $this->_t(4) . "!" . $Component
+ $fieldBatch[] = Indent::_(4) . "!" . $Component
. "Helper::checkString(\$this->" . $filter['code']
. "Options[0]->value))";
- $fieldBatch[] = $this->_t(3) . "{";
- $fieldBatch[] = $this->_t(4) . "unset(\$this->"
+ $fieldBatch[] = Indent::_(3) . "{";
+ $fieldBatch[] = Indent::_(4) . "unset(\$this->"
. $filter['code'] . "Options[0]);";
- $fieldBatch[] = $this->_t(3) . "}";
+ $fieldBatch[] = Indent::_(3) . "}";
}
- $fieldBatch[] = $this->_t(3) . "//" . $this->setLine(
- __LINE__
+ $fieldBatch[] = Indent::_(3) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " " . $CodeName . " Batch Selection";
- $fieldBatch[] = $this->_t(3)
+ $fieldBatch[] = Indent::_(3)
. "JHtmlBatch_::addListSelection(";
- $fieldBatch[] = $this->_t(4) . "'- Keep Original '.JText:"
+ $fieldBatch[] = Indent::_(4) . "'- Keep Original '.JText:"
. ":_('" . $filter['lang'] . "').' -',";
- $fieldBatch[] = $this->_t(4) . "'batch[" . $filter['code']
+ $fieldBatch[] = Indent::_(4) . "'batch[" . $filter['code']
. "]',";
- $fieldBatch[] = $this->_t(4)
+ $fieldBatch[] = Indent::_(4)
. "JHtml::_('select.options', \$this->"
. $filter['code'] . "Options, 'value', 'text')";
- $fieldBatch[] = $this->_t(3) . ");";
- $fieldBatch[] = $this->_t(2) . "}";
+ $fieldBatch[] = Indent::_(3) . ");";
+ $fieldBatch[] = Indent::_(2) . "}";
}
}
}
@@ -19004,45 +17899,43 @@ class Interpretation extends Fields
protected function setDefaultBatchHelper(&$batch, &$nameSingleCode)
{
// set component name
+ $COPMONENT = CFactory::_('Component')->get('name_code');
$COPMONENT = StringHelper::safe(
- $this->componentData->name_code, 'U'
+ $COPMONENT, 'U'
);
// set batch
- $batch[] = PHP_EOL . $this->_t(2)
- . "//" . $this->setLine(__LINE__)
+ $batch[] = PHP_EOL . Indent::_(2)
+ . "//" . Line::_(__Line__, __Class__)
. " Only load published batch if state and batch is allowed";
- $batch[] = $this->_t(2)
+ $batch[] = Indent::_(2)
. "if (\$this->canState && \$this->canBatch)";
- $batch[] = $this->_t(2) . "{";
- $batch[] = $this->_t(3) . "JHtmlBatch_::addListSelection(";
- $batch[] = $this->_t(4) . "JText:" . ":_('COM_" . $COPMONENT
+ $batch[] = Indent::_(2) . "{";
+ $batch[] = Indent::_(3) . "JHtmlBatch_::addListSelection(";
+ $batch[] = Indent::_(4) . "JText:" . ":_('COM_" . $COPMONENT
. "_KEEP_ORIGINAL_STATE'),";
- $batch[] = $this->_t(4) . "'batch[published]',";
- $batch[] = $this->_t(4)
+ $batch[] = Indent::_(4) . "'batch[published]',";
+ $batch[] = Indent::_(4)
. "JHtml::_('select.options', JHtml::_('jgrid.publishedOptions', array('all' => false)), 'value', 'text', '', true)";
- $batch[] = $this->_t(3) . ");";
- $batch[] = $this->_t(2) . "}";
+ $batch[] = Indent::_(3) . ");";
+ $batch[] = Indent::_(2) . "}";
// check if view has access
- if (isset($this->accessBuilder[$nameSingleCode])
- && StringHelper::check(
- $this->accessBuilder[$nameSingleCode]
- )
- && !isset($this->fieldsNames[$nameSingleCode]['access']))
+ if (CFactory::_('Compiler.Builder.Access.Switch')->exists($nameSingleCode)
+ && !CFactory::_('Compiler.Builder.Field.Names')->isString($nameSingleCode . '.access'))
{
- $batch[] = PHP_EOL . $this->_t(2)
- . "//" . $this->setLine(__LINE__)
+ $batch[] = PHP_EOL . Indent::_(2)
+ . "//" . Line::_(__Line__, __Class__)
. " Only load access batch if create, edit and batch is allowed";
- $batch[] = $this->_t(2)
+ $batch[] = Indent::_(2)
. "if (\$this->canBatch && \$this->canCreate && \$this->canEdit)";
- $batch[] = $this->_t(2) . "{";
- $batch[] = $this->_t(3) . "JHtmlBatch_::addListSelection(";
- $batch[] = $this->_t(4) . "JText:" . ":_('COM_" . $COPMONENT
+ $batch[] = Indent::_(2) . "{";
+ $batch[] = Indent::_(3) . "JHtmlBatch_::addListSelection(";
+ $batch[] = Indent::_(4) . "JText:" . ":_('COM_" . $COPMONENT
. "_KEEP_ORIGINAL_ACCESS'),";
- $batch[] = $this->_t(4) . "'batch[access]',";
- $batch[] = $this->_t(4)
+ $batch[] = Indent::_(4) . "'batch[access]',";
+ $batch[] = Indent::_(4)
. "JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text')";
- $batch[] = $this->_t(3) . ");";
- $batch[] = $this->_t(2) . "}";
+ $batch[] = Indent::_(3) . ");";
+ $batch[] = Indent::_(2) . "}";
}
}
@@ -19057,45 +17950,37 @@ class Interpretation extends Fields
*/
protected function setCategoryBatchHelper(&$batch, &$nameListCode)
{
- if (isset($this->categoryBuilder[$nameListCode])
- && ArrayHelper::check(
- $this->categoryBuilder[$nameListCode]
- )
- && isset($this->categoryBuilder[$nameListCode]['extension']))
+ if (CFactory::_('Compiler.Builder.Category')->exists("{$nameListCode}.extension"))
{
// set component name
- $COPMONENT = StringHelper::safe(
- $this->componentData->name_code, 'U'
- );
+ $COPMONENT = CFactory::_('Component')->get('name_code');
+ $COPMONENT = StringHelper::safe($COPMONENT, 'U');
// set filter
- $batch[] = PHP_EOL . $this->_t(2)
+ $batch[] = PHP_EOL . Indent::_(2)
. "if (\$this->canBatch && \$this->canCreate && \$this->canEdit)";
- $batch[] = $this->_t(2) . "{";
- $batch[] = $this->_t(3) . "//" . $this->setLine(__LINE__)
+ $batch[] = Indent::_(2) . "{";
+ $batch[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " Category Batch selection.";
- $batch[] = $this->_t(3) . "JHtmlBatch_::addListSelection(";
- $batch[] = $this->_t(4) . "JText:" . ":_('COM_" . $COPMONENT
+ $batch[] = Indent::_(3) . "JHtmlBatch_::addListSelection(";
+ $batch[] = Indent::_(4) . "JText:" . ":_('COM_" . $COPMONENT
. "_KEEP_ORIGINAL_CATEGORY'),";
- $batch[] = $this->_t(4) . "'batch[category]',";
- $batch[] = $this->_t(4)
+ $batch[] = Indent::_(4) . "'batch[category]',";
+ $batch[] = Indent::_(4)
. "JHtml::_('select.options', JHtml::_('category.options', '"
- . $this->categoryBuilder[$nameListCode]['extension']
+ . CFactory::_('Compiler.Builder.Category')->get("{$nameListCode}.extension")
. "'), 'value', 'text')";
- $batch[] = $this->_t(3) . ");";
- $batch[] = $this->_t(2) . "}";
+ $batch[] = Indent::_(3) . ");";
+ $batch[] = Indent::_(2) . "}";
}
}
public function setRouterCategoryViews($nameSingleCode, $nameListCode)
{
- if (isset($this->categoryBuilder[$nameListCode])
- && ArrayHelper::check(
- $this->categoryBuilder[$nameListCode]
- ))
+ if (CFactory::_('Compiler.Builder.Category')->exists("{$nameListCode}.extension"))
{
- // get the actual extention
- $_extension = $this->categoryBuilder[$nameListCode]['extension'];
- $_extension = explode('.', $_extension);
+ // get the actual extension
+ $_extension = CFactory::_('Compiler.Builder.Category')->get("{$nameListCode}.extension");
+ $_extension = explode('.', (string) $_extension);
// set component name
if (ArrayHelper::check($_extension))
{
@@ -19103,86 +17988,58 @@ class Interpretation extends Fields
}
else
{
- $component = $this->componentCodeName;
+ $component = CFactory::_('Config')->component_code_name;
}
// check if category has another name
- if (isset($this->catOtherName[$nameListCode])
- && ArrayHelper::check(
- $this->catOtherName[$nameListCode]
- ))
- {
- $otherViews = $this->catOtherName[$nameListCode]['views'];
- $otherView = $this->catOtherName[$nameListCode]['view'];
- }
- else
- {
- $otherViews = $nameListCode;
- $otherView = $nameSingleCode;
- }
+ $otherViews = CFactory::_('Compiler.Builder.Category.Other.Name')->
+ get($nameListCode . '.views', $nameListCode);
+ $otherView = CFactory::_('Compiler.Builder.Category.Other.Name')->
+ get($nameListCode . '.view', $nameSingleCode);
// set the OtherView value
- $this->fileContentDynamic['category' . $otherView][$this->hhh
- . 'otherview' . $this->hhh]
- = $otherView;
+ CFactory::_('Compiler.Builder.Content.Multi')->set('category' . $otherView . '|otherview', $otherView);
// load the category helper details in not already loaded
- if (!isset(
- $this->fileContentDynamic['category' . $otherView][$this->hhh
- . 'view' . $this->hhh]
- ))
+ if (!CFactory::_('Compiler.Builder.Content.Multi')->exists('category' . $otherView . '|view'))
{
// lets also set the category helper for this view
$target = array('site' => 'category' . $otherView);
- $this->buildDynamique($target, 'category');
+ CFactory::_('Utilities.Structure')->build($target, 'category');
// insure the file gets updated
- $this->fileContentDynamic['category' . $otherView][$this->hhh
- . 'view' . $this->hhh]
- = $otherView;
- $this->fileContentDynamic['category' . $otherView][$this->hhh
- . 'View' . $this->hhh]
- = ucfirst($otherView);
- $this->fileContentDynamic['category' . $otherView][$this->hhh
- . 'views' . $this->hhh]
- = $otherViews;
- $this->fileContentDynamic['category' . $otherView][$this->hhh
- . 'Views' . $this->hhh]
- = ucfirst($otherViews);
+ CFactory::_('Compiler.Builder.Content.Multi')->set('category' . $otherView . '|view', $otherView);
+ CFactory::_('Compiler.Builder.Content.Multi')->set('category' . $otherView . '|View', ucfirst((string) $otherView));
+ CFactory::_('Compiler.Builder.Content.Multi')->set('category' . $otherView . '|views', $otherViews);
+ CFactory::_('Compiler.Builder.Content.Multi')->set('category' . $otherView . '|Views', ucfirst((string) $otherViews));
// set script to global helper file
$includeHelper = array();
- $includeHelper[] = "\n//" . $this->setLine(__LINE__)
+ $includeHelper[] = "\n//" . Line::_(__Line__, __Class__)
. "Insure this view category file is loaded.";
- $includeHelper[] = "\$classname = '" . ucfirst($component)
- . ucfirst($otherView) . "Categories';";
+ $includeHelper[] = "\$classname = '" . ucfirst((string) $component)
+ . ucfirst((string) $otherView) . "Categories';";
$includeHelper[] = "if (!class_exists(\$classname))";
$includeHelper[] = "{";
- $includeHelper[] = $this->_t(1)
+ $includeHelper[] = Indent::_(1)
. "\$path = JPATH_SITE . '/components/com_" . $component
. "/helpers/category" . $otherView . ".php';";
- $includeHelper[] = $this->_t(1) . "if (is_file(\$path))";
- $includeHelper[] = $this->_t(1) . "{";
- $includeHelper[] = $this->_t(2) . "include_once \$path;";
- $includeHelper[] = $this->_t(1) . "}";
+ $includeHelper[] = Indent::_(1) . "if (is_file(\$path))";
+ $includeHelper[] = Indent::_(1) . "{";
+ $includeHelper[] = Indent::_(2) . "include_once \$path;";
+ $includeHelper[] = Indent::_(1) . "}";
$includeHelper[] = "}";
- $this->fileContentStatic[$this->hhh . 'CATEGORY_CLASS_TREES'
- . $this->hhh]
- .= implode("\n", $includeHelper);
+ CFactory::_('Compiler.Builder.Content.One')->add('CATEGORY_CLASS_TREES', implode("\n", $includeHelper));
}
// return category view string
- if (isset(
- $this->fileContentStatic[$this->hhh
- . 'ROUTER_CATEGORY_VIEWS' . $this->hhh]
- )
+ if (CFactory::_('Compiler.Builder.Content.One')->exists('ROUTER_CATEGORY_VIEWS')
&& StringHelper::check(
- $this->fileContentStatic[$this->hhh
- . 'ROUTER_CATEGORY_VIEWS' . $this->hhh]
+ CFactory::_('Compiler.Builder.Content.One')->get('ROUTER_CATEGORY_VIEWS')
))
{
- return "," . PHP_EOL . $this->_t(3) . '"'
- . $this->categoryBuilder[$nameListCode]['extension']
+ return "," . PHP_EOL . Indent::_(3) . '"'
+ . CFactory::_('Compiler.Builder.Category')->get("{$nameListCode}.extension")
. '" => "' . $otherView . '"';
}
else
{
- return PHP_EOL . $this->_t(3) . '"'
- . $this->categoryBuilder[$nameListCode]['extension']
+ return PHP_EOL . Indent::_(3) . '"'
+ . CFactory::_('Compiler.Builder.Category')->get("{$nameListCode}.extension")
. '" => "' . $otherView . '"';
}
}
@@ -19194,153 +18051,109 @@ class Interpretation extends Fields
{
$allow = array();
// set component name
- $component = $this->componentCodeName;
+ $component = CFactory::_('Config')->component_code_name;
// prepare custom permission script
- $customAllow = $this->getCustomScriptBuilder(
+ $customAllow = CFactory::_('Customcode.Dispenser')->get(
'php_allowadd', $nameSingleCode, '', null, true
);
- // setup correct core target
- $coreLoad = false;
- if (isset($this->permissionCore[$nameSingleCode]))
- {
- $core = $this->permissionCore[$nameSingleCode];
- $coreLoad = true;
- }
// check if item has category
- if (0) //isset($this->categoryBuilder[$nameListCode]) && ArrayHelper::check($this->categoryBuilder[$nameListCode])) <-- remove category from check
+ if (0) //CFactory::_('Compiler.Builder.Category')->exists("{$nameListCode}")) <-- remove category from check
{
// check if category has another name
- if ($coreLoad && isset($this->catOtherName[$nameListCode])
- && ArrayHelper::check(
- $this->catOtherName[$nameListCode]
- ))
- {
- $otherViews = $this->catOtherName[$nameListCode]['views'];
- $otherView = $this->catOtherName[$nameListCode]['view'];
- }
- else
- {
- $otherViews = $nameListCode;
- $otherView = $nameSingleCode;
- }
+ $otherViews = CFactory::_('Compiler.Builder.Category.Other.Name')->
+ get($nameListCode . '.views', $nameListCode);
+ $otherView = CFactory::_('Compiler.Builder.Category.Other.Name')->
+ get($nameListCode . '.view', $nameSingleCode);
// setup the category script
- $allow[] = PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $allow[] = PHP_EOL . Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " get the user object";
- $allow[] = $this->_t(2) . "\$user = JFactory::getUser();";
+ $allow[] = Indent::_(2) . "\$user = JFactory::getUser();";
// check if the item has permissions.
- if ($coreLoad && isset($core['core.access'])
- && isset($this->permissionBuilder['global'][$core['core.access']])
- && ArrayHelper::check(
- $this->permissionBuilder['global'][$core['core.access']]
- )
- && in_array(
- $otherView,
- $this->permissionBuilder['global'][$core['core.access']]
- ))
+ if (CFactory::_('Compiler.Creator.Permission')->globalExist($otherView, 'core.access'))
{
- $allow[] = PHP_EOL . $this->_t(2) . "//" . $this->setLine(
- __LINE__
+ $allow[] = PHP_EOL . Indent::_(2) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " Access check.";
- $allow[] = $this->_t(2) . "\$access = \$user->authorise('"
- . $core['core.access'] . "', 'com_" . $component . "');";
- $allow[] = $this->_t(2) . "if (!\$access)";
- $allow[] = $this->_t(2) . "{";
- $allow[] = $this->_t(3) . "return false;";
- $allow[] = $this->_t(2) . "}";
+ $allow[] = Indent::_(2) . "\$access = \$user->authorise('"
+ . CFactory::_('Compiler.Creator.Permission')->getGlobal($otherView, 'core.access')
+ . "', 'com_" . $component . "');";
+ $allow[] = Indent::_(2) . "if (!\$access)";
+ $allow[] = Indent::_(2) . "{";
+ $allow[] = Indent::_(3) . "return false;";
+ $allow[] = Indent::_(2) . "}";
}
- $allow[] = $this->_t(2)
+ $allow[] = Indent::_(2)
. "\$categoryId = ArrayHelper::getValue(\$data, 'catid', \$this->input->getInt('filter_category_id'), 'int');";
- $allow[] = $this->_t(2) . "\$allow = null;";
- $allow[] = PHP_EOL . $this->_t(2) . "if (\$categoryId)";
- $allow[] = $this->_t(2) . "{";
- $allow[] = $this->_t(3) . "//" . $this->setLine(__LINE__)
+ $allow[] = Indent::_(2) . "\$allow = null;";
+ $allow[] = PHP_EOL . Indent::_(2) . "if (\$categoryId)";
+ $allow[] = Indent::_(2) . "{";
+ $allow[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " If the category has been passed in the URL check it.";
- $allow[] = $this->_t(3)
+ $allow[] = Indent::_(3)
. "\$allow = \$user->authorise('core.create', \$this->option . '."
. $otherView . ".category.' . \$categoryId);";
- $allow[] = $this->_t(2) . "}";
- $allow[] = PHP_EOL . $this->_t(2) . "if (\$allow === null)";
- $allow[] = $this->_t(2) . "{";
+ $allow[] = Indent::_(2) . "}";
+ $allow[] = PHP_EOL . Indent::_(2) . "if (\$allow === null)";
+ $allow[] = Indent::_(2) . "{";
// check if the item has permissions.
- if ($coreLoad && isset($core['core.create'])
- && isset($this->permissionBuilder['global'][$core['core.create']])
- && ArrayHelper::check(
- $this->permissionBuilder['global'][$core['core.create']]
- )
- && in_array(
- $nameSingleCode,
- $this->permissionBuilder['global'][$core['core.create']]
- ))
+ if (CFactory::_('Compiler.Creator.Permission')->globalExist($nameSingleCode, 'core.access'))
{
// setup the default script
- $allow[] = $this->_t(3) . "//" . $this->setLine(__LINE__)
- . " In the absense of better information, revert to the component permissions.";
- $allow[] = $this->_t(3) . "return \$user->authorise('"
- . $core['core.create'] . "', \$this->option);";
+ $allow[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
+ . " In the absence of better information, revert to the component permissions.";
+ $allow[] = Indent::_(3) . "return \$user->authorise('"
+ . CFactory::_('Compiler.Creator.Permission')->getGlobal($nameSingleCode, 'core.create')
+ . "', \$this->option);";
}
else
{
// setup the default script
- $allow[] = $this->_t(3) . "//" . $this->setLine(__LINE__)
- . " In the absense of better information, revert to the component permissions.";
- $allow[] = $this->_t(3) . "return parent::allowAdd(\$data);";
+ $allow[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
+ . " In the absence of better information, revert to the component permissions.";
+ $allow[] = Indent::_(3) . "return parent::allowAdd(\$data);";
}
- $allow[] = $this->_t(2) . "}";
- $allow[] = $this->_t(2) . "else";
- $allow[] = $this->_t(2) . "{";
- $allow[] = $this->_t(3) . "return \$allow;";
- $allow[] = $this->_t(2) . "}";
+ $allow[] = Indent::_(2) . "}";
+ $allow[] = Indent::_(2) . "else";
+ $allow[] = Indent::_(2) . "{";
+ $allow[] = Indent::_(3) . "return \$allow;";
+ $allow[] = Indent::_(2) . "}";
}
else
{
- $allow[] = PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $allow[] = PHP_EOL . Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " Get user object.";
- $allow[] = $this->_t(2) . "\$user = JFactory::getUser();";
+ $allow[] = Indent::_(2) . "\$user = JFactory::getUser();";
// check if the item has permissions.
- if ($coreLoad && isset($core['core.access'])
- && isset($this->permissionBuilder['global'][$core['core.access']])
- && ArrayHelper::check(
- $this->permissionBuilder['global'][$core['core.access']]
- )
- && in_array(
- $nameSingleCode,
- $this->permissionBuilder['global'][$core['core.access']]
- ))
+ if (CFactory::_('Compiler.Creator.Permission')->globalExist($nameSingleCode, 'core.access'))
{
- $allow[] = $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $allow[] = Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " Access check.";
- $allow[] = $this->_t(2) . "\$access = \$user->authorise('"
- . $core['core.access'] . "', 'com_" . $component . "');";
- $allow[] = $this->_t(2) . "if (!\$access)";
- $allow[] = $this->_t(2) . "{";
- $allow[] = $this->_t(3) . "return false;";
- $allow[] = $this->_t(2) . "}";
+ $allow[] = Indent::_(2) . "\$access = \$user->authorise('"
+ . CFactory::_('Compiler.Creator.Permission')->getGlobal($nameSingleCode, 'core.access')
+ . "', 'com_" . $component . "');";
+ $allow[] = Indent::_(2) . "if (!\$access)";
+ $allow[] = Indent::_(2) . "{";
+ $allow[] = Indent::_(3) . "return false;";
+ $allow[] = Indent::_(2) . "}";
}
// load custom permission script
$allow[] = $customAllow;
// check if the item has permissions.
- if ($coreLoad && isset($core['core.create'])
- && isset($this->permissionBuilder['global'][$core['core.create']])
- && ArrayHelper::check(
- $this->permissionBuilder['global'][$core['core.create']]
- )
- && in_array(
- $nameSingleCode,
- $this->permissionBuilder['global'][$core['core.create']]
- ))
+ if (CFactory::_('Compiler.Creator.Permission')->globalExist($nameSingleCode, 'core.create'))
{
// setup the default script
- $allow[] = $this->_t(2) . "//" . $this->setLine(__LINE__)
- . " In the absense of better information, revert to the component permissions.";
- $allow[] = $this->_t(2) . "return \$user->authorise('"
- . $core['core.create'] . "', \$this->option);";
+ $allow[] = Indent::_(2) . "//" . Line::_(__Line__, __Class__)
+ . " In the absence of better information, revert to the component permissions.";
+ $allow[] = Indent::_(2) . "return \$user->authorise('"
+ . CFactory::_('Compiler.Creator.Permission')->getGlobal($nameSingleCode, 'core.create')
+ . "', \$this->option);";
}
else
{
// setup the default script
- $allow[] = $this->_t(2) . "//" . $this->setLine(__LINE__)
- . " In the absense of better information, revert to the component permissions.";
- $allow[] = $this->_t(2) . "return parent::allowAdd(\$data);";
+ $allow[] = Indent::_(2) . "//" . Line::_(__Line__, __Class__)
+ . " In the absence of better information, revert to the component permissions.";
+ $allow[] = Indent::_(2) . "return parent::allowAdd(\$data);";
}
}
@@ -19351,354 +18164,202 @@ class Interpretation extends Fields
{
$allow = array();
// set component name
- $component = $this->componentCodeName;
+ $component = CFactory::_('Config')->component_code_name;
// prepare custom permission script
- $customAllow = $this->getCustomScriptBuilder(
+ $customAllow = CFactory::_('Customcode.Dispenser')->get(
'php_allowedit', $nameSingleCode, '', null, true
);
- // setup correct core target
- $coreLoad = false;
- if (isset($this->permissionCore[$nameSingleCode]))
- {
- $core = $this->permissionCore[$nameSingleCode];
- $coreLoad = true;
- }
- if (isset($this->categoryBuilder[$nameListCode])
- && ArrayHelper::check(
- $this->categoryBuilder[$nameListCode]
- ))
+ if (CFactory::_('Compiler.Builder.Category')->exists("{$nameListCode}"))
{
// check if category has another name
- if ($coreLoad && isset($this->catOtherName[$nameListCode])
- && ArrayHelper::check(
- $this->catOtherName[$nameListCode]
- ))
- {
- $otherViews = $this->catOtherName[$nameListCode]['views'];
- $otherView = $this->catOtherName[$nameListCode]['view'];
- }
- else
- {
- $otherViews = $nameListCode;
- $otherView = $nameSingleCode;
- }
+ $otherViews = CFactory::_('Compiler.Builder.Category.Other.Name')->
+ get($nameListCode . '.views', $nameListCode);
+ $otherView = CFactory::_('Compiler.Builder.Category.Other.Name')->
+ get($nameListCode . '.view', $nameSingleCode);
// setup the category script
- $allow[] = $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $allow[] = Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " get user object.";
- $allow[] = $this->_t(2) . "\$user = JFactory::getUser();";
- $allow[] = $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $allow[] = Indent::_(2) . "\$user = JFactory::getUser();";
+ $allow[] = Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " get record id.";
- $allow[] = $this->_t(2)
+ $allow[] = Indent::_(2)
. "\$recordId = (int) isset(\$data[\$key]) ? \$data[\$key] : 0;";
// load custom permission script
$allow[] = $customAllow;
// check if the item has permissions.
- if ($coreLoad && isset($core['core.access'])
- && isset($this->permissionBuilder['global'][$core['core.access']])
- && ArrayHelper::check(
- $this->permissionBuilder['global'][$core['core.access']]
- )
- && in_array(
- $otherView,
- $this->permissionBuilder['global'][$core['core.access']]
- ))
+ if (CFactory::_('Compiler.Creator.Permission')->globalExist($otherView, 'core.access'))
{
- $allow[] = PHP_EOL . $this->_t(2) . "//" . $this->setLine(
- __LINE__
+ $allow[] = PHP_EOL . Indent::_(2) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " Access check.";
- $allow[] = $this->_t(2) . "\$access = (\$user->authorise('"
- . $core['core.access'] . "', 'com_" . $component . "."
- . $otherView
+ $allow[] = Indent::_(2) . "\$access = (\$user->authorise('"
+ . CFactory::_('Compiler.Creator.Permission')->getGlobal($otherView, 'core.access')
+ . "', 'com_" . $component . "." . $otherView
. ".' . (int) \$recordId) && \$user->authorise('"
- . $core['core.access'] . "', 'com_" . $component . "'));";
- $allow[] = $this->_t(2) . "if (!\$access)";
- $allow[] = $this->_t(2) . "{";
- $allow[] = $this->_t(3) . "return false;";
- $allow[] = $this->_t(2) . "}";
+ . CFactory::_('Compiler.Creator.Permission')->getGlobal($otherView, 'core.access')
+ . "', 'com_" . $component . "'));";
+ $allow[] = Indent::_(2) . "if (!\$access)";
+ $allow[] = Indent::_(2) . "{";
+ $allow[] = Indent::_(3) . "return false;";
+ $allow[] = Indent::_(2) . "}";
}
- $allow[] = PHP_EOL . $this->_t(2) . "if (\$recordId)";
- $allow[] = $this->_t(2) . "{";
- $allow[] = $this->_t(3) . "//" . $this->setLine(__LINE__)
+ $allow[] = PHP_EOL . Indent::_(2) . "if (\$recordId)";
+ $allow[] = Indent::_(2) . "{";
+ $allow[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " The record has been set. Check the record permissions.";
// check if the item has permissions.
- if ($coreLoad && isset($core['core.edit'])
- && isset($this->permissionBuilder[$core['core.edit']])
- && ArrayHelper::check(
- $this->permissionBuilder[$core['core.edit']]
- )
- && in_array(
- $otherView, $this->permissionBuilder[$core['core.edit']]
- ))
- {
- $allow[] = $this->_t(3) . "\$permission = \$user->authorise('"
- . $core['core.edit'] . "', 'com_" . $component . "."
- . $otherView . ".' . (int) \$recordId);";
- }
- else
- {
- $allow[] = $this->_t(3)
- . "\$permission = \$user->authorise('core.edit', 'com_"
- . $component . "." . $otherView . ".' . (int) \$recordId);";
- }
- $allow[] = $this->_t(3) . "if (!\$permission)";
- $allow[] = $this->_t(3) . "{";
+ $allow[] = Indent::_(3) . "\$permission = \$user->authorise('"
+ . CFactory::_('Compiler.Creator.Permission')->getAction($otherView, 'core.edit') . "', 'com_" . $component . "."
+ . $otherView . ".' . (int) \$recordId);";
+ $allow[] = Indent::_(3) . "if (!\$permission)";
+ $allow[] = Indent::_(3) . "{";
// check if the item has permissions.
- if ($coreLoad && isset($core['core.edit.own'])
- && isset($this->permissionBuilder[$core['core.edit.own']])
- && ArrayHelper::check(
- $this->permissionBuilder[$core['core.edit.own']]
- )
- && in_array(
- $otherView, $this->permissionBuilder[$core['core.edit.own']]
- ))
- {
- $allow[] = $this->_t(4) . "if (\$user->authorise('"
- . $core['core.edit.own'] . "', 'com_" . $component . "."
- . $otherView . ".' . \$recordId))";
- }
- else
- {
- $allow[] = $this->_t(4)
- . "if (\$user->authorise('core.edit.own', 'com_"
- . $component . "." . $otherView . ".' . \$recordId))";
- }
- $allow[] = $this->_t(4) . "{";
- $allow[] = $this->_t(5) . "//" . $this->setLine(__LINE__)
+ $allow[] = Indent::_(4) . "if (\$user->authorise('"
+ . CFactory::_('Compiler.Creator.Permission')->getAction($otherView, 'core.edit.own') . "', 'com_" . $component . "."
+ . $otherView . ".' . \$recordId))";
+ $allow[] = Indent::_(4) . "{";
+ $allow[] = Indent::_(5) . "//" . Line::_(__Line__, __Class__)
. " Fallback on edit.own. Now test the owner is the user.";
- $allow[] = $this->_t(5)
+ $allow[] = Indent::_(5)
. "\$ownerId = (int) isset(\$data['created_by']) ? \$data['created_by'] : 0;";
- $allow[] = $this->_t(5) . "if (empty(\$ownerId))";
- $allow[] = $this->_t(5) . "{";
- $allow[] = $this->_t(6) . "//" . $this->setLine(__LINE__)
+ $allow[] = Indent::_(5) . "if (empty(\$ownerId))";
+ $allow[] = Indent::_(5) . "{";
+ $allow[] = Indent::_(6) . "//" . Line::_(__Line__, __Class__)
. " Need to do a lookup from the model.";
- $allow[] = $this->_t(6)
+ $allow[] = Indent::_(6)
. "\$record = \$this->getModel()->getItem(\$recordId);";
- $allow[] = PHP_EOL . $this->_t(6) . "if (empty(\$record))";
- $allow[] = $this->_t(6) . "{";
- $allow[] = $this->_t(7) . "return false;";
- $allow[] = $this->_t(6) . "}";
- $allow[] = $this->_t(6) . "\$ownerId = \$record->created_by;";
- $allow[] = $this->_t(5) . "}";
- $allow[] = PHP_EOL . $this->_t(5) . "//" . $this->setLine(__LINE__)
+ $allow[] = PHP_EOL . Indent::_(6) . "if (empty(\$record))";
+ $allow[] = Indent::_(6) . "{";
+ $allow[] = Indent::_(7) . "return false;";
+ $allow[] = Indent::_(6) . "}";
+ $allow[] = Indent::_(6) . "\$ownerId = \$record->created_by;";
+ $allow[] = Indent::_(5) . "}";
+ $allow[] = PHP_EOL . Indent::_(5) . "//" . Line::_(__Line__, __Class__)
. " If the owner matches 'me' then do the test.";
- $allow[] = $this->_t(5) . "if (\$ownerId == \$user->id)";
- $allow[] = $this->_t(5) . "{";
+ $allow[] = Indent::_(5) . "if (\$ownerId == \$user->id)";
+ $allow[] = Indent::_(5) . "{";
// check if the item has permissions.
- if ($coreLoad && isset($core['core.edit.own'])
- && isset($this->permissionBuilder['global'][$core['core.edit.own']])
- && ArrayHelper::check(
- $this->permissionBuilder['global'][$core['core.edit.own']]
- )
- && in_array(
- $otherView,
- $this->permissionBuilder['global'][$core['core.edit.own']]
- ))
+ $allow[] = Indent::_(6) . "if (\$user->authorise('"
+ . CFactory::_('Compiler.Creator.Permission')->getGlobal($otherView, 'core.edit.own') . "', 'com_" . $component . "'))";
+ $allow[] = Indent::_(6) . "{";
+ $allow[] = Indent::_(7) . "return true;";
+ $allow[] = Indent::_(6) . "}";
+ $allow[] = Indent::_(5) . "}";
+ $allow[] = Indent::_(4) . "}";
+ $allow[] = Indent::_(4) . "return false;";
+ $allow[] = Indent::_(3) . "}";
+// $allow[] = PHP_EOL.Indent::_(3) . "\$categoryId = (int) isset(\$data['catid']) ? \$data['catid']: \$this->getModel()->getItem(\$recordId)->catid;"; <-- remove category from check
+// $allow[] = PHP_EOL.Indent::_(3) . "if (\$categoryId)";
+// $allow[] = Indent::_(3) . "{";
+// $allow[] = Indent::_(4) . "//".Line::_(__Line__, __Class__)." The category has been set. Check the category permissions.";
+// $allow[] = Indent::_(4) . "\$catpermission = \$user->authorise('core.edit', \$this->option . '.".$otherView.".category.' . \$categoryId);";
+// $allow[] = Indent::_(4) . "if (!\$catpermission && !is_null(\$catpermission))";
+// $allow[] = Indent::_(4) . "{";
+// $allow[] = Indent::_(5) . "return false;";
+// $allow[] = Indent::_(4) . "}";
+// $allow[] = Indent::_(3) . "}";
+ $allow[] = Indent::_(2) . "}";
+ if (CFactory::_('Compiler.Creator.Permission')->globalExist($otherView, 'core.edit'))
{
- $allow[] = $this->_t(6) . "if (\$user->authorise('"
- . $core['core.edit.own'] . "', 'com_" . $component . "'))";
+ $allow[] = Indent::_(2) . "//" . Line::_(__Line__, __Class__)
+ . " Since there is no permission, revert to the component permissions.";
+ $allow[] = Indent::_(2) . "return \$user->authorise('"
+ . CFactory::_('Compiler.Creator.Permission')->getGlobal($otherView, 'core.edit') . "', \$this->option);";
}
else
{
- $allow[] = $this->_t(6)
- . "if (\$user->authorise('core.edit.own', 'com_"
- . $component . "'))";
- }
- $allow[] = $this->_t(6) . "{";
- $allow[] = $this->_t(7) . "return true;";
- $allow[] = $this->_t(6) . "}";
- $allow[] = $this->_t(5) . "}";
- $allow[] = $this->_t(4) . "}";
- $allow[] = $this->_t(4) . "return false;";
- $allow[] = $this->_t(3) . "}";
-// $allow[] = PHP_EOL.$this->_t(3) . "\$categoryId = (int) isset(\$data['catid']) ? \$data['catid']: \$this->getModel()->getItem(\$recordId)->catid;"; <-- remove category from check
-// $allow[] = PHP_EOL.$this->_t(3) . "if (\$categoryId)";
-// $allow[] = $this->_t(3) . "{";
-// $allow[] = $this->_t(4) . "//".$this->setLine(__LINE__)." The category has been set. Check the category permissions.";
-// $allow[] = $this->_t(4) . "\$catpermission = \$user->authorise('core.edit', \$this->option . '.".$otherView.".category.' . \$categoryId);";
-// $allow[] = $this->_t(4) . "if (!\$catpermission && !is_null(\$catpermission))";
-// $allow[] = $this->_t(4) . "{";
-// $allow[] = $this->_t(5) . "return false;";
-// $allow[] = $this->_t(4) . "}";
-// $allow[] = $this->_t(3) . "}";
- $allow[] = $this->_t(2) . "}";
- if ($coreLoad && isset($core['core.edit'])
- && isset($this->permissionBuilder['global'][$core['core.edit']])
- && ArrayHelper::check(
- $this->permissionBuilder['global'][$core['core.edit']]
- )
- && in_array(
- $otherView,
- $this->permissionBuilder['global'][$core['core.edit']]
- ))
- {
- $allow[] = $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $allow[] = Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " Since there is no permission, revert to the component permissions.";
- $allow[] = $this->_t(2) . "return \$user->authorise('"
- . $core['core.edit'] . "', \$this->option);";
- }
- else
- {
- $allow[] = $this->_t(2) . "//" . $this->setLine(__LINE__)
- . " Since there is no permission, revert to the component permissions.";
- $allow[] = $this->_t(2)
+ $allow[] = Indent::_(2)
. "return parent::allowEdit(\$data, \$key);";
}
}
else
{
// setup the category script
- $allow[] = PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $allow[] = PHP_EOL . Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " get user object.";
- $allow[] = $this->_t(2) . "\$user = JFactory::getUser();";
- $allow[] = $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $allow[] = Indent::_(2) . "\$user = JFactory::getUser();";
+ $allow[] = Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " get record id.";
- $allow[] = $this->_t(2)
+ $allow[] = Indent::_(2)
. "\$recordId = (int) isset(\$data[\$key]) ? \$data[\$key] : 0;";
// load custom permission script
$allow[] = $customAllow;
// check if the item has permissions.
- if ($coreLoad && isset($core['core.access'])
- && isset($this->permissionBuilder[$core['core.access']])
- && ArrayHelper::check(
- $this->permissionBuilder[$core['core.access']]
- )
- && in_array(
- $nameSingleCode,
- $this->permissionBuilder[$core['core.access']]
- ))
+ if (CFactory::_('Compiler.Creator.Permission')->actionExist($nameSingleCode, 'core.access'))
{
- $allow[] = PHP_EOL . $this->_t(2) . "//" . $this->setLine(
- __LINE__
+ $allow[] = PHP_EOL . Indent::_(2) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " Access check.";
- $allow[] = $this->_t(2) . "\$access = (\$user->authorise('"
- . $core['core.access'] . "', 'com_" . $component . "."
+ $allow[] = Indent::_(2) . "\$access = (\$user->authorise('"
+ . CFactory::_('Compiler.Creator.Permission')->getAction($nameSingleCode, 'core.access') . "', 'com_" . $component . "."
. $nameSingleCode
- . ".' . (int) \$recordId) && \$user->authorise('"
- . $core['core.access'] . "', 'com_" . $component . "'));";
- $allow[] = $this->_t(2) . "if (!\$access)";
- $allow[] = $this->_t(2) . "{";
- $allow[] = $this->_t(3) . "return false;";
- $allow[] = $this->_t(2) . "}";
+ . ".' . (int) \$recordId) && \$user->authorise('"
+ . CFactory::_('Compiler.Creator.Permission')->getAction($nameSingleCode, 'core.access') . "', 'com_" . $component . "'));";
+ $allow[] = Indent::_(2) . "if (!\$access)";
+ $allow[] = Indent::_(2) . "{";
+ $allow[] = Indent::_(3) . "return false;";
+ $allow[] = Indent::_(2) . "}";
}
- $allow[] = PHP_EOL . $this->_t(2) . "if (\$recordId)";
- $allow[] = $this->_t(2) . "{";
- $allow[] = $this->_t(3) . "//" . $this->setLine(__LINE__)
+ $allow[] = PHP_EOL . Indent::_(2) . "if (\$recordId)";
+ $allow[] = Indent::_(2) . "{";
+ $allow[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " The record has been set. Check the record permissions.";
// check if the item has permissions.
- if ($coreLoad && isset($core['core.edit'])
- && isset($this->permissionBuilder[$core['core.edit']])
- && ArrayHelper::check(
- $this->permissionBuilder[$core['core.edit']]
- )
- && in_array(
- $nameSingleCode,
- $this->permissionBuilder[$core['core.edit']]
- ))
- {
- $allow[] = $this->_t(3) . "\$permission = \$user->authorise('"
- . $core['core.edit'] . "', 'com_" . $component . "."
- . $nameSingleCode . ".' . (int) \$recordId);";
- }
- else
- {
- $allow[] = $this->_t(3)
- . "\$permission = \$user->authorise('core.edit', 'com_"
- . $component . "." . $nameSingleCode
- . ".' . (int) \$recordId);";
- }
- $allow[] = $this->_t(3) . "if (!\$permission)";
- $allow[] = $this->_t(3) . "{";
+ $allow[] = Indent::_(3) . "\$permission = \$user->authorise('"
+ . CFactory::_('Compiler.Creator.Permission')->getAction($nameSingleCode, 'core.edit') . "', 'com_" . $component . "."
+ . $nameSingleCode . ".' . (int) \$recordId);";
+ $allow[] = Indent::_(3) . "if (!\$permission)";
+ $allow[] = Indent::_(3) . "{";
// check if the item has permissions.
- if ($coreLoad && isset($core['core.edit.own'])
- && isset($this->permissionBuilder[$core['core.edit.own']])
- && ArrayHelper::check(
- $this->permissionBuilder[$core['core.edit.own']]
- )
- && in_array(
- $nameSingleCode,
- $this->permissionBuilder[$core['core.edit.own']]
- ))
- {
- $allow[] = $this->_t(4) . "if (\$user->authorise('"
- . $core['core.edit.own'] . "', 'com_" . $component . "."
- . $nameSingleCode . ".' . \$recordId))";
- }
- else
- {
- $allow[] = $this->_t(4)
- . "if (\$user->authorise('core.edit.own', 'com_"
- . $component . "." . $nameSingleCode
- . ".' . \$recordId))";
- }
- $allow[] = $this->_t(4) . "{";
- $allow[] = $this->_t(5) . "//" . $this->setLine(__LINE__)
+ $allow[] = Indent::_(4) . "if (\$user->authorise('"
+ . CFactory::_('Compiler.Creator.Permission')->getAction($nameSingleCode, 'core.edit.own') . "', 'com_" . $component . "."
+ . $nameSingleCode . ".' . \$recordId))";
+ $allow[] = Indent::_(4) . "{";
+ $allow[] = Indent::_(5) . "//" . Line::_(__Line__, __Class__)
. " Now test the owner is the user.";
- $allow[] = $this->_t(5)
+ $allow[] = Indent::_(5)
. "\$ownerId = (int) isset(\$data['created_by']) ? \$data['created_by'] : 0;";
- $allow[] = $this->_t(5) . "if (empty(\$ownerId))";
- $allow[] = $this->_t(5) . "{";
- $allow[] = $this->_t(6) . "//" . $this->setLine(__LINE__)
+ $allow[] = Indent::_(5) . "if (empty(\$ownerId))";
+ $allow[] = Indent::_(5) . "{";
+ $allow[] = Indent::_(6) . "//" . Line::_(__Line__, __Class__)
. " Need to do a lookup from the model.";
- $allow[] = $this->_t(6)
+ $allow[] = Indent::_(6)
. "\$record = \$this->getModel()->getItem(\$recordId);";
- $allow[] = PHP_EOL . $this->_t(6) . "if (empty(\$record))";
- $allow[] = $this->_t(6) . "{";
- $allow[] = $this->_t(7) . "return false;";
- $allow[] = $this->_t(6) . "}";
- $allow[] = $this->_t(6) . "\$ownerId = \$record->created_by;";
- $allow[] = $this->_t(5) . "}";
- $allow[] = PHP_EOL . $this->_t(5) . "//" . $this->setLine(__LINE__)
+ $allow[] = PHP_EOL . Indent::_(6) . "if (empty(\$record))";
+ $allow[] = Indent::_(6) . "{";
+ $allow[] = Indent::_(7) . "return false;";
+ $allow[] = Indent::_(6) . "}";
+ $allow[] = Indent::_(6) . "\$ownerId = \$record->created_by;";
+ $allow[] = Indent::_(5) . "}";
+ $allow[] = PHP_EOL . Indent::_(5) . "//" . Line::_(__Line__, __Class__)
. " If the owner matches 'me' then allow.";
- $allow[] = $this->_t(5) . "if (\$ownerId == \$user->id)";
- $allow[] = $this->_t(5) . "{";
+ $allow[] = Indent::_(5) . "if (\$ownerId == \$user->id)";
+ $allow[] = Indent::_(5) . "{";
// check if the item has permissions.
- if ($coreLoad && isset($core['core.edit.own'])
- && isset($this->permissionBuilder['global'][$core['core.edit.own']])
- && ArrayHelper::check(
- $this->permissionBuilder['global'][$core['core.edit.own']]
- )
- && in_array(
- $nameSingleCode,
- $this->permissionBuilder['global'][$core['core.edit.own']]
- ))
+ $allow[] = Indent::_(6) . "if (\$user->authorise('"
+ . CFactory::_('Compiler.Creator.Permission')->getGlobal($nameSingleCode, 'core.edit.own') . "', 'com_" . $component . "'))";
+ $allow[] = Indent::_(6) . "{";
+ $allow[] = Indent::_(7) . "return true;";
+ $allow[] = Indent::_(6) . "}";
+ $allow[] = Indent::_(5) . "}";
+ $allow[] = Indent::_(4) . "}";
+ $allow[] = Indent::_(4) . "return false;";
+ $allow[] = Indent::_(3) . "}";
+ $allow[] = Indent::_(2) . "}";
+ if (CFactory::_('Compiler.Creator.Permission')->globalExist($nameSingleCode, 'core.edit'))
{
- $allow[] = $this->_t(6) . "if (\$user->authorise('"
- . $core['core.edit.own'] . "', 'com_" . $component . "'))";
+ $allow[] = Indent::_(2) . "//" . Line::_(__Line__, __Class__)
+ . " Since there is no permission, revert to the component permissions.";
+ $allow[] = Indent::_(2) . "return \$user->authorise('"
+ . CFactory::_('Compiler.Creator.Permission')->getGlobal($nameSingleCode, 'core.edit') . "', \$this->option);";
}
else
{
- $allow[] = $this->_t(6)
- . "if (\$user->authorise('core.edit.own', 'com_"
- . $component . "'))";
- }
- $allow[] = $this->_t(6) . "{";
- $allow[] = $this->_t(7) . "return true;";
- $allow[] = $this->_t(6) . "}";
- $allow[] = $this->_t(5) . "}";
- $allow[] = $this->_t(4) . "}";
- $allow[] = $this->_t(4) . "return false;";
- $allow[] = $this->_t(3) . "}";
- $allow[] = $this->_t(2) . "}";
- if ($coreLoad && isset($core['core.edit'])
- && isset($this->permissionBuilder['global'][$core['core.edit']])
- && ArrayHelper::check(
- $this->permissionBuilder['global'][$core['core.edit']]
- )
- && in_array(
- $nameSingleCode,
- $this->permissionBuilder['global'][$core['core.edit']]
- ))
- {
- $allow[] = $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $allow[] = Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " Since there is no permission, revert to the component permissions.";
- $allow[] = $this->_t(2) . "return \$user->authorise('"
- . $core['core.edit'] . "', \$this->option);";
- }
- else
- {
- $allow[] = $this->_t(2) . "//" . $this->setLine(__LINE__)
- . " Since there is no permission, revert to the component permissions.";
- $allow[] = $this->_t(2)
+ $allow[] = Indent::_(2)
. "return parent::allowEdit(\$data, \$key);";
}
}
@@ -19709,369 +18370,280 @@ class Interpretation extends Fields
public function setJmodelAdminGetForm($nameSingleCode, $nameListCode)
{
// set component name
- $component = $this->componentCodeName;
+ $component = CFactory::_('Config')->component_code_name;
// allways load these
$getForm = array();
- $getForm[] = PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $getForm[] = PHP_EOL . Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " check if xpath was set in options";
- $getForm[] = $this->_t(2) . "\$xpath = false;";
- $getForm[] = $this->_t(2) . "if (isset(\$options['xpath']))";
- $getForm[] = $this->_t(2) . "{";
- $getForm[] = $this->_t(3) . "\$xpath = \$options['xpath'];";
- $getForm[] = $this->_t(3) . "unset(\$options['xpath']);";
- $getForm[] = $this->_t(2) . "}";
- $getForm[] = $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $getForm[] = Indent::_(2) . "\$xpath = false;";
+ $getForm[] = Indent::_(2) . "if (isset(\$options['xpath']))";
+ $getForm[] = Indent::_(2) . "{";
+ $getForm[] = Indent::_(3) . "\$xpath = \$options['xpath'];";
+ $getForm[] = Indent::_(3) . "unset(\$options['xpath']);";
+ $getForm[] = Indent::_(2) . "}";
+ $getForm[] = Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " check if clear form was set in options";
- $getForm[] = $this->_t(2) . "\$clear = false;";
- $getForm[] = $this->_t(2) . "if (isset(\$options['clear']))";
- $getForm[] = $this->_t(2) . "{";
- $getForm[] = $this->_t(3) . "\$clear = \$options['clear'];";
- $getForm[] = $this->_t(3) . "unset(\$options['clear']);";
- $getForm[] = $this->_t(2) . "}";
- $getForm[] = PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $getForm[] = Indent::_(2) . "\$clear = false;";
+ $getForm[] = Indent::_(2) . "if (isset(\$options['clear']))";
+ $getForm[] = Indent::_(2) . "{";
+ $getForm[] = Indent::_(3) . "\$clear = \$options['clear'];";
+ $getForm[] = Indent::_(3) . "unset(\$options['clear']);";
+ $getForm[] = Indent::_(2) . "}";
+ $getForm[] = PHP_EOL . Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " Get the form.";
- $getForm[] = $this->_t(2) . "\$form = \$this->loadForm('com_"
+ $getForm[] = Indent::_(2) . "\$form = \$this->loadForm('com_"
. $component . "." . $nameSingleCode . "', '" . $nameSingleCode
. "', \$options, \$clear, \$xpath);";
- $getForm[] = PHP_EOL . $this->_t(2) . "if (empty(\$form))";
- $getForm[] = $this->_t(2) . "{";
- $getForm[] = $this->_t(3) . "return false;";
- $getForm[] = $this->_t(2) . "}";
+ $getForm[] = PHP_EOL . Indent::_(2) . "if (empty(\$form))";
+ $getForm[] = Indent::_(2) . "{";
+ $getForm[] = Indent::_(3) . "return false;";
+ $getForm[] = Indent::_(2) . "}";
// load license locker
- if ($this->componentData->add_license
- && $this->componentData->license_type == 3
- && isset(
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'BOOLMETHOD' . $this->hhh]
- ))
+ if (CFactory::_('Component')->get('add_license') && CFactory::_('Component')->get('license_type') == 3
+ && CFactory::_('Compiler.Builder.Content.Multi')->exists($nameSingleCode . '|BOOLMETHOD'))
{
$getForm[] = $this->checkStatmentLicenseLocked(
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'BOOLMETHOD' . $this->hhh]
+ CFactory::_('Compiler.Builder.Content.Multi')->get($nameSingleCode . '|BOOLMETHOD', '')
);
}
- // setup correct core target
- $coreLoad = false;
- if (isset($this->permissionCore[$nameSingleCode]))
- {
- $core = $this->permissionCore[$nameSingleCode];
- $coreLoad = true;
- }
- if (0) //isset($this->categoryBuilder[$nameListCode]) && ArrayHelper::check($this->categoryBuilder[$nameListCode])) <-- remove category from check
+ if (0) //CFactory::_('Compiler.Builder.Category')->exists("{$nameListCode}")) <-- remove category from check
{
// check if category has another name
- if ($coreLoad && isset($this->catOtherName[$nameListCode])
- && ArrayHelper::check(
- $this->catOtherName[$nameListCode]
- ))
- {
- $otherViews = $this->catOtherName[$nameListCode]['views'];
- $otherView = $this->catOtherName[$nameListCode]['view'];
- }
- else
- {
- $otherViews = $nameListCode;
- $otherView = $nameSingleCode;
- }
+ $otherViews = CFactory::_('Compiler.Builder.Category.Other.Name')->
+ get($nameListCode . '.views', $nameListCode);
+ $otherView = CFactory::_('Compiler.Builder.Category.Other.Name')->
+ get($nameListCode . '.view', $nameSingleCode);
// setup the category script
- $getForm[] = PHP_EOL . $this->_t(2)
+ $getForm[] = PHP_EOL . Indent::_(2)
. "\$jinput = JFactory::getApplication()->input;";
- $getForm[] = PHP_EOL . $this->_t(2) . "//" . $this->setLine(
- __LINE__
+ $getForm[] = PHP_EOL . Indent::_(2) . "//" . Line::_(
+ __LINE__,__CLASS__
)
. " The front end calls this model and uses a_id to avoid id clashes so we need to check for that first.";
- $getForm[] = $this->_t(2) . "if (\$jinput->get('a_id'))";
- $getForm[] = $this->_t(2) . "{";
- $getForm[] = $this->_t(3)
+ $getForm[] = Indent::_(2) . "if (\$jinput->get('a_id'))";
+ $getForm[] = Indent::_(2) . "{";
+ $getForm[] = Indent::_(3)
. "\$id = \$jinput->get('a_id', 0, 'INT');";
- $getForm[] = $this->_t(2) . "}";
- $getForm[] = $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $getForm[] = Indent::_(2) . "}";
+ $getForm[] = Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " The back end uses id so we use that the rest of the time and set it to 0 by default.";
- $getForm[] = $this->_t(2) . "else";
- $getForm[] = $this->_t(2) . "{";
- $getForm[] = $this->_t(3) . "\$id = \$jinput->get('id', 0, 'INT');";
- $getForm[] = $this->_t(2) . "}";
- $getForm[] = $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $getForm[] = Indent::_(2) . "else";
+ $getForm[] = Indent::_(2) . "{";
+ $getForm[] = Indent::_(3) . "\$id = \$jinput->get('id', 0, 'INT');";
+ $getForm[] = Indent::_(2) . "}";
+ $getForm[] = Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " Determine correct permissions to check.";
- $getForm[] = $this->_t(2) . "if (\$this->getState('"
+ $getForm[] = Indent::_(2) . "if (\$this->getState('"
. $nameSingleCode . ".id'))";
- $getForm[] = $this->_t(2) . "{";
- $getForm[] = $this->_t(3) . "\$id = \$this->getState('"
+ $getForm[] = Indent::_(2) . "{";
+ $getForm[] = Indent::_(3) . "\$id = \$this->getState('"
. $nameSingleCode . ".id');";
- $getForm[] = PHP_EOL . $this->_t(3) . "\$catid = 0;";
- $getForm[] = $this->_t(3)
+ $getForm[] = PHP_EOL . Indent::_(3) . "\$catid = 0;";
+ $getForm[] = Indent::_(3)
. "if (isset(\$this->getItem(\$id)->catid))";
- $getForm[] = $this->_t(3) . "{";
- $getForm[] = $this->_t(4) . "//" . $this->setLine(__LINE__)
+ $getForm[] = Indent::_(3) . "{";
+ $getForm[] = Indent::_(4) . "//" . Line::_(__Line__, __Class__)
. " set category id";
- $getForm[] = $this->_t(4)
+ $getForm[] = Indent::_(4)
. "\$catid = \$this->getItem(\$id)->catid;";
- $getForm[] = PHP_EOL . $this->_t(4) . "//" . $this->setLine(
- __LINE__
+ $getForm[] = PHP_EOL . Indent::_(4) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " Existing record. Can only edit in selected categories.";
- $getForm[] = $this->_t(4)
+ $getForm[] = Indent::_(4)
. "\$form->setFieldAttribute('catid', 'action', 'core.edit');";
- $getForm[] = PHP_EOL . $this->_t(4) . "//" . $this->setLine(
- __LINE__
+ $getForm[] = PHP_EOL . Indent::_(4) . "//" . Line::_(
+ __LINE__,__CLASS__
)
. " Existing record. Can only edit own items in selected categories.";
- $getForm[] = $this->_t(4)
+ $getForm[] = Indent::_(4)
. "\$form->setFieldAttribute('catid', 'action', 'core.edit.own');";
- $getForm[] = $this->_t(3) . "}";
- $getForm[] = $this->_t(2) . "}";
- $getForm[] = $this->_t(2) . "else";
- $getForm[] = $this->_t(2) . "{";
- $getForm[] = $this->_t(3) . "//" . $this->setLine(__LINE__)
+ $getForm[] = Indent::_(3) . "}";
+ $getForm[] = Indent::_(2) . "}";
+ $getForm[] = Indent::_(2) . "else";
+ $getForm[] = Indent::_(2) . "{";
+ $getForm[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " New record. Can only create in selected categories.";
- $getForm[] = $this->_t(3)
+ $getForm[] = Indent::_(3)
. "\$form->setFieldAttribute('catid', 'action', 'core.create');";
- $getForm[] = $this->_t(2) . "}";
- $getForm[] = PHP_EOL . $this->_t(2)
+ $getForm[] = Indent::_(2) . "}";
+ $getForm[] = PHP_EOL . Indent::_(2)
. "\$user = JFactory::getUser();";
- $getForm[] = PHP_EOL . $this->_t(2) . "//" . $this->setLine(
- __LINE__
+ $getForm[] = PHP_EOL . Indent::_(2) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " Check for existing item.";
- $getForm[] = $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $getForm[] = Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " Modify the form based on Edit State access controls.";
// get the other view
- $otherView = $this->catCodeBuilder[$nameSingleCode]['view'];
+ $otherView = CFactory::_('Compiler.Builder.Category.Code')->getString("{$nameSingleCode}.view", 'error');
// check if the item has permissions.
- if ($coreLoad && isset($core['core.edit.state'])
- && isset($this->permissionBuilder[$core['core.edit.state']])
- && ArrayHelper::check(
- $this->permissionBuilder[$core['core.edit.state']]
- )
- && in_array(
- $nameSingleCode,
- $this->permissionBuilder[$core['core.edit.state']]
- ))
- {
- $getForm[] = $this->_t(2)
- . "if (\$id != 0 && (!\$user->authorise('"
- . $core['core.edit.state'] . "', 'com_" . $component . "."
- . $nameSingleCode . ".' . (int) \$id))";
- $getForm[] = $this->_t(3)
- . "|| (isset(\$catid) && \$catid != 0 && !\$user->authorise('core.edit.state', 'com_"
- . $component . "." . $otherView
- . ".category.' . (int) \$catid))";
- $getForm[] = $this->_t(3)
- . "|| (\$id == 0 && !\$user->authorise('"
- . $core['core.edit.state'] . "', 'com_" . $component
- . "')))";
- }
- else
- {
- $getForm[] = $this->_t(2)
- . "if (\$id != 0 && (!\$user->authorise('core.edit.state', 'com_"
- . $component . "." . $nameSingleCode
- . ".' . (int) \$id))";
- $getForm[] = $this->_t(3)
- . "|| (isset(\$catid) && \$catid != 0 && !\$user->authorise('core.edit.state', 'com_"
- . $component . "." . $otherView
- . ".category.' . (int) \$catid))";
- $getForm[] = $this->_t(3)
- . "|| (\$id == 0 && !\$user->authorise('core.edit.state', 'com_"
- . $component . "')))";
- }
- $getForm[] = $this->_t(2) . "{";
- $getForm[] = $this->_t(3) . "//" . $this->setLine(__LINE__)
+ $getForm[] = Indent::_(2)
+ . "if (\$id != 0 && (!\$user->authorise('"
+ . CFactory::_('Compiler.Creator.Permission')->getAction($nameSingleCode, 'core.edit.state')
+ . "', 'com_" . $component . "."
+ . $nameSingleCode . ".' . (int) \$id))";
+ $getForm[] = Indent::_(3)
+ . "|| (isset(\$catid) && \$catid != 0 && !\$user->authorise('core.edit.state', 'com_"
+ . $component . "." . $otherView
+ . ".category.' . (int) \$catid))";
+ $getForm[] = Indent::_(3)
+ . "|| (\$id == 0 && !\$user->authorise('"
+ . CFactory::_('Compiler.Creator.Permission')->getAction($nameSingleCode, 'core.edit.state')
+ . "', 'com_" . $component . "')))";
+ $getForm[] = Indent::_(2) . "{";
+ $getForm[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " Disable fields for display.";
- $getForm[] = $this->_t(3)
+ $getForm[] = Indent::_(3)
. "\$form->setFieldAttribute('ordering', 'disabled', 'true');";
- $getForm[] = $this->_t(3)
+ $getForm[] = Indent::_(3)
. "\$form->setFieldAttribute('published', 'disabled', 'true');";
- $getForm[] = PHP_EOL . $this->_t(3) . "//" . $this->setLine(
- __LINE__
+ $getForm[] = PHP_EOL . Indent::_(3) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " Disable fields while saving.";
- $getForm[] = $this->_t(3)
+ $getForm[] = Indent::_(3)
. "\$form->setFieldAttribute('ordering', 'filter', 'unset');";
- $getForm[] = $this->_t(3)
+ $getForm[] = Indent::_(3)
. "\$form->setFieldAttribute('published', 'filter', 'unset');";
- $getForm[] = $this->_t(2) . "}";
+ $getForm[] = Indent::_(2) . "}";
}
else
{
- $getForm[] = PHP_EOL . $this->_t(2)
+ $getForm[] = PHP_EOL . Indent::_(2)
. "\$jinput = JFactory::getApplication()->input;";
- $getForm[] = PHP_EOL . $this->_t(2) . "//" . $this->setLine(
- __LINE__
+ $getForm[] = PHP_EOL . Indent::_(2) . "//" . Line::_(
+ __LINE__,__CLASS__
)
. " The front end calls this model and uses a_id to avoid id clashes so we need to check for that first.";
- $getForm[] = $this->_t(2) . "if (\$jinput->get('a_id'))";
- $getForm[] = $this->_t(2) . "{";
- $getForm[] = $this->_t(3)
+ $getForm[] = Indent::_(2) . "if (\$jinput->get('a_id'))";
+ $getForm[] = Indent::_(2) . "{";
+ $getForm[] = Indent::_(3)
. "\$id = \$jinput->get('a_id', 0, 'INT');";
- $getForm[] = $this->_t(2) . "}";
- $getForm[] = $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $getForm[] = Indent::_(2) . "}";
+ $getForm[] = Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " The back end uses id so we use that the rest of the time and set it to 0 by default.";
- $getForm[] = $this->_t(2) . "else";
- $getForm[] = $this->_t(2) . "{";
- $getForm[] = $this->_t(3) . "\$id = \$jinput->get('id', 0, 'INT');";
- $getForm[] = $this->_t(2) . "}";
- $getForm[] = PHP_EOL . $this->_t(2)
+ $getForm[] = Indent::_(2) . "else";
+ $getForm[] = Indent::_(2) . "{";
+ $getForm[] = Indent::_(3) . "\$id = \$jinput->get('id', 0, 'INT');";
+ $getForm[] = Indent::_(2) . "}";
+ $getForm[] = PHP_EOL . Indent::_(2)
. "\$user = JFactory::getUser();";
- $getForm[] = PHP_EOL . $this->_t(2) . "//" . $this->setLine(
- __LINE__
+ $getForm[] = PHP_EOL . Indent::_(2) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " Check for existing item.";
- $getForm[] = $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $getForm[] = Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " Modify the form based on Edit State access controls.";
// check if the item has permissions.
- if ($coreLoad && isset($core['core.edit.state'])
- && isset($this->permissionBuilder[$core['core.edit.state']])
- && ArrayHelper::check(
- $this->permissionBuilder[$core['core.edit.state']]
- )
- && in_array(
- $nameSingleCode,
- $this->permissionBuilder[$core['core.edit.state']]
- ))
- {
- $getForm[] = $this->_t(2)
- . "if (\$id != 0 && (!\$user->authorise('"
- . $core['core.edit.state'] . "', 'com_" . $component . "."
- . $nameSingleCode . ".' . (int) \$id))";
- $getForm[] = $this->_t(3)
- . "|| (\$id == 0 && !\$user->authorise('"
- . $core['core.edit.state'] . "', 'com_" . $component
- . "')))";
- }
- else
- {
- $getForm[] = $this->_t(2)
- . "if (\$id != 0 && (!\$user->authorise('core.edit.state', 'com_"
- . $component . "." . $nameSingleCode
- . ".' . (int) \$id))";
- $getForm[] = $this->_t(3)
- . "|| (\$id == 0 && !\$user->authorise('core.edit.state', 'com_"
- . $component . "')))";
- }
- $getForm[] = $this->_t(2) . "{";
- $getForm[] = $this->_t(3) . "//" . $this->setLine(__LINE__)
+ $getForm[] = Indent::_(2)
+ . "if (\$id != 0 && (!\$user->authorise('"
+ . CFactory::_('Compiler.Creator.Permission')->getAction($nameSingleCode, 'core.edit.state') . "', 'com_" . $component . "."
+ . $nameSingleCode . ".' . (int) \$id))";
+ $getForm[] = Indent::_(3)
+ . "|| (\$id == 0 && !\$user->authorise('"
+ . CFactory::_('Compiler.Creator.Permission')->getAction($nameSingleCode, 'core.edit.state') . "', 'com_" . $component
+ . "')))";
+ $getForm[] = Indent::_(2) . "{";
+ $getForm[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " Disable fields for display.";
- $getForm[] = $this->_t(3)
+ $getForm[] = Indent::_(3)
. "\$form->setFieldAttribute('ordering', 'disabled', 'true');";
- $getForm[] = $this->_t(3)
+ $getForm[] = Indent::_(3)
. "\$form->setFieldAttribute('published', 'disabled', 'true');";
- $getForm[] = $this->_t(3) . "//" . $this->setLine(__LINE__)
+ $getForm[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " Disable fields while saving.";
- $getForm[] = $this->_t(3)
+ $getForm[] = Indent::_(3)
. "\$form->setFieldAttribute('ordering', 'filter', 'unset');";
- $getForm[] = $this->_t(3)
+ $getForm[] = Indent::_(3)
. "\$form->setFieldAttribute('published', 'filter', 'unset');";
- $getForm[] = $this->_t(2) . "}";
+ $getForm[] = Indent::_(2) . "}";
}
- $getForm[] = $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $getForm[] = Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " If this is a new item insure the greated by is set.";
- $getForm[] = $this->_t(2) . "if (0 == \$id)";
- $getForm[] = $this->_t(2) . "{";
- $getForm[] = $this->_t(3) . "//" . $this->setLine(__LINE__)
+ $getForm[] = Indent::_(2) . "if (0 == \$id)";
+ $getForm[] = Indent::_(2) . "{";
+ $getForm[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " Set the created_by to this user";
- $getForm[] = $this->_t(3)
+ $getForm[] = Indent::_(3)
. "\$form->setValue('created_by', null, \$user->id);";
- $getForm[] = $this->_t(2) . "}";
- $getForm[] = $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $getForm[] = Indent::_(2) . "}";
+ $getForm[] = Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " Modify the form based on Edit Creaded By access controls.";
// check if the item has permissions.
- if ($coreLoad && isset($core['core.edit.created_by'])
- && isset($this->permissionBuilder[$core['core.edit.created_by']])
- && ArrayHelper::check(
- $this->permissionBuilder[$core['core.edit.created_by']]
- )
- && in_array(
- $nameSingleCode,
- $this->permissionBuilder[$core['core.edit.created_by']]
- ))
+ if (CFactory::_('Compiler.Creator.Permission')->actionExist($nameSingleCode, 'core.edit.created_by'))
{
- $getForm[] = $this->_t(2) . "if (\$id != 0 && (!\$user->authorise('"
- . $core['core.edit.created_by'] . "', 'com_" . $component . "."
- . $nameSingleCode . ".' . (int) \$id))";
- $getForm[] = $this->_t(3) . "|| (\$id == 0 && !\$user->authorise('"
- . $core['core.edit.created_by'] . "', 'com_" . $component
- . "')))";
+ $getForm[] = Indent::_(2) . "if (\$id != 0 && (!\$user->authorise('"
+ . CFactory::_('Compiler.Creator.Permission')->getAction($nameSingleCode, 'core.edit.created_by')
+ . "', 'com_" . $component . "." . $nameSingleCode . ".' . (int) \$id))";
+ $getForm[] = Indent::_(3) . "|| (\$id == 0 && !\$user->authorise('"
+ . CFactory::_('Compiler.Creator.Permission')->getAction($nameSingleCode, 'core.edit.created_by')
+ . "', 'com_" . $component . "')))";
}
else
{
- $getForm[] = $this->_t(2)
- . "if (!\$user->authorise('core.edit.created_by', 'com_"
- . $component . "'))";
+ $getForm[] = Indent::_(2)
+ . "if (!\$user->authorise('core.edit.created_by', 'com_" . $component . "'))";
}
- $getForm[] = $this->_t(2) . "{";
- $getForm[] = $this->_t(3) . "//" . $this->setLine(__LINE__)
+ $getForm[] = Indent::_(2) . "{";
+ $getForm[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " Disable fields for display.";
- $getForm[] = $this->_t(3)
+ $getForm[] = Indent::_(3)
. "\$form->setFieldAttribute('created_by', 'disabled', 'true');";
- $getForm[] = $this->_t(3) . "//" . $this->setLine(__LINE__)
+ $getForm[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " Disable fields for display.";
- $getForm[] = $this->_t(3)
+ $getForm[] = Indent::_(3)
. "\$form->setFieldAttribute('created_by', 'readonly', 'true');";
- $getForm[] = $this->_t(3) . "//" . $this->setLine(__LINE__)
+ $getForm[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " Disable fields while saving.";
- $getForm[] = $this->_t(3)
+ $getForm[] = Indent::_(3)
. "\$form->setFieldAttribute('created_by', 'filter', 'unset');";
- $getForm[] = $this->_t(2) . "}";
- $getForm[] = $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $getForm[] = Indent::_(2) . "}";
+ $getForm[] = Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " Modify the form based on Edit Creaded Date access controls.";
// check if the item has permissions.
- if ($coreLoad && isset($core['core.edit.created'])
- && isset($this->permissionBuilder[$core['core.edit.created']])
- && ArrayHelper::check(
- $this->permissionBuilder[$core['core.edit.created']]
- )
- && in_array(
- $nameSingleCode,
- $this->permissionBuilder[$core['core.edit.created']]
- ))
+ if (CFactory::_('Compiler.Creator.Permission')->actionExist($nameSingleCode, 'core.edit.created'))
{
- $getForm[] = $this->_t(2) . "if (\$id != 0 && (!\$user->authorise('"
- . $core['core.edit.created'] . "', 'com_" . $component . "."
- . $nameSingleCode . ".' . (int) \$id))";
- $getForm[] = $this->_t(3) . "|| (\$id == 0 && !\$user->authorise('"
- . $core['core.edit.created'] . "', 'com_" . $component . "')))";
+ $getForm[] = Indent::_(2) . "if (\$id != 0 && (!\$user->authorise('"
+ . CFactory::_('Compiler.Creator.Permission')->getAction($nameSingleCode, 'core.edit.created')
+ . "', 'com_" . $component . "." . $nameSingleCode . ".' . (int) \$id))";
+ $getForm[] = Indent::_(3) . "|| (\$id == 0 && !\$user->authorise('"
+ . CFactory::_('Compiler.Creator.Permission')->getAction($nameSingleCode, 'core.edit.created')
+ . "', 'com_" . $component . "')))";
}
else
{
- $getForm[] = $this->_t(2)
+ $getForm[] = Indent::_(2)
. "if (!\$user->authorise('core.edit.created', 'com_"
. $component . "'))";
}
- $getForm[] = $this->_t(2) . "{";
- $getForm[] = $this->_t(3) . "//" . $this->setLine(__LINE__)
+ $getForm[] = Indent::_(2) . "{";
+ $getForm[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " Disable fields for display.";
- $getForm[] = $this->_t(3)
+ $getForm[] = Indent::_(3)
. "\$form->setFieldAttribute('created', 'disabled', 'true');";
- $getForm[] = $this->_t(3) . "//" . $this->setLine(__LINE__)
+ $getForm[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " Disable fields while saving.";
- $getForm[] = $this->_t(3)
+ $getForm[] = Indent::_(3)
. "\$form->setFieldAttribute('created', 'filter', 'unset');";
- $getForm[] = $this->_t(2) . "}";
+ $getForm[] = Indent::_(2) . "}";
// check if the item has access permissions.
- if ($coreLoad && isset($core['core.edit.access'])
- && isset($this->permissionBuilder[$core['core.edit.access']])
- && ArrayHelper::check(
- $this->permissionBuilder[$core['core.edit.access']]
- )
- && in_array(
- $nameSingleCode,
- $this->permissionBuilder[$core['core.edit.access']]
- ))
+ if (CFactory::_('Compiler.Creator.Permission')->actionExist($nameSingleCode, 'core.edit.access'))
{
- $getForm[] = $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $getForm[] = Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " Modify the form based on Edit Access 'access' controls.";
- $getForm[] = $this->_t(2) . "if (\$id != 0 && (!\$user->authorise('"
- . $core['core.edit.access'] . "', 'com_" . $component . "."
- . $nameSingleCode . ".' . (int) \$id))";
- $getForm[] = $this->_t(3) . "|| (\$id == 0 && !\$user->authorise('"
- . $core['core.edit.access'] . "', 'com_" . $component . "')))";
- $getForm[] = $this->_t(2) . "{";
- $getForm[] = $this->_t(3) . "//" . $this->setLine(__LINE__)
+ $getForm[] = Indent::_(2) . "if (\$id != 0 && (!\$user->authorise('"
+ . CFactory::_('Compiler.Creator.Permission')->getAction($nameSingleCode, 'core.edit.access')
+ . "', 'com_" . $component . "." . $nameSingleCode . ".' . (int) \$id))";
+ $getForm[] = Indent::_(3) . "|| (\$id == 0 && !\$user->authorise('"
+ . CFactory::_('Compiler.Creator.Permission')->getAction($nameSingleCode, 'core.edit.access')
+ . "', 'com_" . $component . "')))";
+ $getForm[] = Indent::_(2) . "{";
+ $getForm[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " Disable fields for display.";
- $getForm[] = $this->_t(3)
+ $getForm[] = Indent::_(3)
. "\$form->setFieldAttribute('access', 'disabled', 'true');";
- $getForm[] = $this->_t(3) . "//" . $this->setLine(__LINE__)
+ $getForm[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " Disable fields while saving.";
- $getForm[] = $this->_t(3)
+ $getForm[] = Indent::_(3)
. "\$form->setFieldAttribute('access', 'filter', 'unset');";
- $getForm[] = $this->_t(2) . "}";
+ $getForm[] = Indent::_(2) . "}";
}
// handel the fields permissions
if (isset($this->permissionFields[$nameSingleCode])
@@ -20117,40 +18689,40 @@ class Interpretation extends Fields
}
}
// add the redirect trick to set the field of origin
- $getForm[] = $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $getForm[] = Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " Only load these values if no id is found";
- $getForm[] = $this->_t(2) . "if (0 == \$id)";
- $getForm[] = $this->_t(2) . "{";
- $getForm[] = $this->_t(3) . "//" . $this->setLine(__LINE__)
+ $getForm[] = Indent::_(2) . "if (0 == \$id)";
+ $getForm[] = Indent::_(2) . "{";
+ $getForm[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " Set redirected view name";
- $getForm[] = $this->_t(3)
+ $getForm[] = Indent::_(3)
. "\$redirectedView = \$jinput->get('ref', null, 'STRING');";
- $getForm[] = $this->_t(3) . "//" . $this->setLine(__LINE__)
+ $getForm[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " Set field name (or fall back to view name)";
- $getForm[] = $this->_t(3)
+ $getForm[] = Indent::_(3)
. "\$redirectedField = \$jinput->get('field', \$redirectedView, 'STRING');";
- $getForm[] = $this->_t(3) . "//" . $this->setLine(__LINE__)
+ $getForm[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " Set redirected view id";
- $getForm[] = $this->_t(3)
+ $getForm[] = Indent::_(3)
. "\$redirectedId = \$jinput->get('refid', 0, 'INT');";
- $getForm[] = $this->_t(3) . "//" . $this->setLine(__LINE__)
+ $getForm[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " Set field id (or fall back to redirected view id)";
- $getForm[] = $this->_t(3)
+ $getForm[] = Indent::_(3)
. "\$redirectedValue = \$jinput->get('field_id', \$redirectedId, 'INT');";
- $getForm[] = $this->_t(3)
+ $getForm[] = Indent::_(3)
. "if (0 != \$redirectedValue && \$redirectedField)";
- $getForm[] = $this->_t(3) . "{";
- $getForm[] = $this->_t(4) . "//" . $this->setLine(__LINE__)
+ $getForm[] = Indent::_(3) . "{";
+ $getForm[] = Indent::_(4) . "//" . Line::_(__Line__, __Class__)
. " Now set the local-redirected field default value";
- $getForm[] = $this->_t(4)
+ $getForm[] = Indent::_(4)
. "\$form->setValue(\$redirectedField, null, \$redirectedValue);";
- $getForm[] = $this->_t(3) . "}";
+ $getForm[] = Indent::_(3) . "}";
// load custom script if found
- $getForm[] = $this->_t(2) . "}" . $this->getCustomScriptBuilder(
+ $getForm[] = Indent::_(2) . "}" . CFactory::_('Customcode.Dispenser')->get(
'php_getform', $nameSingleCode, PHP_EOL
);
// setup the default script
- $getForm[] = $this->_t(2) . "return \$form;";
+ $getForm[] = Indent::_(2) . "return \$form;";
return implode(PHP_EOL, $getForm);
}
@@ -20160,52 +18732,52 @@ class Interpretation extends Fields
)
{
// only for fields that can be edited
- if (!ComponentbuilderHelper::fieldCheck($fieldType, 'spacer'))
+ if (!CFactory::_('Field.Groups')->check($fieldType, 'spacer'))
{
- $allow[] = $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $allow[] = Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " Modify the form based on Edit "
. StringHelper::safe($fieldName, 'W')
. " access controls.";
- $allow[] = $this->_t(2) . "if (\$id != 0 && (!\$user->authorise('"
+ $allow[] = Indent::_(2) . "if (\$id != 0 && (!\$user->authorise('"
. $nameSingleCode . ".edit." . $fieldName . "', 'com_"
. $component . "." . $nameSingleCode . ".' . (int) \$id))";
- $allow[] = $this->_t(3) . "|| (\$id == 0 && !\$user->authorise('"
+ $allow[] = Indent::_(3) . "|| (\$id == 0 && !\$user->authorise('"
. $nameSingleCode . ".edit." . $fieldName . "', 'com_"
. $component . "')))";
- $allow[] = $this->_t(2) . "{";
- $allow[] = $this->_t(3) . "//" . $this->setLine(__LINE__)
+ $allow[] = Indent::_(2) . "{";
+ $allow[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " Disable fields for display.";
- $allow[] = $this->_t(3) . "\$form->setFieldAttribute('" . $fieldName
+ $allow[] = Indent::_(3) . "\$form->setFieldAttribute('" . $fieldName
. "', 'disabled', 'true');";
- $allow[] = $this->_t(3) . "//" . $this->setLine(__LINE__)
+ $allow[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " Disable fields for display.";
- $allow[] = $this->_t(3) . "\$form->setFieldAttribute('" . $fieldName
+ $allow[] = Indent::_(3) . "\$form->setFieldAttribute('" . $fieldName
. "', 'readonly', 'true');";
if ('radio' === $fieldType || 'repeatable' === $fieldType)
{
- $allow[] = $this->_t(3) . "//" . $this->setLine(__LINE__)
+ $allow[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " Disable radio button for display.";
- $allow[] = $this->_t(3)
+ $allow[] = Indent::_(3)
. "\$class = \$form->getFieldAttribute('" . $fieldName
. "', 'class', '');";
- $allow[] = $this->_t(3) . "\$form->setFieldAttribute('"
+ $allow[] = Indent::_(3) . "\$form->setFieldAttribute('"
. $fieldName . "', 'class', \$class.' disabled no-click');";
}
- $allow[] = $this->_t(3) . "//" . $this->setLine(__LINE__)
+ $allow[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " If there is no value continue.";
- $allow[] = $this->_t(3) . "if (!\$form->getValue('" . $fieldName
+ $allow[] = Indent::_(3) . "if (!\$form->getValue('" . $fieldName
. "'))";
- $allow[] = $this->_t(3) . "{";
- $allow[] = $this->_t(4) . "//" . $this->setLine(__LINE__)
+ $allow[] = Indent::_(3) . "{";
+ $allow[] = Indent::_(4) . "//" . Line::_(__Line__, __Class__)
. " Disable fields while saving.";
- $allow[] = $this->_t(4) . "\$form->setFieldAttribute('" . $fieldName
+ $allow[] = Indent::_(4) . "\$form->setFieldAttribute('" . $fieldName
. "', 'filter', 'unset');";
- $allow[] = $this->_t(4) . "//" . $this->setLine(__LINE__)
+ $allow[] = Indent::_(4) . "//" . Line::_(__Line__, __Class__)
. " Disable fields while saving.";
- $allow[] = $this->_t(4) . "\$form->setFieldAttribute('" . $fieldName
+ $allow[] = Indent::_(4) . "\$form->setFieldAttribute('" . $fieldName
. "', 'required', 'false');";
- $allow[] = $this->_t(3) . "}";
- $allow[] = $this->_t(2) . "}";
+ $allow[] = Indent::_(3) . "}";
+ $allow[] = Indent::_(2) . "}";
}
}
@@ -20213,94 +18785,94 @@ class Interpretation extends Fields
$fieldName, $fieldType, $component
)
{
- $allow[] = $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $allow[] = Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " Modify the from the form based on "
. StringHelper::safe($fieldName, 'W')
. " access controls.";
- $allow[] = $this->_t(2) . "if (\$id != 0 && (!\$user->authorise('"
+ $allow[] = Indent::_(2) . "if (\$id != 0 && (!\$user->authorise('"
. $nameSingleCode . ".access." . $fieldName . "', 'com_"
. $component . "." . $nameSingleCode . ".' . (int) \$id))";
- $allow[] = $this->_t(3) . "|| (\$id == 0 && !\$user->authorise('"
+ $allow[] = Indent::_(3) . "|| (\$id == 0 && !\$user->authorise('"
. $nameSingleCode . ".access." . $fieldName . "', 'com_"
. $component . "')))";
- $allow[] = $this->_t(2) . "{";
- $allow[] = $this->_t(3) . "//" . $this->setLine(__LINE__)
+ $allow[] = Indent::_(2) . "{";
+ $allow[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " Remove the field";
- $allow[] = $this->_t(3) . "\$form->removeField('" . $fieldName . "');";
- $allow[] = $this->_t(2) . "}";
+ $allow[] = Indent::_(3) . "\$form->removeField('" . $fieldName . "');";
+ $allow[] = Indent::_(2) . "}";
}
protected function setPermissionViewFields(&$allow, $nameSingleCode,
$fieldName, $fieldType, $component
)
{
- if (ComponentbuilderHelper::fieldCheck($fieldType, 'spacer'))
+ if (CFactory::_('Field.Groups')->check($fieldType, 'spacer'))
{
- $allow[] = $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $allow[] = Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " Modify the form based on View "
. StringHelper::safe($fieldName, 'W')
. " access controls.";
- $allow[] = $this->_t(2) . "if (\$id != 0 && (!\$user->authorise('"
+ $allow[] = Indent::_(2) . "if (\$id != 0 && (!\$user->authorise('"
. $nameSingleCode . ".view." . $fieldName . "', 'com_"
. $component . "." . $nameSingleCode . ".' . (int) \$id))";
- $allow[] = $this->_t(3) . "|| (\$id == 0 && !\$user->authorise('"
+ $allow[] = Indent::_(3) . "|| (\$id == 0 && !\$user->authorise('"
. $nameSingleCode . ".view." . $fieldName . "', 'com_"
. $component . "')))";
- $allow[] = $this->_t(2) . "{";
- $allow[] = $this->_t(3) . "//" . $this->setLine(__LINE__)
+ $allow[] = Indent::_(2) . "{";
+ $allow[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " Remove the field";
- $allow[] = $this->_t(3) . "\$form->removeField('" . $fieldName
+ $allow[] = Indent::_(3) . "\$form->removeField('" . $fieldName
. "');";
- $allow[] = $this->_t(2) . "}";
+ $allow[] = Indent::_(2) . "}";
}
else
{
- $allow[] = $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $allow[] = Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " Modify the form based on View "
. StringHelper::safe($fieldName, 'W')
. " access controls.";
- $allow[] = $this->_t(2) . "if (\$id != 0 && (!\$user->authorise('"
+ $allow[] = Indent::_(2) . "if (\$id != 0 && (!\$user->authorise('"
. $nameSingleCode . ".view." . $fieldName . "', 'com_"
. $component . "." . $nameSingleCode . ".' . (int) \$id))";
- $allow[] = $this->_t(3) . "|| (\$id == 0 && !\$user->authorise('"
+ $allow[] = Indent::_(3) . "|| (\$id == 0 && !\$user->authorise('"
. $nameSingleCode . ".view." . $fieldName . "', 'com_"
. $component . "')))";
- $allow[] = $this->_t(2) . "{";
- $allow[] = $this->_t(3) . "//" . $this->setLine(__LINE__)
+ $allow[] = Indent::_(2) . "{";
+ $allow[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " Make the field hidded.";
- $allow[] = $this->_t(3) . "\$form->setFieldAttribute('" . $fieldName
+ $allow[] = Indent::_(3) . "\$form->setFieldAttribute('" . $fieldName
. "', 'type', 'hidden');";
- $allow[] = $this->_t(3) . "//" . $this->setLine(__LINE__)
+ $allow[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " If there is no value continue.";
- $allow[] = $this->_t(3) . "if (!(\$val = \$form->getValue('"
+ $allow[] = Indent::_(3) . "if (!(\$val = \$form->getValue('"
. $fieldName . "')))";
- $allow[] = $this->_t(3) . "{";
- $allow[] = $this->_t(4) . "//" . $this->setLine(__LINE__)
+ $allow[] = Indent::_(3) . "{";
+ $allow[] = Indent::_(4) . "//" . Line::_(__Line__, __Class__)
. " Disable fields while saving.";
- $allow[] = $this->_t(4) . "\$form->setFieldAttribute('" . $fieldName
+ $allow[] = Indent::_(4) . "\$form->setFieldAttribute('" . $fieldName
. "', 'filter', 'unset');";
- $allow[] = $this->_t(4) . "//" . $this->setLine(__LINE__)
+ $allow[] = Indent::_(4) . "//" . Line::_(__Line__, __Class__)
. " Disable fields while saving.";
- $allow[] = $this->_t(4) . "\$form->setFieldAttribute('" . $fieldName
+ $allow[] = Indent::_(4) . "\$form->setFieldAttribute('" . $fieldName
. "', 'required', 'false');";
- $allow[] = $this->_t(4) . "//" . $this->setLine(__LINE__)
+ $allow[] = Indent::_(4) . "//" . Line::_(__Line__, __Class__)
. " Make sure";
- $allow[] = $this->_t(4) . "\$form->setValue('" . $fieldName
+ $allow[] = Indent::_(4) . "\$form->setValue('" . $fieldName
. "', null, '');";
- $allow[] = $this->_t(3) . "}";
- $allow[] = $this->_t(3) . "elseif (" . ucfirst($component)
+ $allow[] = Indent::_(3) . "}";
+ $allow[] = Indent::_(3) . "elseif (" . ucfirst((string) $component)
. "Helper::checkArray(\$val))";
- $allow[] = $this->_t(3) . "{";
- $allow[] = $this->_t(4) . "//" . $this->setLine(__LINE__)
+ $allow[] = Indent::_(3) . "{";
+ $allow[] = Indent::_(4) . "//" . Line::_(__Line__, __Class__)
. " We have to unset then (TODO)";
- $allow[] = $this->_t(4) . "//" . $this->setLine(__LINE__)
+ $allow[] = Indent::_(4) . "//" . Line::_(__Line__, __Class__)
. " Hiddend field can not handel array value";
- $allow[] = $this->_t(4) . "//" . $this->setLine(__LINE__)
+ $allow[] = Indent::_(4) . "//" . Line::_(__Line__, __Class__)
. " Even if we convert to json we get an error";
- $allow[] = $this->_t(4) . "\$form->removeField('" . $fieldName
+ $allow[] = Indent::_(4) . "\$form->removeField('" . $fieldName
. "');";
- $allow[] = $this->_t(3) . "}";
- $allow[] = $this->_t(2) . "}";
+ $allow[] = Indent::_(3) . "}";
+ $allow[] = Indent::_(2) . "}";
}
}
@@ -20308,52 +18880,39 @@ class Interpretation extends Fields
{
$allow = array();
// set component name
- $component = $this->componentCodeName;
+ $component = CFactory::_('Config')->component_code_name;
// prepare custom permission script
- $customAllow = $this->getCustomScriptBuilder(
- 'php_allowedit', $nameSingleCode, $this->_t(2)
+ $customAllow = CFactory::_('Customcode.Dispenser')->get(
+ 'php_allowedit', $nameSingleCode, Indent::_(2)
. "\$recordId = (int) isset(\$data[\$key]) ? \$data[\$key] : 0;"
. PHP_EOL
);
- // setup correct core target
- $coreLoad = false;
- if (isset($this->permissionCore[$nameSingleCode]))
- {
- $core = $this->permissionCore[$nameSingleCode];
- $coreLoad = true;
- }
// check if the item has permissions.
- if ($coreLoad && isset($core['core.edit'])
- && isset($this->permissionBuilder[$core['core.edit']])
- && ArrayHelper::check(
- $this->permissionBuilder[$core['core.edit']]
- )
- && in_array(
- $nameSingleCode, $this->permissionBuilder[$core['core.edit']]
- ))
+ if (CFactory::_('Compiler.Creator.Permission')->actionExist($nameSingleCode, 'core.edit'))
{
- $allow[] = PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $allow[] = PHP_EOL . Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " Check specific edit permission then general edit permission.";
- $allow[] = $this->_t(2) . "\$user = JFactory::getUser();";
+ $allow[] = Indent::_(2) . "\$user = JFactory::getUser();";
// load custom permission script
$allow[] = $customAllow;
- $allow[] = $this->_t(2) . "return \$user->authorise('"
- . $core['core.edit'] . "', 'com_" . $component . "."
- . $nameSingleCode
+ $allow[] = Indent::_(2) . "return \$user->authorise('"
+ . CFactory::_('Compiler.Creator.Permission')->getAction($nameSingleCode, 'core.edit')
+ . "', 'com_" . $component . "." . $nameSingleCode
. ".'. ((int) isset(\$data[\$key]) ? \$data[\$key] : 0)) or \$user->authorise('"
- . $core['core.edit'] . "', 'com_" . $component . "');";
+ . CFactory::_('Compiler.Creator.Permission')->getAction($nameSingleCode, 'core.edit')
+ . "', 'com_" . $component . "');";
}
else
{
- $allow[] = PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $allow[] = PHP_EOL . Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " Check specific edit permission then general edit permission.";
if (StringHelper::check($customAllow))
{
- $allow[] = $this->_t(2) . "\$user = JFactory::getUser();";
+ $allow[] = Indent::_(2) . "\$user = JFactory::getUser();";
}
// load custom permission script
$allow[] = $customAllow;
- $allow[] = $this->_t(2)
+ $allow[] = Indent::_(2)
. "return JFactory::getUser()->authorise('core.edit', 'com_"
. $component . "." . $nameSingleCode
. ".'. ((int) isset(\$data[\$key]) ? \$data[\$key] : 0)) or parent::allowEdit(\$data, \$key);";
@@ -20366,119 +18925,55 @@ class Interpretation extends Fields
{
$allow = array();
// set component name
- $component = $this->componentCodeName;
- // setup correct core target
- $coreLoad = false;
- if (isset($this->permissionCore[$nameSingleCode]))
- {
- $core = $this->permissionCore[$nameSingleCode];
- $coreLoad = true;
- }
- if (0) //isset($this->categoryBuilder[$nameListCode]) && ArrayHelper::check($this->categoryBuilder[$nameListCode])) <-- remove category from check
+ $component = CFactory::_('Config')->component_code_name;
+ if (0) //CFactory::_('Compiler.Builder.Category')->exists("{$nameListCode}")) <-- remove category from check
{
// check if category has another name
- if ($coreLoad && isset($this->catOtherName[$nameListCode])
- && ArrayHelper::check(
- $this->catOtherName[$nameListCode]
- ))
- {
- $otherViews = $this->catOtherName[$nameListCode]['views'];
- $otherView = $this->catOtherName[$nameListCode]['view'];
- }
- else
- {
- $otherViews = $nameListCode;
- $otherView = $nameSingleCode;
- }
+ $otherViews = CFactory::_('Compiler.Builder.Category.Other.Name')->
+ get($nameListCode . '.views', $nameListCode);
+ $otherView = CFactory::_('Compiler.Builder.Category.Other.Name')->
+ get($nameListCode . '.view', $nameSingleCode);
// setup the category script
- $allow[] = PHP_EOL . $this->_t(2) . "if (!empty(\$record->id))";
- $allow[] = $this->_t(2) . "{";
- $allow[] = $this->_t(3) . "if (\$record->published != -2)";
- $allow[] = $this->_t(3) . "{";
- $allow[] = $this->_t(4) . "return;";
- $allow[] = $this->_t(3) . "}";
- $allow[] = PHP_EOL . $this->_t(3) . "\$user = JFactory::getUser();";
- $allow[] = $this->_t(3)
+ $allow[] = PHP_EOL . Indent::_(2) . "if (!empty(\$record->id))";
+ $allow[] = Indent::_(2) . "{";
+ $allow[] = Indent::_(3) . "if (\$record->published != -2)";
+ $allow[] = Indent::_(3) . "{";
+ $allow[] = Indent::_(4) . "return;";
+ $allow[] = Indent::_(3) . "}";
+ $allow[] = PHP_EOL . Indent::_(3) . "\$user = JFactory::getUser();";
+ $allow[] = Indent::_(3)
. "\$allow = \$user->authorise('core.delete', 'com_"
. $component . "." . $otherView
. ".category.' . (int) \$record->catid);";
// check if the item has permissions.
- if ($coreLoad
- && isset($this->permissionBuilder[$core['core.delete']])
- && ArrayHelper::check(
- $this->permissionBuilder[$core['core.delete']]
- )
- && in_array(
- $otherView, $this->permissionBuilder[$core['core.delete']]
- ))
- {
- $allow[] = PHP_EOL . $this->_t(3) . "if (\$allow)";
- $allow[] = $this->_t(3) . "{";
- $allow[] = $this->_t(4) . "//" . $this->setLine(__LINE__)
- . " The record has been set. Check the record permissions.";
- $allow[] = $this->_t(4) . "return \$user->authorise('"
- . $core['core.delete'] . "', 'com_" . $component . "."
- . $otherView . ".' . (int) \$record->id);";
- $allow[] = $this->_t(3) . "}";
- }
- else
- {
- $allow[] = PHP_EOL . $this->_t(3) . "if (\$allow)";
- $allow[] = $this->_t(3) . "{";
- $allow[] = $this->_t(4) . "//" . $this->setLine(__LINE__)
- . " The record has been set. Check the record permissions.";
- $allow[] = $this->_t(4)
- . "return \$user->authorise('core.delete', 'com_"
- . $component . "." . $otherView
- . ".' . (int) \$record->id);";
- $allow[] = $this->_t(3) . "}";
- }
- $allow[] = $this->_t(3) . "return \$allow;";
- $allow[] = $this->_t(2) . "}";
- $allow[] = $this->_t(2) . "return false;";
+ $allow[] = PHP_EOL . Indent::_(3) . "if (\$allow)";
+ $allow[] = Indent::_(3) . "{";
+ $allow[] = Indent::_(4) . "//" . Line::_(__Line__, __Class__)
+ . " The record has been set. Check the record permissions.";
+ $allow[] = Indent::_(4) . "return \$user->authorise('"
+ . CFactory::_('Compiler.Creator.Permission')->getAction($otherView, 'core.delete') . "', 'com_" . $component . "."
+ . $otherView . ".' . (int) \$record->id);";
+ $allow[] = Indent::_(3) . "}";
}
else
{
// setup the default script
- $allow[] = PHP_EOL . $this->_t(2) . "if (!empty(\$record->id))";
- $allow[] = $this->_t(2) . "{";
- $allow[] = $this->_t(3) . "if (\$record->published != -2)";
- $allow[] = $this->_t(3) . "{";
- $allow[] = $this->_t(4) . "return;";
- $allow[] = $this->_t(3) . "}";
+ $allow[] = PHP_EOL . Indent::_(2) . "if (!empty(\$record->id))";
+ $allow[] = Indent::_(2) . "{";
+ $allow[] = Indent::_(3) . "if (\$record->published != -2)";
+ $allow[] = Indent::_(3) . "{";
+ $allow[] = Indent::_(4) . "return;";
+ $allow[] = Indent::_(3) . "}";
// check if the item has permissions.
- if ($coreLoad
- && (isset($core['core.delete'])
- && isset($this->permissionBuilder[$core['core.delete']]))
- && ArrayHelper::check(
- $this->permissionBuilder[$core['core.delete']]
- )
- && in_array(
- $nameSingleCode,
- $this->permissionBuilder[$core['core.delete']]
- ))
- {
- $allow[] = PHP_EOL . $this->_t(3)
- . "\$user = JFactory::getUser();";
- $allow[] = $this->_t(3) . "//" . $this->setLine(__LINE__)
- . " The record has been set. Check the record permissions.";
- $allow[] = $this->_t(3) . "return \$user->authorise('"
- . $core['core.delete'] . "', 'com_" . $component . "."
- . $nameSingleCode . ".' . (int) \$record->id);";
- }
- else
- {
- $allow[] = PHP_EOL . $this->_t(3)
- . "\$user = JFactory::getUser();";
- $allow[] = $this->_t(3) . "//" . $this->setLine(__LINE__)
- . " The record has been set. Check the record permissions.";
- $allow[] = $this->_t(3)
- . "return \$user->authorise('core.delete', 'com_"
- . $component . "." . $nameSingleCode
- . ".' . (int) \$record->id);";
- }
- $allow[] = $this->_t(2) . "}";
- $allow[] = $this->_t(2) . "return false;";
+ $allow[] = PHP_EOL . Indent::_(3)
+ . "\$user = JFactory::getUser();";
+ $allow[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
+ . " The record has been set. Check the record permissions.";
+ $allow[] = Indent::_(3) . "return \$user->authorise('"
+ . CFactory::_('Compiler.Creator.Permission')->getAction($nameSingleCode, 'core.delete') . "', 'com_" . $component . "."
+ . $nameSingleCode . ".' . (int) \$record->id);";
+ $allow[] = Indent::_(2) . "}";
+ $allow[] = Indent::_(2) . "return false;";
}
return implode(PHP_EOL, $allow);
@@ -20490,163 +18985,96 @@ class Interpretation extends Fields
{
$allow = array();
// set component name
- $component = $this->componentCodeName;
- // setup correct core target
- $coreLoad = false;
- if (isset($this->permissionCore[$nameSingleCode]))
- {
- $core = $this->permissionCore[$nameSingleCode];
- $coreLoad = true;
- }
- if (0) // isset($this->categoryBuilder[$nameListCode]) && ArrayHelper::check($this->categoryBuilder[$nameListCode])) <-- remove category from check
+ $component = CFactory::_('Config')->component_code_name;
+ if (0) //CFactory::_('Compiler.Builder.Category')->exists("{$nameListCode}")) <-- remove category from check
{
// check if category has another name
- if (isset($this->catOtherName[$nameListCode])
- && ArrayHelper::check(
- $this->catOtherName[$nameListCode]
- ))
- {
- $otherViews = $this->catOtherName[$nameListCode]['views'];
- $otherView = $this->catOtherName[$nameListCode]['view'];
- }
- else
- {
- $otherViews = $nameListCode;
- $otherView = $nameSingleCode;
- }
- $allow[] = PHP_EOL . $this->_t(2) . "\$user = JFactory::getUser();";
- $allow[] = $this->_t(2)
+ $otherViews = CFactory::_('Compiler.Builder.Category.Other.Name')->
+ get($nameListCode . '.views', $nameListCode);
+ $otherView = CFactory::_('Compiler.Builder.Category.Other.Name')->
+ get($nameListCode . '.view', $nameSingleCode);
+
+ $allow[] = PHP_EOL . Indent::_(2) . "\$user = JFactory::getUser();";
+ $allow[] = Indent::_(2)
. "\$recordId = (!empty(\$record->id)) ? \$record->id : 0;";
- $allow[] = PHP_EOL . $this->_t(2) . "if (\$recordId)";
- $allow[] = $this->_t(2) . "{";
- $allow[] = $this->_t(3) . "//" . $this->setLine(__LINE__)
+ $allow[] = PHP_EOL . Indent::_(2) . "if (\$recordId)";
+ $allow[] = Indent::_(2) . "{";
+ $allow[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " The record has been set. Check the record permissions.";
// check if the item has permissions.
- if ($coreLoad && isset($core['core.edit.state'])
- && isset($this->permissionBuilder[$core['core.edit.state']])
- && ArrayHelper::check(
- $this->permissionBuilder[$core['core.edit.state']]
- )
- && in_array(
- $nameSingleCode,
- $this->permissionBuilder[$core['core.edit.state']]
- ))
- {
- $allow[] = $this->_t(3) . "\$permission = \$user->authorise('"
- . $core['core.edit.state'] . "', 'com_" . $component . "."
- . $nameSingleCode . ".' . (int) \$recordId);";
- }
- else
- {
- $allow[] = $this->_t(3)
- . "\$permission = \$user->authorise('core.edit.state', 'com_"
- . $component . "." . $nameSingleCode
- . ".' . (int) \$recordId);";
- }
- $allow[] = $this->_t(3)
+ $allow[] = Indent::_(3) . "\$permission = \$user->authorise('"
+ . CFactory::_('Compiler.Creator.Permission')->getAction($nameSingleCode, 'core.edit.state') . "', 'com_" . $component . "."
+ . $nameSingleCode . ".' . (int) \$recordId);";
+ $allow[] = Indent::_(3)
. "if (!\$permission && !is_null(\$permission))";
- $allow[] = $this->_t(3) . "{";
- $allow[] = $this->_t(4) . "return false;";
- $allow[] = $this->_t(3) . "}";
- $allow[] = $this->_t(2) . "}";
+ $allow[] = Indent::_(3) . "{";
+ $allow[] = Indent::_(4) . "return false;";
+ $allow[] = Indent::_(3) . "}";
+ $allow[] = Indent::_(2) . "}";
// setup the category script
- $allow[] = $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $allow[] = Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " Check against the category.";
- $allow[] = $this->_t(2) . "if (!empty(\$record->catid))";
- $allow[] = $this->_t(2) . "{";
- $allow[] = $this->_t(3)
+ $allow[] = Indent::_(2) . "if (!empty(\$record->catid))";
+ $allow[] = Indent::_(2) . "{";
+ $allow[] = Indent::_(3)
. "\$catpermission = \$user->authorise('core.edit.state', 'com_"
. $component . "." . $otherView
. ".category.' . (int) \$record->catid);";
- $allow[] = $this->_t(3)
+ $allow[] = Indent::_(3)
. "if (!\$catpermission && !is_null(\$catpermission))";
- $allow[] = $this->_t(3) . "{";
- $allow[] = $this->_t(4) . "return false;";
- $allow[] = $this->_t(3) . "}";
- $allow[] = $this->_t(2) . "}";
- if ($coreLoad && isset($core['core.edit.state'])
- && isset($this->permissionBuilder[$core['core.edit.state']])
- && ArrayHelper::check(
- $this->permissionBuilder[$core['core.edit.state']]
- )
- && in_array(
- $nameSingleCode,
- $this->permissionBuilder[$core['core.edit.state']]
- ))
+ $allow[] = Indent::_(3) . "{";
+ $allow[] = Indent::_(4) . "return false;";
+ $allow[] = Indent::_(3) . "}";
+ $allow[] = Indent::_(2) . "}";
+ if (CFactory::_('Compiler.Creator.Permission')->actionExist($nameSingleCode, 'core.edit.state'))
{
- $allow[] = $this->_t(2) . "//" . $this->setLine(__LINE__)
- . " In the absense of better information, revert to the component permissions.";
- $allow[] = $this->_t(2) . "return \$user->authorise('"
- . $core['core.edit.state'] . "', 'com_" . $component
- . "');";
+ $allow[] = Indent::_(2) . "//" . Line::_(__Line__, __Class__)
+ . " In the absence of better information, revert to the component permissions.";
+ $allow[] = Indent::_(2) . "return \$user->authorise('"
+ . CFactory::_('Compiler.Creator.Permission')->getAction($nameSingleCode, 'core.edit.state')
+ . "', 'com_" . $component . "');";
}
else
{
- $allow[] = $this->_t(2) . "//" . $this->setLine(__LINE__)
- . " In the absense of better information, revert to the component permissions.";
- $allow[] = $this->_t(2)
+ $allow[] = Indent::_(2) . "//" . Line::_(__Line__, __Class__)
+ . " In the absence of better information, revert to the component permissions.";
+ $allow[] = Indent::_(2)
. "return parent::canEditState(\$record);";
}
}
else
{
// setup the default script
- $allow[] = PHP_EOL . $this->_t(2) . "\$user = JFactory::getUser();";
- $allow[] = $this->_t(2)
+ $allow[] = PHP_EOL . Indent::_(2) . "\$user = JFactory::getUser();";
+ $allow[] = Indent::_(2)
. "\$recordId = (!empty(\$record->id)) ? \$record->id : 0;";
- $allow[] = PHP_EOL . $this->_t(2) . "if (\$recordId)";
- $allow[] = $this->_t(2) . "{";
- $allow[] = $this->_t(3) . "//" . $this->setLine(__LINE__)
+ $allow[] = PHP_EOL . Indent::_(2) . "if (\$recordId)";
+ $allow[] = Indent::_(2) . "{";
+ $allow[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " The record has been set. Check the record permissions.";
// check if the item has permissions.
- if ($coreLoad && isset($core['core.edit.state'])
- && isset($this->permissionBuilder[$core['core.edit.state']])
- && ArrayHelper::check(
- $this->permissionBuilder[$core['core.edit.state']]
- )
- && in_array(
- $nameSingleCode,
- $this->permissionBuilder[$core['core.edit.state']]
- ))
- {
- $allow[] = $this->_t(3) . "\$permission = \$user->authorise('"
- . $core['core.edit.state'] . "', 'com_" . $component . "."
- . $nameSingleCode . ".' . (int) \$recordId);";
- }
- else
- {
- $allow[] = $this->_t(3)
- . "\$permission = \$user->authorise('core.edit.state', 'com_"
- . $component . "." . $nameSingleCode
- . ".' . (int) \$recordId);";
- }
- $allow[] = $this->_t(3)
+ $allow[] = Indent::_(3) . "\$permission = \$user->authorise('"
+ . CFactory::_('Compiler.Creator.Permission')->getAction($nameSingleCode, 'core.edit.state')
+ . "', 'com_" . $component . "." . $nameSingleCode . ".' . (int) \$recordId);";
+ $allow[] = Indent::_(3)
. "if (!\$permission && !is_null(\$permission))";
- $allow[] = $this->_t(3) . "{";
- $allow[] = $this->_t(4) . "return false;";
- $allow[] = $this->_t(3) . "}";
- $allow[] = $this->_t(2) . "}";
- if ($coreLoad && isset($core['core.edit.state'])
- && isset($this->permissionBuilder['global'][$core['core.edit.state']])
- && ArrayHelper::check(
- $this->permissionBuilder['global'][$core['core.edit.state']]
- )
- && in_array(
- $nameSingleCode,
- $this->permissionBuilder['global'][$core['core.edit.state']]
- ))
+ $allow[] = Indent::_(3) . "{";
+ $allow[] = Indent::_(4) . "return false;";
+ $allow[] = Indent::_(3) . "}";
+ $allow[] = Indent::_(2) . "}";
+ if (CFactory::_('Compiler.Creator.Permission')->globalExist($nameSingleCode, 'core.edit.state'))
{
- $allow[] = $this->_t(2) . "//" . $this->setLine(__LINE__)
- . " In the absense of better information, revert to the component permissions.";
- $allow[] = $this->_t(2) . "return \$user->authorise('"
- . $core['core.edit.state'] . "', 'com_" . $component
+ $allow[] = Indent::_(2) . "//" . Line::_(__Line__, __Class__)
+ . " In the absence of better information, revert to the component permissions.";
+ $allow[] = Indent::_(2) . "return \$user->authorise('"
+ . CFactory::_('Compiler.Creator.Permission')->getGlobal($nameSingleCode, 'core.edit.state') . "', 'com_" . $component
. "');";
}
else
{
- $allow[] = $this->_t(2) . "//" . $this->setLine(__LINE__)
- . " In the absense of better information, revert to the component permissions.";
- $allow[] = $this->_t(2)
+ $allow[] = Indent::_(2) . "//" . Line::_(__Line__, __Class__)
+ . " In the absence of better information, revert to the component permissions.";
+ $allow[] = Indent::_(2)
. "return parent::canEditState(\$record);";
}
}
@@ -20658,109 +19086,32 @@ class Interpretation extends Fields
{
$allow = array();
// set component name
- $component = $this->componentCodeName;
- // setup correct core target
- $coreLoad = false;
- if (isset($this->permissionCore[$nameSingleCode]))
- {
- $core = $this->permissionCore[$nameSingleCode];
- $coreLoad = true;
- }
+ $component = CFactory::_('Config')->component_code_name;
// check if the item has permissions for edit.
- if ($coreLoad && isset($core['core.edit'])
- && isset($this->permissionBuilder['global'][$core['core.edit']])
- && ArrayHelper::check(
- $this->permissionBuilder['global'][$core['core.edit']]
- )
- && in_array(
- $nameSingleCode,
- $this->permissionBuilder['global'][$core['core.edit']]
- ))
- {
- $allow[] = PHP_EOL . $this->_t(2)
- . "\$this->canEdit = \$this->canDo->get('" . $core['core.edit']
- . "');";
- }
- else
- {
- $allow[] = PHP_EOL . $this->_t(2)
- . "\$this->canEdit = \$this->canDo->get('core.edit');";
- }
+ $allow[] = PHP_EOL . Indent::_(2)
+ . "\$this->canEdit = \$this->canDo->get('"
+ . CFactory::_('Compiler.Creator.Permission')->getGlobal($nameSingleCode, 'core.edit')
+ . "');";
// check if the item has permissions for edit state.
- if ($coreLoad && isset($core['core.edit.state'])
- && isset($this->permissionBuilder['global'][$core['core.edit.state']])
- && ArrayHelper::check(
- $this->permissionBuilder['global'][$core['core.edit.state']]
- )
- && in_array(
- $nameSingleCode,
- $this->permissionBuilder['global'][$core['core.edit.state']]
- ))
- {
- $allow[] = $this->_t(2) . "\$this->canState = \$this->canDo->get('"
- . $core['core.edit.state'] . "');";
- }
- else
- {
- $allow[] = $this->_t(2)
- . "\$this->canState = \$this->canDo->get('core.edit.state');";
- }
+ $allow[] = Indent::_(2) . "\$this->canState = \$this->canDo->get('"
+ . CFactory::_('Compiler.Creator.Permission')->getGlobal($nameSingleCode, 'core.edit.state')
+ . "');";
// check if the item has permissions for create.
- if ($coreLoad && isset($core['core.create'])
- && isset($this->permissionBuilder['global'][$core['core.create']])
- && ArrayHelper::check(
- $this->permissionBuilder['global'][$core['core.create']]
- )
- && in_array(
- $nameSingleCode,
- $this->permissionBuilder['global'][$core['core.create']]
- ))
- {
- $allow[] = $this->_t(2) . "\$this->canCreate = \$this->canDo->get('"
- . $core['core.create'] . "');";
- }
- else
- {
- $allow[] = $this->_t(2)
- . "\$this->canCreate = \$this->canDo->get('core.create');";
- }
+ $allow[] = Indent::_(2) . "\$this->canCreate = \$this->canDo->get('"
+ . CFactory::_('Compiler.Creator.Permission')->getGlobal($nameSingleCode, 'core.create') . "');";
// check if the item has permissions for delete.
- if ($coreLoad && isset($core['core.delete'])
- && isset($this->permissionBuilder['global'][$core['core.delete']])
- && ArrayHelper::check(
- $this->permissionBuilder['global'][$core['core.delete']]
- )
- && in_array(
- $nameSingleCode,
- $this->permissionBuilder['global'][$core['core.delete']]
- ))
- {
- $allow[] = $this->_t(2) . "\$this->canDelete = \$this->canDo->get('"
- . $core['core.delete'] . "');";
- }
- else
- {
- $allow[] = $this->_t(2)
- . "\$this->canDelete = \$this->canDo->get('core.delete');";
- }
+ $allow[] = Indent::_(2) . "\$this->canDelete = \$this->canDo->get('"
+ . CFactory::_('Compiler.Creator.Permission')->getGlobal($nameSingleCode, 'core.delete') . "');";
// check if the item has permissions for batch.
- if ($coreLoad && isset($core['core.batch'])
- && isset($this->permissionBuilder['global']['global'][$core['core.batch']])
- && ArrayHelper::check(
- $this->permissionBuilder['global']['global'][$core['core.batch']]
- )
- && in_array(
- $nameSingleCode,
- $this->permissionBuilder['global']['global'][$core['core.delete']]
- ))
+ if (CFactory::_('Compiler.Creator.Permission')->globalExist($nameSingleCode, 'core.batch'))
{
- $allow[] = $this->_t(2) . "\$this->canBatch = (\$this->canDo->get('"
- . $core['core.batch']
+ $allow[] = Indent::_(2) . "\$this->canBatch = (\$this->canDo->get('"
+ . CFactory::_('Compiler.Creator.Permission')->getGlobal($nameSingleCode, 'core.batch')
. "') && \$this->canDo->get('core.batch'));";
}
else
{
- $allow[] = $this->_t(2)
+ $allow[] = Indent::_(2)
. "\$this->canBatch = \$this->canDo->get('core.batch');";
}
@@ -20773,38 +19124,38 @@ class Interpretation extends Fields
if ($view != 'component')
{
// set component name
- $component = $this->componentCodeName;
+ $component = CFactory::_('Config')->component_code_name;
// set label
$label = 'Permissions in relation to this ' . $view;
// set the access fieldset
- $access = "";
- $access .= PHP_EOL . $this->_t(1)
+ $access .= PHP_EOL . Indent::_(1)
. '';
+ $access .= PHP_EOL . Indent::_(3) . 'section="' . $view . '"';
+ $access .= PHP_EOL . Indent::_(2) . '/>';
+ $access .= PHP_EOL . Indent::_(1) . '';
}
// return access field set
@@ -20824,30 +19175,24 @@ class Interpretation extends Fields
{
// keep track of all fields already added
$donelist = array('id' => true, 'search' => true,
- 'published' => true, 'access' => true,
- 'created_by' => true, 'modified_by' => true);
+ 'published' => true, 'access' => true,
+ 'created_by' => true, 'modified_by' => true);
// default filter fields
$fields = "'a.id','id'";
- $fields .= "," . PHP_EOL . $this->_t(4) . "'a.published','published'";
- if (isset($this->accessBuilder[$nameSingleCode])
- && StringHelper::check(
- $this->accessBuilder[$nameSingleCode]
- ))
+ $fields .= "," . PHP_EOL . Indent::_(4) . "'a.published','published'";
+ if (CFactory::_('Compiler.Builder.Access.Switch')->exists($nameSingleCode))
{
- $fields .= "," . PHP_EOL . $this->_t(4) . "'a.access','access'";
+ $fields .= "," . PHP_EOL . Indent::_(4) . "'a.access','access'";
}
- $fields .= "," . PHP_EOL . $this->_t(4) . "'a.ordering','ordering'";
- $fields .= "," . PHP_EOL . $this->_t(4) . "'a.created_by','created_by'";
- $fields .= "," . PHP_EOL . $this->_t(4)
+ $fields .= "," . PHP_EOL . Indent::_(4) . "'a.ordering','ordering'";
+ $fields .= "," . PHP_EOL . Indent::_(4) . "'a.created_by','created_by'";
+ $fields .= "," . PHP_EOL . Indent::_(4)
. "'a.modified_by','modified_by'";
// add the rest of the set filters
- if (isset($this->filterBuilder[$nameListCode])
- && ArrayHelper::check(
- $this->filterBuilder[$nameListCode]
- ))
+ if (CFactory::_('Compiler.Builder.Filter')->exists($nameListCode))
{
- foreach ($this->filterBuilder[$nameListCode] as $filter)
+ foreach (CFactory::_('Compiler.Builder.Filter')->get($nameListCode) as $filter)
{
if (!isset($donelist[$filter['code']]))
{
@@ -20859,16 +19204,13 @@ class Interpretation extends Fields
}
}
// add the rest of the set filters
- if (isset($this->sortBuilder[$nameListCode])
- && ArrayHelper::check(
- $this->sortBuilder[$nameListCode]
- ))
+ if (CFactory::_('Compiler.Builder.Sort')->exists($nameListCode))
{
- foreach ($this->sortBuilder[$nameListCode] as $filter)
+ foreach (CFactory::_('Compiler.Builder.Sort')->get($nameListCode) as $filter)
{
if (!isset($donelist[$filter['code']]))
{
- $fields .= $this->getFilterFieldCode(
+ $fields .= $this->getFilterFieldCode(
$filter
);
$donelist[$filter['code']] = true;
@@ -20892,13 +19234,13 @@ class Interpretation extends Fields
// add the category stuff (may still remove these) TODO
if ($filter['type'] === 'category')
{
- $field = "," . PHP_EOL . $this->_t(4)
+ $field = "," . PHP_EOL . Indent::_(4)
. "'c.title','category_title'";
- $field .= "," . PHP_EOL . $this->_t(4)
+ $field .= "," . PHP_EOL . Indent::_(4)
. "'c.id', 'category_id'";
if ($filter['code'] != 'category')
{
- $field .= "," . PHP_EOL . $this->_t(4) . "'a."
+ $field .= "," . PHP_EOL . Indent::_(4) . "'a."
. $filter['code'] . "','" . $filter['code']
. "'";
}
@@ -20918,14 +19260,14 @@ class Interpretation extends Fields
$filter['custom']['text']
))
{
- $field = "," . PHP_EOL . $this->_t(4) . "'"
+ $field = "," . PHP_EOL . Indent::_(4) . "'"
. $filter['custom']['db'] . "."
. $filter['custom']['text'] . "','" . $filter['code']
. "'";
}
else
{
- $field = "," . PHP_EOL . $this->_t(4) . "'a."
+ $field = "," . PHP_EOL . Indent::_(4) . "'a."
. $filter['code'] . "','" . $filter['code']
. "'";
}
@@ -20946,35 +19288,31 @@ class Interpretation extends Fields
public function setStoredId(&$nameSingleCode, &$nameListCode)
{
// set component name
- $Component = ucwords($this->componentCodeName);
+ $Component = ucwords((string) CFactory::_('Config')->component_code_name);
// keep track of all fields already added
$donelist = array('id' => true, 'search' => true,
- 'published' => true, 'access' => true,
- 'created_by' => true, 'modified_by' => true);
+ 'published' => true, 'access' => true,
+ 'created_by' => true, 'modified_by' => true);
// set the defaults first
- $stored = "//" . $this->setLine(__LINE__) . " Compile the store id.";
- $stored .= PHP_EOL . $this->_t(2)
+ $stored = "//" . Line::_(__Line__, __Class__) . " Compile the store id.";
+ $stored .= PHP_EOL . Indent::_(2)
. "\$id .= ':' . \$this->getState('filter.id');";
- $stored .= PHP_EOL . $this->_t(2)
+ $stored .= PHP_EOL . Indent::_(2)
. "\$id .= ':' . \$this->getState('filter.search');";
// add this if not already added
- if (!isset($this->fieldsNames[$nameSingleCode]['published']))
+ if (!CFactory::_('Compiler.Builder.Field.Names')->isString($nameSingleCode . '.published'))
{
- $stored .= PHP_EOL . $this->_t(2)
+ $stored .= PHP_EOL . Indent::_(2)
. "\$id .= ':' . \$this->getState('filter.published');";
}
// add if view calls for it, and not already added
- if (isset($this->accessBuilder[$nameSingleCode])
- && StringHelper::check(
- $this->accessBuilder[$nameSingleCode]
- )
- && !isset($this->fieldsNames[$nameSingleCode]['access']))
+ if (CFactory::_('Compiler.Builder.Access.Switch')->exists($nameSingleCode)
+ && !CFactory::_('Compiler.Builder.Field.Names')->isString($nameSingleCode . '.access'))
{
// the side bar option is single
- if (isset($this->adminFilterType[$nameListCode])
- && $this->adminFilterType[$nameListCode] == 1)
+ if (CFactory::_('Compiler.Builder.Admin.Filter.Type')->get($nameListCode, 1) == 1)
{
- $stored .= PHP_EOL . $this->_t(2)
+ $stored .= PHP_EOL . Indent::_(2)
. "\$id .= ':' . \$this->getState('filter.access');";
}
else
@@ -20984,31 +19322,28 @@ class Interpretation extends Fields
$stored .= $this->getStoredIdCodeMulti('access', $Component);
}
}
- $stored .= PHP_EOL . $this->_t(2)
+ $stored .= PHP_EOL . Indent::_(2)
. "\$id .= ':' . \$this->getState('filter.ordering');";
// add this if not already added
- if (!isset($this->fieldsNames[$nameSingleCode]['created_by']))
+ if (!CFactory::_('Compiler.Builder.Field.Names')->isString($nameSingleCode . '.created_by'))
{
- $stored .= PHP_EOL . $this->_t(2)
+ $stored .= PHP_EOL . Indent::_(2)
. "\$id .= ':' . \$this->getState('filter.created_by');";
}
// add this if not already added
- if (!isset($this->fieldsNames[$nameSingleCode]['modified_by']))
+ if (!CFactory::_('Compiler.Builder.Field.Names')->isString($nameSingleCode . '.modified_by'))
{
- $stored .= PHP_EOL . $this->_t(2)
+ $stored .= PHP_EOL . Indent::_(2)
. "\$id .= ':' . \$this->getState('filter.modified_by');";
}
// add the rest of the set filters
- if (isset($this->filterBuilder[$nameListCode])
- && ArrayHelper::check(
- $this->filterBuilder[$nameListCode]
- ))
+ if (CFactory::_('Compiler.Builder.Filter')->exists($nameListCode))
{
- foreach ($this->filterBuilder[$nameListCode] as $filter)
+ foreach (CFactory::_('Compiler.Builder.Filter')->get($nameListCode) as $filter)
{
if (!isset($donelist[$filter['code']]))
{
- $stored .= $this->getStoredIdCode(
+ $stored .= $this->getStoredIdCode(
$filter, $nameListCode, $Component
);
$donelist[$filter['code']] = true;
@@ -21016,16 +19351,13 @@ class Interpretation extends Fields
}
}
// add the rest of the set filters
- if (isset($this->sortBuilder[$nameListCode])
- && ArrayHelper::check(
- $this->sortBuilder[$nameListCode]
- ))
+ if (CFactory::_('Compiler.Builder.Sort')->exists($nameListCode))
{
- foreach ($this->sortBuilder[$nameListCode] as $filter)
+ foreach (CFactory::_('Compiler.Builder.Sort')->get($nameListCode) as $filter)
{
if (!isset($donelist[$filter['code']]))
{
- $stored .= $this->getStoredIdCode(
+ $stored .= $this->getStoredIdCode(
$filter, $nameListCode, $Component
);
$donelist[$filter['code']] = true;
@@ -21051,16 +19383,15 @@ class Interpretation extends Fields
if ($filter['type'] === 'category')
{
// the side bar option is single (1 = sidebar)
- if (isset($this->adminFilterType[$nameListCode])
- && $this->adminFilterType[$nameListCode] == 1)
+ if (CFactory::_('Compiler.Builder.Admin.Filter.Type')->get($nameListCode, 1) == 1)
{
- $stored = PHP_EOL . $this->_t(2)
+ $stored = PHP_EOL . Indent::_(2)
. "\$id .= ':' . \$this->getState('filter.category');";
- $stored .= PHP_EOL . $this->_t(2)
+ $stored .= PHP_EOL . Indent::_(2)
. "\$id .= ':' . \$this->getState('filter.category_id');";
if ($filter['code'] != 'category')
{
- $stored .= PHP_EOL . $this->_t(2)
+ $stored .= PHP_EOL . Indent::_(2)
. "\$id .= ':' . \$this->getState('filter."
. $filter['code'] . "');";
}
@@ -21083,8 +19414,7 @@ class Interpretation extends Fields
{
// check if this is the topbar filter, and multi option (2 = topbar)
if (isset($filter['multi']) && $filter['multi'] == 2
- && isset($this->adminFilterType[$nameListCode])
- && $this->adminFilterType[$nameListCode] == 2)
+ && CFactory::_('Compiler.Builder.Admin.Filter.Type')->get($nameListCode, 1) == 2)
{
// top bar selection can result in
// an array due to multi selection
@@ -21094,7 +19424,7 @@ class Interpretation extends Fields
}
else
{
- $stored = PHP_EOL . $this->_t(2)
+ $stored = PHP_EOL . Indent::_(2)
. "\$id .= ':' . \$this->getState('filter."
. $filter['code'] . "');";
}
@@ -21116,33 +19446,33 @@ class Interpretation extends Fields
{
// top bar selection can result in
// an array due to multi selection
- $stored = PHP_EOL . $this->_t(2)
- . "//" . $this->setLine(__LINE__)
+ $stored = PHP_EOL . Indent::_(2)
+ . "//" . Line::_(__Line__, __Class__)
. " Check if the value is an array";
- $stored .= PHP_EOL . $this->_t(2)
+ $stored .= PHP_EOL . Indent::_(2)
. "\$_" . $key . " = \$this->getState('filter."
. $key . "');";
- $stored .= PHP_EOL . $this->_t(2)
+ $stored .= PHP_EOL . Indent::_(2)
. "if (" . $Component . "Helper::checkArray(\$_"
. $key . "))";
- $stored .= PHP_EOL . $this->_t(2)
+ $stored .= PHP_EOL . Indent::_(2)
. "{";
- $stored .= PHP_EOL . $this->_t(3)
+ $stored .= PHP_EOL . Indent::_(3)
. "\$id .= ':' . implode(':', \$_" . $key . ");";
- $stored .= PHP_EOL . $this->_t(2)
+ $stored .= PHP_EOL . Indent::_(2)
. "}";
- $stored .= PHP_EOL . $this->_t(2)
- . "//" . $this->setLine(__LINE__)
+ $stored .= PHP_EOL . Indent::_(2)
+ . "//" . Line::_(__Line__, __Class__)
. " Check if this is only an number or string";
- $stored .= PHP_EOL . $this->_t(2)
+ $stored .= PHP_EOL . Indent::_(2)
. "elseif (is_numeric(\$_" . $key . ")";
- $stored .= PHP_EOL . $this->_t(2)
+ $stored .= PHP_EOL . Indent::_(2)
. " || " . $Component . "Helper::checkString(\$_" . $key . "))";
- $stored .= PHP_EOL . $this->_t(2)
+ $stored .= PHP_EOL . Indent::_(2)
. "{";
- $stored .= PHP_EOL . $this->_t(3)
+ $stored .= PHP_EOL . Indent::_(3)
. "\$id .= ':' . \$_" . $key . ";";
- $stored .= PHP_EOL . $this->_t(2)
+ $stored .= PHP_EOL . Indent::_(2)
. "}";
return $stored;
@@ -21152,13 +19482,6 @@ class Interpretation extends Fields
{
// set view name
$nameSingleCode = $view['settings']->name_single_code;
- // setup correct core target
- $coreLoad = false;
- if (isset($this->permissionCore[$nameSingleCode]))
- {
- $core = $this->permissionCore[$nameSingleCode];
- $coreLoad = true;
- }
// check type
if ($view['settings']->type == 2)
{
@@ -21168,18 +19491,18 @@ class Interpretation extends Fields
$view['settings']->name_single . ' readonly', 'U'
);
// load to lang
- $this->setLangContent(
- $this->lang, $viewNameLang_readonly,
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $viewNameLang_readonly,
$view['settings']->name_single . ' :: Readonly'
);
// build toolbar
$toolBar
- = "JFactory::getApplication()->input->set('hidemainmenu', true);";
- $toolBar .= PHP_EOL . $this->_t(2) . "JToolBarHelper::title(JText:"
+ = "JFactory::getApplication()->input->set('hidemainmenu', true);";
+ $toolBar .= PHP_EOL . Indent::_(2) . "JToolBarHelper::title(JText:"
. ":_('" . $viewNameLang_readonly . "'), '" . $nameSingleCode
. "');";
- $toolBar .= PHP_EOL . $this->_t(2) . "JToolBarHelper::cancel('"
+ $toolBar .= PHP_EOL . Indent::_(2) . "JToolBarHelper::cancel('"
. $nameSingleCode . ".cancel', 'JTOOLBAR_CLOSE');";
}
else
@@ -21194,279 +19517,169 @@ class Interpretation extends Fields
$view['settings']->name_single . ' Edit', 'U'
);
// load to lang
- $this->setLangContent(
- $this->lang, $viewNameLang_new,
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $viewNameLang_new,
'A New ' . $view['settings']->name_single
);
- $this->setLangContent(
- $this->lang, $viewNameLang_edit,
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $viewNameLang_edit,
'Editing the ' . $view['settings']->name_single
);
// build toolbar
$toolBar
- = "JFactory::getApplication()->input->set('hidemainmenu', true);";
- $toolBar .= PHP_EOL . $this->_t(2)
+ = "JFactory::getApplication()->input->set('hidemainmenu', true);";
+ $toolBar .= PHP_EOL . Indent::_(2)
. "\$user = JFactory::getUser();";
- $toolBar .= PHP_EOL . $this->_t(2) . "\$userId = \$user->id;";
- $toolBar .= PHP_EOL . $this->_t(2)
+ $toolBar .= PHP_EOL . Indent::_(2) . "\$userId = \$user->id;";
+ $toolBar .= PHP_EOL . Indent::_(2)
. "\$isNew = \$this->item->id == 0;";
- $toolBar .= PHP_EOL . PHP_EOL . $this->_t(2)
+ $toolBar .= PHP_EOL . PHP_EOL . Indent::_(2)
. "JToolbarHelper::title( JText:" . ":_(\$isNew ? '"
. $viewNameLang_new . "' : '" . $viewNameLang_edit
. "'), 'pencil-2 article-add');";
- $toolBar .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $toolBar .= PHP_EOL . Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " Built the actions for new and existing records.";
- $toolBar .= PHP_EOL . $this->_t(2) . "if ("
- . $this->fileContentStatic[$this->hhh . 'Component'
- . $this->hhh] . "Helper::checkString(\$this->referral))";
- $toolBar .= PHP_EOL . $this->_t(2) . "{";
- if ($coreLoad && isset($core['core.create'])
- && isset($this->permissionBuilder['global'][$core['core.create']])
- && ArrayHelper::check(
- $this->permissionBuilder['global'][$core['core.create']]
- )
- && in_array(
- $nameSingleCode,
- $this->permissionBuilder['global'][$core['core.create']]
- ))
- {
- $toolBar .= PHP_EOL . $this->_t(3) . "if (\$this->canDo->get('"
- . $core['core.create'] . "') && \$isNew)";
- }
- else
- {
- $toolBar .= PHP_EOL . $this->_t(3)
- . "if (\$this->canDo->get('core.create') && \$isNew)";
- }
- $toolBar .= PHP_EOL . $this->_t(3) . "{";
- $toolBar .= PHP_EOL . $this->_t(4) . "//" . $this->setLine(__LINE__)
+ $toolBar .= PHP_EOL . Indent::_(2) . "if ("
+ . CFactory::_('Compiler.Builder.Content.One')->get('Component') . "Helper::checkString(\$this->referral))";
+ $toolBar .= PHP_EOL . Indent::_(2) . "{";
+ $toolBar .= PHP_EOL . Indent::_(3) . "if (\$this->canDo->get('"
+ . CFactory::_('Compiler.Creator.Permission')->getGlobal($nameSingleCode, 'core.create') . "') && \$isNew)";
+ $toolBar .= PHP_EOL . Indent::_(3) . "{";
+ $toolBar .= PHP_EOL . Indent::_(4) . "//" . Line::_(__Line__, __Class__)
. " We can create the record.";
- $toolBar .= PHP_EOL . $this->_t(4) . "JToolBarHelper::save('"
+ $toolBar .= PHP_EOL . Indent::_(4) . "JToolBarHelper::save('"
. $nameSingleCode . ".save', 'JTOOLBAR_SAVE');";
- $toolBar .= PHP_EOL . $this->_t(3) . "}";
- if ($coreLoad && isset($core['core.edit'])
- && isset($this->permissionBuilder['global'][$core['core.edit']])
- && ArrayHelper::check(
- $this->permissionBuilder['global'][$core['core.edit']]
- )
- && in_array(
- $nameSingleCode,
- $this->permissionBuilder['global'][$core['core.edit']]
- ))
- {
- $toolBar .= PHP_EOL . $this->_t(3)
- . "elseif (\$this->canDo->get('" . $core['core.edit']
- . "'))";
- }
- else
- {
- $toolBar .= PHP_EOL . $this->_t(3)
- . "elseif (\$this->canDo->get('core.edit'))";
- }
- $toolBar .= PHP_EOL . $this->_t(3) . "{";
- $toolBar .= PHP_EOL . $this->_t(4) . "//" . $this->setLine(__LINE__)
+ $toolBar .= PHP_EOL . Indent::_(3) . "}";
+ $toolBar .= PHP_EOL . Indent::_(3)
+ . "elseif (\$this->canDo->get('"
+ . CFactory::_('Compiler.Creator.Permission')->getGlobal($nameSingleCode, 'core.edit')
+ . "'))";
+ $toolBar .= PHP_EOL . Indent::_(3) . "{";
+ $toolBar .= PHP_EOL . Indent::_(4) . "//" . Line::_(__Line__, __Class__)
. " We can save the record.";
- $toolBar .= PHP_EOL . $this->_t(4) . "JToolBarHelper::save('"
+ $toolBar .= PHP_EOL . Indent::_(4) . "JToolBarHelper::save('"
. $nameSingleCode . ".save', 'JTOOLBAR_SAVE');";
- $toolBar .= PHP_EOL . $this->_t(3) . "}";
- $toolBar .= PHP_EOL . $this->_t(3) . "if (\$isNew)";
- $toolBar .= PHP_EOL . $this->_t(3) . "{";
- $toolBar .= PHP_EOL . $this->_t(4) . "//" . $this->setLine(__LINE__)
+ $toolBar .= PHP_EOL . Indent::_(3) . "}";
+ $toolBar .= PHP_EOL . Indent::_(3) . "if (\$isNew)";
+ $toolBar .= PHP_EOL . Indent::_(3) . "{";
+ $toolBar .= PHP_EOL . Indent::_(4) . "//" . Line::_(__Line__, __Class__)
. " Do not creat but cancel.";
- $toolBar .= PHP_EOL . $this->_t(4) . "JToolBarHelper::cancel('"
+ $toolBar .= PHP_EOL . Indent::_(4) . "JToolBarHelper::cancel('"
. $nameSingleCode . ".cancel', 'JTOOLBAR_CANCEL');";
- $toolBar .= PHP_EOL . $this->_t(3) . "}";
- $toolBar .= PHP_EOL . $this->_t(3) . "else";
- $toolBar .= PHP_EOL . $this->_t(3) . "{";
- $toolBar .= PHP_EOL . $this->_t(4) . "//" . $this->setLine(__LINE__)
+ $toolBar .= PHP_EOL . Indent::_(3) . "}";
+ $toolBar .= PHP_EOL . Indent::_(3) . "else";
+ $toolBar .= PHP_EOL . Indent::_(3) . "{";
+ $toolBar .= PHP_EOL . Indent::_(4) . "//" . Line::_(__Line__, __Class__)
. " We can close it.";
- $toolBar .= PHP_EOL . $this->_t(4) . "JToolBarHelper::cancel('"
+ $toolBar .= PHP_EOL . Indent::_(4) . "JToolBarHelper::cancel('"
. $nameSingleCode . ".cancel', 'JTOOLBAR_CLOSE');";
- $toolBar .= PHP_EOL . $this->_t(3) . "}";
- $toolBar .= PHP_EOL . $this->_t(2) . "}";
- $toolBar .= PHP_EOL . $this->_t(2) . "else";
- $toolBar .= PHP_EOL . $this->_t(2) . "{";
- $toolBar .= PHP_EOL . $this->_t(3) . "if (\$isNew)";
- $toolBar .= PHP_EOL . $this->_t(3) . "{";
- $toolBar .= PHP_EOL . $this->_t(4) . "//" . $this->setLine(__LINE__)
+ $toolBar .= PHP_EOL . Indent::_(3) . "}";
+ $toolBar .= PHP_EOL . Indent::_(2) . "}";
+ $toolBar .= PHP_EOL . Indent::_(2) . "else";
+ $toolBar .= PHP_EOL . Indent::_(2) . "{";
+ $toolBar .= PHP_EOL . Indent::_(3) . "if (\$isNew)";
+ $toolBar .= PHP_EOL . Indent::_(3) . "{";
+ $toolBar .= PHP_EOL . Indent::_(4) . "//" . Line::_(__Line__, __Class__)
. " For new records, check the create permission.";
- if ($coreLoad && isset($core['core.create'])
- && isset($this->permissionBuilder['global'][$core['core.create']])
- && ArrayHelper::check(
- $this->permissionBuilder['global'][$core['core.create']]
- )
- && in_array(
- $nameSingleCode,
- $this->permissionBuilder['global'][$core['core.create']]
- ))
- {
- $toolBar .= PHP_EOL . $this->_t(4) . "if (\$this->canDo->get('"
- . $core['core.create'] . "'))";
- }
- else
- {
- $toolBar .= PHP_EOL . $this->_t(4)
- . "if (\$this->canDo->get('core.create'))";
- }
- $toolBar .= PHP_EOL . $this->_t(4) . "{";
- $toolBar .= PHP_EOL . $this->_t(5) . "JToolBarHelper::apply('"
+ $toolBar .= PHP_EOL . Indent::_(4) . "if (\$this->canDo->get('"
+ . CFactory::_('Compiler.Creator.Permission')->getGlobal($nameSingleCode, 'core.create') . "'))";
+ $toolBar .= PHP_EOL . Indent::_(4) . "{";
+ $toolBar .= PHP_EOL . Indent::_(5) . "JToolBarHelper::apply('"
. $nameSingleCode . ".apply', 'JTOOLBAR_APPLY');";
- $toolBar .= PHP_EOL . $this->_t(5) . "JToolBarHelper::save('"
+ $toolBar .= PHP_EOL . Indent::_(5) . "JToolBarHelper::save('"
. $nameSingleCode . ".save', 'JTOOLBAR_SAVE');";
- $toolBar .= PHP_EOL . $this->_t(5) . "JToolBarHelper::custom('"
+ $toolBar .= PHP_EOL . Indent::_(5) . "JToolBarHelper::custom('"
. $nameSingleCode
. ".save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);";
- $toolBar .= PHP_EOL . $this->_t(4) . "};";
- $toolBar .= PHP_EOL . $this->_t(4) . "JToolBarHelper::cancel('"
+ $toolBar .= PHP_EOL . Indent::_(4) . "};";
+ $toolBar .= PHP_EOL . Indent::_(4) . "JToolBarHelper::cancel('"
. $nameSingleCode . ".cancel', 'JTOOLBAR_CANCEL');";
- $toolBar .= PHP_EOL . $this->_t(3) . "}";
- $toolBar .= PHP_EOL . $this->_t(3) . "else";
- $toolBar .= PHP_EOL . $this->_t(3) . "{";
- if ($coreLoad && isset($core['core.edit'])
- && isset($this->permissionBuilder['global'][$core['core.edit']])
- && ArrayHelper::check(
- $this->permissionBuilder['global'][$core['core.edit']]
- )
- && in_array(
- $nameSingleCode,
- $this->permissionBuilder['global'][$core['core.edit']]
- ))
- {
- $toolBar .= PHP_EOL . $this->_t(4) . "if (\$this->canDo->get('"
- . $core['core.edit'] . "'))";
- }
- else
- {
- $toolBar .= PHP_EOL . $this->_t(4)
- . "if (\$this->canDo->get('core.edit'))";
- }
- $toolBar .= PHP_EOL . $this->_t(4) . "{";
- $toolBar .= PHP_EOL . $this->_t(5) . "//" . $this->setLine(__LINE__)
+ $toolBar .= PHP_EOL . Indent::_(3) . "}";
+ $toolBar .= PHP_EOL . Indent::_(3) . "else";
+ $toolBar .= PHP_EOL . Indent::_(3) . "{";
+ $toolBar .= PHP_EOL . Indent::_(4) . "if (\$this->canDo->get('"
+ . CFactory::_('Compiler.Creator.Permission')->getGlobal($nameSingleCode, 'core.edit') . "'))";
+ $toolBar .= PHP_EOL . Indent::_(4) . "{";
+ $toolBar .= PHP_EOL . Indent::_(5) . "//" . Line::_(__Line__, __Class__)
. " We can save the new record";
- $toolBar .= PHP_EOL . $this->_t(5) . "JToolBarHelper::apply('"
+ $toolBar .= PHP_EOL . Indent::_(5) . "JToolBarHelper::apply('"
. $nameSingleCode . ".apply', 'JTOOLBAR_APPLY');";
- $toolBar .= PHP_EOL . $this->_t(5) . "JToolBarHelper::save('"
+ $toolBar .= PHP_EOL . Indent::_(5) . "JToolBarHelper::save('"
. $nameSingleCode . ".save', 'JTOOLBAR_SAVE');";
- $toolBar .= PHP_EOL . $this->_t(5) . "//" . $this->setLine(__LINE__)
+ $toolBar .= PHP_EOL . Indent::_(5) . "//" . Line::_(__Line__, __Class__)
. " We can save this record, but check the create permission to see";
- $toolBar .= PHP_EOL . $this->_t(5) . "//" . $this->setLine(__LINE__)
+ $toolBar .= PHP_EOL . Indent::_(5) . "//" . Line::_(__Line__, __Class__)
. " if we can return to make a new one.";
- if ($coreLoad && isset($core['core.create'])
- && isset($this->permissionBuilder['global'][$core['core.create']])
- && ArrayHelper::check(
- $this->permissionBuilder['global'][$core['core.create']]
- )
- && in_array(
- $nameSingleCode,
- $this->permissionBuilder['global'][$core['core.create']]
- ))
- {
- $toolBar .= PHP_EOL . $this->_t(5) . "if (\$this->canDo->get('"
- . $core['core.create'] . "'))";
- }
- else
- {
- $toolBar .= PHP_EOL . $this->_t(5)
- . "if (\$this->canDo->get('core.create'))";
- }
- $toolBar .= PHP_EOL . $this->_t(5) . "{";
- $toolBar .= PHP_EOL . $this->_t(6) . "JToolBarHelper::custom('"
+ $toolBar .= PHP_EOL . Indent::_(5) . "if (\$this->canDo->get('"
+ . CFactory::_('Compiler.Creator.Permission')->getGlobal($nameSingleCode, 'core.create') . "'))";
+ $toolBar .= PHP_EOL . Indent::_(5) . "{";
+ $toolBar .= PHP_EOL . Indent::_(6) . "JToolBarHelper::custom('"
. $nameSingleCode
. ".save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);";
- $toolBar .= PHP_EOL . $this->_t(5) . "}";
- $toolBar .= PHP_EOL . $this->_t(4) . "}";
- if ($coreLoad && isset($core['core.edit'])
- && isset($this->permissionBuilder['global'][$core['core.edit']])
- && ArrayHelper::check(
- $this->permissionBuilder['global'][$core['core.edit']]
- )
- && in_array(
- $nameSingleCode,
- $this->permissionBuilder['global'][$core['core.edit']]
- ))
+ $toolBar .= PHP_EOL . Indent::_(5) . "}";
+ $toolBar .= PHP_EOL . Indent::_(4) . "}";
+ if (CFactory::_('Compiler.Creator.Permission')->globalExist($nameSingleCode, 'core.edit'))
{
- if ($coreLoad && isset($this->historyBuilder[$nameSingleCode])
- && StringHelper::check(
- $this->historyBuilder[$nameSingleCode]
- ))
+ if (CFactory::_('Compiler.Builder.History')->exists($nameSingleCode))
{
- $toolBar .= PHP_EOL . $this->_t(4)
+ $toolBar .= PHP_EOL . Indent::_(4)
. "\$canVersion = (\$this->canDo->get('core.version') && \$this->canDo->get('"
- . $core['core.version'] . "'));";
- $toolBar .= PHP_EOL . $this->_t(4)
+ . CFactory::_('Compiler.Creator.Permission')->getGlobal($nameSingleCode, 'core.version')
+ . "'));";
+ $toolBar .= PHP_EOL . Indent::_(4)
. "if (\$this->state->params->get('save_history', 1) && \$this->canDo->get('"
- . $core['core.edit'] . "') && \$canVersion)";
- $toolBar .= PHP_EOL . $this->_t(4) . "{";
- $toolBar .= PHP_EOL . $this->_t(5)
+ . CFactory::_('Compiler.Creator.Permission')->getGlobal($nameSingleCode, 'core.edit')
+ . "') && \$canVersion)";
+ $toolBar .= PHP_EOL . Indent::_(4) . "{";
+ $toolBar .= PHP_EOL . Indent::_(5)
. "JToolbarHelper::versions('com_"
- . $this->componentCodeName . "." . $nameSingleCode
+ . CFactory::_('Config')->component_code_name . "." . $nameSingleCode
. "', \$this->item->id);";
- $toolBar .= PHP_EOL . $this->_t(4) . "}";
+ $toolBar .= PHP_EOL . Indent::_(4) . "}";
}
}
else
{
- if ($coreLoad && isset($this->historyBuilder[$nameSingleCode])
- && StringHelper::check(
- $this->historyBuilder[$nameSingleCode]
- ))
+ if (CFactory::_('Compiler.Builder.History')->exists($nameSingleCode))
{
- $toolBar .= PHP_EOL . $this->_t(4)
+ $toolBar .= PHP_EOL . Indent::_(4)
. "\$canVersion = (\$this->canDo->get('core.version') && \$this->canDo->get('"
- . $core['core.version'] . "'));";
- $toolBar .= PHP_EOL . $this->_t(4)
+ . CFactory::_('Compiler.Creator.Permission')->getGlobal($nameSingleCode, 'core.version') . "'));";
+ $toolBar .= PHP_EOL . Indent::_(4)
. "if (\$this->state->params->get('save_history', 1) && \$this->canDo->get('core.edit') && \$canVersion)";
- $toolBar .= PHP_EOL . $this->_t(4) . "{";
- $toolBar .= PHP_EOL . $this->_t(5)
+ $toolBar .= PHP_EOL . Indent::_(4) . "{";
+ $toolBar .= PHP_EOL . Indent::_(5)
. "JToolbarHelper::versions('com_"
- . $this->componentCodeName . "." . $nameSingleCode
+ . CFactory::_('Config')->component_code_name . "." . $nameSingleCode
. "', \$this->item->id);";
- $toolBar .= PHP_EOL . $this->_t(4) . "}";
+ $toolBar .= PHP_EOL . Indent::_(4) . "}";
}
}
- if ($coreLoad && isset($core['core.create'])
- && isset($this->permissionBuilder['global'][$core['core.create']])
- && ArrayHelper::check(
- $this->permissionBuilder['global'][$core['core.create']]
- )
- && in_array(
- $nameSingleCode,
- $this->permissionBuilder['global'][$core['core.create']]
- ))
- {
- $toolBar .= PHP_EOL . $this->_t(4) . "if (\$this->canDo->get('"
- . $core['core.create'] . "'))";
- }
- else
- {
- $toolBar .= PHP_EOL . $this->_t(4)
- . "if (\$this->canDo->get('core.create'))";
- }
- $toolBar .= PHP_EOL . $this->_t(4) . "{";
- $toolBar .= PHP_EOL . $this->_t(5) . "JToolBarHelper::custom('"
+ $toolBar .= PHP_EOL . Indent::_(4) . "if (\$this->canDo->get('"
+ . CFactory::_('Compiler.Creator.Permission')->getGlobal($nameSingleCode, 'core.create') . "'))";
+ $toolBar .= PHP_EOL . Indent::_(4) . "{";
+ $toolBar .= PHP_EOL . Indent::_(5) . "JToolBarHelper::custom('"
. $nameSingleCode
. ".save2copy', 'save-copy.png', 'save-copy_f2.png', 'JTOOLBAR_SAVE_AS_COPY', false);";
- $toolBar .= PHP_EOL . $this->_t(4) . "}";
+ $toolBar .= PHP_EOL . Indent::_(4) . "}";
// add custom buttons
- $toolBar .= $this->setCustomButtons($view, 2, $this->_t(2));
- $toolBar .= PHP_EOL . $this->_t(4) . "JToolBarHelper::cancel('"
+ $toolBar .= $this->setCustomButtons($view, 2, Indent::_(2));
+ $toolBar .= PHP_EOL . Indent::_(4) . "JToolBarHelper::cancel('"
. $nameSingleCode . ".cancel', 'JTOOLBAR_CLOSE');";
- $toolBar .= PHP_EOL . $this->_t(3) . "}";
- $toolBar .= PHP_EOL . $this->_t(2) . "}";
- $toolBar .= PHP_EOL . $this->_t(2) . "JToolbarHelper::divider();";
- $toolBar .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $toolBar .= PHP_EOL . Indent::_(3) . "}";
+ $toolBar .= PHP_EOL . Indent::_(2) . "}";
+ $toolBar .= PHP_EOL . Indent::_(2) . "JToolbarHelper::divider();";
+ $toolBar .= PHP_EOL . Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " set help url for this view if found";
- $toolBar .= PHP_EOL . $this->_t(2) . "\$this->help_url = "
- . $this->fileContentStatic[$this->hhh . 'Component'
- . $this->hhh] . "Helper::getHelpUrl('" . $nameSingleCode
+ $toolBar .= PHP_EOL . Indent::_(2) . "\$this->help_url = "
+ . CFactory::_('Compiler.Builder.Content.One')->get('Component') . "Helper::getHelpUrl('" . $nameSingleCode
. "');";
- $toolBar .= PHP_EOL . $this->_t(2) . "if ("
- . $this->fileContentStatic[$this->hhh . 'Component'
- . $this->hhh] . "Helper::checkString(\$this->help_url))";
- $toolBar .= PHP_EOL . $this->_t(2) . "{";
- $toolBar .= PHP_EOL . $this->_t(3) . "JToolbarHelper::help('"
+ $toolBar .= PHP_EOL . Indent::_(2) . "if ("
+ . CFactory::_('Compiler.Builder.Content.One')->get('Component') . "Helper::checkString(\$this->help_url))";
+ $toolBar .= PHP_EOL . Indent::_(2) . "{";
+ $toolBar .= PHP_EOL . Indent::_(3) . "JToolbarHelper::help('"
. $this->langPrefix . "_HELP_MANAGER', false, \$this->help_url);";
- $toolBar .= PHP_EOL . $this->_t(2) . "}";
+ $toolBar .= PHP_EOL . Indent::_(2) . "}";
}
return $toolBar;
@@ -21489,24 +19702,20 @@ class Interpretation extends Fields
$donelist = array();
// we must add the formSubmited code if new above filters is used (2 = topbar)
$new_filter = false;
- if (isset($this->adminFilterType[$nameListCode])
- && $this->adminFilterType[$nameListCode] == 2)
+ if (CFactory::_('Compiler.Builder.Admin.Filter.Type')->get($nameListCode, 1) == 2)
{
- $state .= PHP_EOL . PHP_EOL . $this->_t(2) . "//"
- . $this->setLine(__LINE__) . " Check if the form was submitted";
- $state .= PHP_EOL . $this->_t(2) . "\$formSubmited"
+ $state .= PHP_EOL . PHP_EOL . Indent::_(2) . "//"
+ . Line::_(__Line__, __Class__) . " Check if the form was submitted";
+ $state .= PHP_EOL . Indent::_(2) . "\$formSubmited"
. " = \$app->input->post->get('form_submited');";
$new_filter = true;
}
// add the default populate states (this must be added first)
$state .= $this->setDefaultPopulateState($nameSingleCode, $new_filter);
// add the filters
- if (isset($this->filterBuilder[$nameListCode])
- && ArrayHelper::check(
- $this->filterBuilder[$nameListCode]
- ))
+ if (CFactory::_('Compiler.Builder.Filter')->exists($nameListCode))
{
- foreach ($this->filterBuilder[$nameListCode] as $filter)
+ foreach (CFactory::_('Compiler.Builder.Filter')->get($nameListCode) as $filter)
{
if (!isset($donelist[$filter['code']]))
{
@@ -21518,16 +19727,13 @@ class Interpretation extends Fields
}
}
// add the rest of the set filters
- if (isset($this->sortBuilder[$nameListCode])
- && ArrayHelper::check(
- $this->sortBuilder[$nameListCode]
- ))
+ if (CFactory::_('Compiler.Builder.Sort')->exists($nameListCode))
{
- foreach ($this->sortBuilder[$nameListCode] as $filter)
+ foreach (CFactory::_('Compiler.Builder.Sort')->get($nameListCode) as $filter)
{
if (!isset($donelist[$filter['code']]))
{
- $state .= $this->getPopulateStateFilterCode(
+ $state .= $this->getPopulateStateFilterCode(
$filter, $new_filter
);
$donelist[$filter['code']] = true;
@@ -21556,37 +19762,37 @@ class Interpretation extends Fields
// add category stuff (may still remove these) TODO
if (isset($filter['type']) && $filter['type'] === 'category')
{
- $state .= PHP_EOL . PHP_EOL . $this->_t(2)
+ $state .= PHP_EOL . PHP_EOL . Indent::_(2)
. "\$category = \$app->getUserStateFromRequest(\$this->context . '.filter.category', 'filter_category');";
- $state .= PHP_EOL . $this->_t(2)
+ $state .= PHP_EOL . Indent::_(2)
. "\$this->setState('filter.category', \$category);";
- $state .= PHP_EOL . PHP_EOL . $this->_t(2)
+ $state .= PHP_EOL . PHP_EOL . Indent::_(2)
. "\$categoryId = \$this->getUserStateFromRequest(\$this->context . '.filter.category_id', 'filter_category_id');";
- $state .= PHP_EOL . $this->_t(2)
+ $state .= PHP_EOL . Indent::_(2)
. "\$this->setState('filter.category_id', \$categoryId);";
}
// always add the default filter
- $state .= PHP_EOL . PHP_EOL . $this->_t(2) . "\$" . $filter['code']
+ $state .= PHP_EOL . PHP_EOL . Indent::_(2) . "\$" . $filter['code']
. " = \$this->getUserStateFromRequest(\$this->context . '.filter."
. $filter['code'] . "', 'filter_" . $filter['code']
. "'" . $extra . ");";
if ($newFilter)
{
// add the new filter option
- $state .= PHP_EOL . $this->_t(2)
+ $state .= PHP_EOL . Indent::_(2)
. "if (\$formSubmited)";
- $state .= PHP_EOL . $this->_t(2) . "{";
- $state .= PHP_EOL . $this->_t(3) . "\$" . $filter['code']
+ $state .= PHP_EOL . Indent::_(2) . "{";
+ $state .= PHP_EOL . Indent::_(3) . "\$" . $filter['code']
. " = \$app->input->post->get('" . $filter['code'] . "');";
- $state .= PHP_EOL . $this->_t(3)
+ $state .= PHP_EOL . Indent::_(3)
. "\$this->setState('filter." . $filter['code']
. "', \$" . $filter['code'] . ");";
- $state .= PHP_EOL . $this->_t(2) . "}";
+ $state .= PHP_EOL . Indent::_(2) . "}";
}
else
{
// the old filter option
- $state .= PHP_EOL . $this->_t(2)
+ $state .= PHP_EOL . Indent::_(2)
. "\$this->setState('filter." . $filter['code']
. "', \$" . $filter['code'] . ");";
}
@@ -21609,7 +19815,7 @@ class Interpretation extends Fields
// start filter
$filter = array('type' => 'text');
// if access is not set add its default filter here
- if (!isset($this->fieldsNames[$nameSingleCode]['access']))
+ if (!CFactory::_('Compiler.Builder.Field.Names')->isString($nameSingleCode . '.access'))
{
$filter['code'] = "access";
$state .= $this->getPopulateStateFilterCode(
@@ -21617,7 +19823,7 @@ class Interpretation extends Fields
);
}
// if published is not set add its default filter here
- if (!isset($this->fieldsNames[$nameSingleCode]['published']))
+ if (!CFactory::_('Compiler.Builder.Field.Names')->isString($nameSingleCode . '.published'))
{
$filter['code'] = "published";
$state .= $this->getPopulateStateFilterCode(
@@ -21625,7 +19831,7 @@ class Interpretation extends Fields
);
}
// if created_by is not set add its default filter here
- if (!isset($this->fieldsNames[$nameSingleCode]['created_by']))
+ if (!CFactory::_('Compiler.Builder.Field.Names')->isString($nameSingleCode . '.created_by'))
{
$filter['code'] = "created_by";
$state .= $this->getPopulateStateFilterCode(
@@ -21633,7 +19839,7 @@ class Interpretation extends Fields
);
}
// if created is not set add its default filter here
- if (!isset($this->fieldsNames[$nameSingleCode]['created']))
+ if (!CFactory::_('Compiler.Builder.Field.Names')->isString($nameSingleCode . '.created'))
{
$filter['code'] = "created";
$state .= $this->getPopulateStateFilterCode(
@@ -21667,24 +19873,21 @@ class Interpretation extends Fields
$donelist = array('ordering', 'published');
// set the default first
$fields = "return array(";
- $fields .= PHP_EOL . $this->_t(3) . "'a.ordering' => JText:"
+ $fields .= PHP_EOL . Indent::_(3) . "'a.ordering' => JText:"
. ":_('JGRID_HEADING_ORDERING')";
- $fields .= "," . PHP_EOL . $this->_t(3) . "'a.published' => JText:"
+ $fields .= "," . PHP_EOL . Indent::_(3) . "'a.published' => JText:"
. ":_('JSTATUS')";
// add the rest of the set filters
- if (isset($this->sortBuilder[$nameListCode])
- && ArrayHelper::check(
- $this->sortBuilder[$nameListCode]
- ))
+ if (CFactory::_('Compiler.Builder.Sort')->exists($nameListCode))
{
- foreach ($this->sortBuilder[$nameListCode] as $filter)
+ foreach (CFactory::_('Compiler.Builder.Sort')->get($nameListCode) as $filter)
{
if (!in_array($filter['code'], $donelist))
{
if ($filter['type'] === 'category')
{
- $fields .= "," . PHP_EOL . $this->_t(3)
+ $fields .= "," . PHP_EOL . Indent::_(3)
. "'category_title' => JText:" . ":_('"
. $filter['lang'] . "')";
}
@@ -21692,23 +19895,23 @@ class Interpretation extends Fields
$filter['custom']
))
{
- $fields .= "," . PHP_EOL . $this->_t(3) . "'"
+ $fields .= "," . PHP_EOL . Indent::_(3) . "'"
. $filter['custom']['db'] . "."
. $filter['custom']['text'] . "' => JText:" . ":_('"
. $filter['lang'] . "')";
}
else
{
- $fields .= "," . PHP_EOL . $this->_t(3) . "'a."
+ $fields .= "," . PHP_EOL . Indent::_(3) . "'a."
. $filter['code'] . "' => JText:" . ":_('"
. $filter['lang'] . "')";
}
}
}
}
- $fields .= "," . PHP_EOL . $this->_t(3) . "'a.id' => JText:"
+ $fields .= "," . PHP_EOL . Indent::_(3) . "'a.id' => JText:"
. ":_('JGRID_HEADING_ID')";
- $fields .= PHP_EOL . $this->_t(2) . ");";
+ $fields .= PHP_EOL . Indent::_(2) . ");";
// return fields
return $fields;
@@ -21716,198 +19919,178 @@ class Interpretation extends Fields
public function setCheckinCall()
{
- $call = PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $call = PHP_EOL . Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " Check in items";
- $call .= PHP_EOL . $this->_t(2) . "\$this->checkInNow();" . PHP_EOL;
+ $call .= PHP_EOL . Indent::_(2) . "\$this->checkInNow();" . PHP_EOL;
return $call;
}
public function setAutoCheckin($view, $component)
{
- $checkin = PHP_EOL . PHP_EOL . $this->_t(1) . "/**";
- $checkin .= PHP_EOL . $this->_t(1)
+ $checkin = PHP_EOL . PHP_EOL . Indent::_(1) . "/**";
+ $checkin .= PHP_EOL . Indent::_(1)
. " * Build an SQL query to checkin all items left checked out longer then a set time.";
- $checkin .= PHP_EOL . $this->_t(1) . " *";
- $checkin .= PHP_EOL . $this->_t(1) . " * @return a bool";
- $checkin .= PHP_EOL . $this->_t(1) . " *";
- $checkin .= PHP_EOL . $this->_t(1) . " */";
- $checkin .= PHP_EOL . $this->_t(1) . "protected function checkInNow()";
- $checkin .= PHP_EOL . $this->_t(1) . "{";
- $checkin .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__)
+ $checkin .= PHP_EOL . Indent::_(1) . " *";
+ $checkin .= PHP_EOL . Indent::_(1) . " * @return a bool";
+ $checkin .= PHP_EOL . Indent::_(1) . " *";
+ $checkin .= PHP_EOL . Indent::_(1) . " */";
+ $checkin .= PHP_EOL . Indent::_(1) . "protected function checkInNow()";
+ $checkin .= PHP_EOL . Indent::_(1) . "{";
+ $checkin .= PHP_EOL . Indent::_(2) . "//" . Line::_(__Line__, __Class__)
. " Get set check in time";
- $checkin .= PHP_EOL . $this->_t(2)
+ $checkin .= PHP_EOL . Indent::_(2)
. "\$time = JComponentHelper::getParams('com_" . $component
. "')->get('check_in');";
- $checkin .= PHP_EOL . PHP_EOL . $this->_t(2) . "if (\$time)";
- $checkin .= PHP_EOL . $this->_t(2) . "{";
- $checkin .= PHP_EOL . PHP_EOL . $this->_t(3) . "//" . $this->setLine(
- __LINE__
+ $checkin .= PHP_EOL . PHP_EOL . Indent::_(2) . "if (\$time)";
+ $checkin .= PHP_EOL . Indent::_(2) . "{";
+ $checkin .= PHP_EOL . PHP_EOL . Indent::_(3) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " Get a db connection.";
- $checkin .= PHP_EOL . $this->_t(3) . "\$db = JFactory::getDbo();";
- $checkin .= PHP_EOL . $this->_t(3) . "//" . $this->setLine(__LINE__)
+ $checkin .= PHP_EOL . Indent::_(3) . "\$db = JFactory::getDbo();";
+ $checkin .= PHP_EOL . Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " Reset query.";
- $checkin .= PHP_EOL . $this->_t(3) . "\$query = \$db->getQuery(true);";
- $checkin .= PHP_EOL . $this->_t(3) . "\$query->select('*');";
- $checkin .= PHP_EOL . $this->_t(3)
+ $checkin .= PHP_EOL . Indent::_(3) . "\$query = \$db->getQuery(true);";
+ $checkin .= PHP_EOL . Indent::_(3) . "\$query->select('*');";
+ $checkin .= PHP_EOL . Indent::_(3)
. "\$query->from(\$db->quoteName('#__" . $component . "_" . $view
. "'));";
- $checkin .= PHP_EOL . $this->_t(3) . "//" . $this->setLine(__LINE__)
+ $checkin .= PHP_EOL . Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " Only select items that are checked out.";
- $checkin .= PHP_EOL . $this->_t(3)
+ $checkin .= PHP_EOL . Indent::_(3)
. "\$query->where(\$db->quoteName('checked_out') . '!=0');";
- $this->_t(3) . "//" . $this->setLine(__LINE__)
+ Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " Query only to see if we have a rows";
- $checkin .= PHP_EOL . $this->_t(3) . "\$db->setQuery(\$query, 0, 1);";
- $checkin .= PHP_EOL . $this->_t(3) . "\$db->execute();";
- $checkin .= PHP_EOL . $this->_t(3) . "if (\$db->getNumRows())";
- $checkin .= PHP_EOL . $this->_t(3) . "{";
- $checkin .= PHP_EOL . $this->_t(4) . "//" . $this->setLine(__LINE__)
+ $checkin .= PHP_EOL . Indent::_(3) . "\$db->setQuery(\$query, 0, 1);";
+ $checkin .= PHP_EOL . Indent::_(3) . "\$db->execute();";
+ $checkin .= PHP_EOL . Indent::_(3) . "if (\$db->getNumRows())";
+ $checkin .= PHP_EOL . Indent::_(3) . "{";
+ $checkin .= PHP_EOL . Indent::_(4) . "//" . Line::_(__Line__, __Class__)
. " Get Yesterdays date.";
- $checkin .= PHP_EOL . $this->_t(4)
+ $checkin .= PHP_EOL . Indent::_(4)
. "\$date = JFactory::getDate()->modify(\$time)->toSql();";
- $checkin .= PHP_EOL . $this->_t(4) . "//" . $this->setLine(__LINE__)
+ $checkin .= PHP_EOL . Indent::_(4) . "//" . Line::_(__Line__, __Class__)
. " Reset query.";
- $checkin .= PHP_EOL . $this->_t(4) . "\$query = \$db->getQuery(true);";
- $checkin .= PHP_EOL . PHP_EOL . $this->_t(4) . "//" . $this->setLine(
- __LINE__
+ $checkin .= PHP_EOL . Indent::_(4) . "\$query = \$db->getQuery(true);";
+ $checkin .= PHP_EOL . PHP_EOL . Indent::_(4) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " Fields to update.";
- $checkin .= PHP_EOL . $this->_t(4) . "\$fields = array(";
- $checkin .= PHP_EOL . $this->_t(5)
+ $checkin .= PHP_EOL . Indent::_(4) . "\$fields = array(";
+ $checkin .= PHP_EOL . Indent::_(5)
. "\$db->quoteName('checked_out_time') . '=\'0000-00-00 00:00:00\'',";
- $checkin .= PHP_EOL . $this->_t(5)
+ $checkin .= PHP_EOL . Indent::_(5)
. "\$db->quoteName('checked_out') . '=0'";
- $checkin .= PHP_EOL . $this->_t(4) . ");";
- $checkin .= PHP_EOL . PHP_EOL . $this->_t(4) . "//" . $this->setLine(
- __LINE__
+ $checkin .= PHP_EOL . Indent::_(4) . ");";
+ $checkin .= PHP_EOL . PHP_EOL . Indent::_(4) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " Conditions for which records should be updated.";
- $checkin .= PHP_EOL . $this->_t(4) . "\$conditions = array(";
- $checkin .= PHP_EOL . $this->_t(5)
+ $checkin .= PHP_EOL . Indent::_(4) . "\$conditions = array(";
+ $checkin .= PHP_EOL . Indent::_(5)
. "\$db->quoteName('checked_out') . '!=0', ";
- $checkin .= PHP_EOL . $this->_t(5)
+ $checkin .= PHP_EOL . Indent::_(5)
. "\$db->quoteName('checked_out_time') . '<\''.\$date.'\''";
- $checkin .= PHP_EOL . $this->_t(4) . ");";
- $checkin .= PHP_EOL . PHP_EOL . $this->_t(4) . "//" . $this->setLine(
- __LINE__
+ $checkin .= PHP_EOL . Indent::_(4) . ");";
+ $checkin .= PHP_EOL . PHP_EOL . Indent::_(4) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " Check table.";
- $checkin .= PHP_EOL . $this->_t(4)
+ $checkin .= PHP_EOL . Indent::_(4)
. "\$query->update(\$db->quoteName('#__" . $component . "_" . $view
. "'))->set(\$fields)->where(\$conditions); ";
- $checkin .= PHP_EOL . PHP_EOL . $this->_t(4)
+ $checkin .= PHP_EOL . PHP_EOL . Indent::_(4)
. "\$db->setQuery(\$query);";
- $checkin .= PHP_EOL . PHP_EOL . $this->_t(4) . "\$db->execute();";
- $checkin .= PHP_EOL . $this->_t(3) . "}";
- $checkin .= PHP_EOL . $this->_t(2) . "}";
- $checkin .= PHP_EOL . PHP_EOL . $this->_t(2) . "return false;";
- $checkin .= PHP_EOL . $this->_t(1) . "}";
+ $checkin .= PHP_EOL . PHP_EOL . Indent::_(4) . "\$db->execute();";
+ $checkin .= PHP_EOL . Indent::_(3) . "}";
+ $checkin .= PHP_EOL . Indent::_(2) . "}";
+ $checkin .= PHP_EOL . PHP_EOL . Indent::_(2) . "return false;";
+ $checkin .= PHP_EOL . Indent::_(1) . "}";
return $checkin;
}
- public function setGetItemsMethodStringFix($nameSingleCode,
- $nameListCode,
- $Component, $tab = '', $export = false, $all = false
- )
+ public function setGetItemsMethodStringFix($nameSingleCode, $nameListCode,
+ $Component, $tab = '', $export = false, $all = false)
{
// add the fix if this view has the need for it
$fix = '';
$forEachStart = '';
$fix_access = '';
// encryption switches
- foreach ($this->cryptionTypes as $cryptionType)
+ foreach (CFactory::_('Config')->cryption_types as $cryptionType)
{
${$cryptionType . 'Crypt'} = false;
}
- // setup correct core target
- $coreLoad = false;
- if (isset($this->permissionCore[$nameSingleCode]))
- {
- $core = $this->permissionCore[$nameSingleCode];
- $coreLoad = true;
- }
$component = StringHelper::safe($Component);
// check if the item has permissions.
- if ($coreLoad && isset($core['core.access'])
- && isset($this->permissionBuilder[$core['core.access']])
- && ArrayHelper::check(
- $this->permissionBuilder[$core['core.access']]
- )
- && in_array(
- $nameSingleCode,
- $this->permissionBuilder[$core['core.access']]
- ))
+ if (CFactory::_('Compiler.Creator.Permission')->actionExist($nameSingleCode, 'core.access'))
{
- $fix_access = PHP_EOL . $this->_t(1) . $tab . $this->_t(3) . "//"
- . $this->setLine(__LINE__)
+ $fix_access = PHP_EOL . Indent::_(1) . $tab . Indent::_(3) . "//"
+ . Line::_(__Line__, __Class__)
. " Remove items the user can't access.";
- $fix_access .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3)
- . "\$access = (\$user->authorise('" . $core['core.access']
+ $fix_access .= PHP_EOL . Indent::_(1) . $tab . Indent::_(3)
+ . "\$access = (\$user->authorise('"
+ . CFactory::_('Compiler.Creator.Permission')->getAction($nameSingleCode, 'core.access')
. "', 'com_" . $component . "." . $nameSingleCode
. ".' . (int) \$item->id) && \$user->authorise('"
- . $core['core.access'] . "', 'com_" . $component . "'));";
- $fix_access .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3)
+ . CFactory::_('Compiler.Creator.Permission')->getAction($nameSingleCode, 'core.access')
+ . "', 'com_" . $component . "'));";
+ $fix_access .= PHP_EOL . Indent::_(1) . $tab . Indent::_(3)
. "if (!\$access)";
- $fix_access .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3) . "{";
- $fix_access .= PHP_EOL . $this->_t(1) . $tab . $this->_t(4)
+ $fix_access .= PHP_EOL . Indent::_(1) . $tab . Indent::_(3) . "{";
+ $fix_access .= PHP_EOL . Indent::_(1) . $tab . Indent::_(4)
. "unset(\$items[\$nr]);";
- $fix_access .= PHP_EOL . $this->_t(1) . $tab . $this->_t(4)
+ $fix_access .= PHP_EOL . Indent::_(1) . $tab . Indent::_(4)
. "continue;";
- $fix_access .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3) . "}"
+ $fix_access .= PHP_EOL . Indent::_(1) . $tab . Indent::_(3) . "}"
. PHP_EOL;
}
// add the tags if needed
- if (isset($this->tagsBuilder[$nameSingleCode]))
+ if (CFactory::_('Compiler.Builder.Tags')->exists($nameSingleCode))
{
- $fix_access .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3) . "//"
- . $this->setLine(
- __LINE__
+ $fix_access .= PHP_EOL . Indent::_(1) . $tab . Indent::_(3) . "//"
+ . Line::_(
+ __LINE__,__CLASS__
) . " Add the tags";
- $fix_access .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3)
+ $fix_access .= PHP_EOL . Indent::_(1) . $tab . Indent::_(3)
. "\$item->tags = new JHelperTags;";
- $fix_access .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3)
+ $fix_access .= PHP_EOL . Indent::_(1) . $tab . Indent::_(3)
. "\$item->tags->getTagIds(";
- $fix_access .= PHP_EOL . $this->_t(1) . $tab . $this->_t(4)
+ $fix_access .= PHP_EOL . Indent::_(1) . $tab . Indent::_(4)
. "\$item->id, 'com_"
- . $this->fileContentStatic[$this->hhh . 'component'
- . $this->hhh] . ".$nameSingleCode'";
- $fix_access .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3) . ");";
- $fix_access .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3)
+ . CFactory::_('Compiler.Builder.Content.One')->get('component') . ".$nameSingleCode'";
+ $fix_access .= PHP_EOL . Indent::_(1) . $tab . Indent::_(3) . ");";
+ $fix_access .= PHP_EOL . Indent::_(1) . $tab . Indent::_(3)
. "if (\$item->tags->tags)";
- $fix_access .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3) . "{";
- $fix_access .= PHP_EOL . $this->_t(1) . $tab . $this->_t(4)
+ $fix_access .= PHP_EOL . Indent::_(1) . $tab . Indent::_(3) . "{";
+ $fix_access .= PHP_EOL . Indent::_(1) . $tab . Indent::_(4)
. "\$item->tags = implode(', ',";
- $fix_access .= PHP_EOL . $this->_t(1) . $tab . $this->_t(5)
+ $fix_access .= PHP_EOL . Indent::_(1) . $tab . Indent::_(5)
. "\$item->tags->getTagNames(";
- $fix_access .= PHP_EOL . $this->_t(1) . $tab . $this->_t(6)
+ $fix_access .= PHP_EOL . Indent::_(1) . $tab . Indent::_(6)
. "explode(',', \$item->tags->tags)";
- $fix_access .= PHP_EOL . $this->_t(1) . $tab . $this->_t(5) . ")";
- $fix_access .= PHP_EOL . $this->_t(1) . $tab . $this->_t(4) . ");";
- $fix_access .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3) . "}";
- $fix_access .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3)
+ $fix_access .= PHP_EOL . Indent::_(1) . $tab . Indent::_(5) . ")";
+ $fix_access .= PHP_EOL . Indent::_(1) . $tab . Indent::_(4) . ");";
+ $fix_access .= PHP_EOL . Indent::_(1) . $tab . Indent::_(3) . "}";
+ $fix_access .= PHP_EOL . Indent::_(1) . $tab . Indent::_(3)
. "else";
- $fix_access .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3) . "{";
- $fix_access .= PHP_EOL . $this->_t(1) . $tab . $this->_t(4)
+ $fix_access .= PHP_EOL . Indent::_(1) . $tab . Indent::_(3) . "{";
+ $fix_access .= PHP_EOL . Indent::_(1) . $tab . Indent::_(4)
. "\$item->tags = '';";
- $fix_access .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3) . "}";
+ $fix_access .= PHP_EOL . Indent::_(1) . $tab . Indent::_(3) . "}";
}
// get the correct array
if ($export || $all)
{
- $methodName = 'getItemsMethodEximportStringFixBuilder';
+ $action_ = 'Eximport';
}
else
{
- $methodName = 'getItemsMethodListStringFixBuilder';
+ $action_ = 'List';
}
// load the relations before modeling
- if (isset($this->fieldRelations[$nameListCode])
- && ArrayHelper::check(
- $this->fieldRelations[$nameListCode]
- ))
+ if (($field_relations =
+ CFactory::_('Compiler.Builder.Field.Relations')->get($nameListCode)) !== null)
{
- foreach (
- $this->fieldRelations[$nameListCode] as $field_id => $fields
- )
+ foreach ($field_relations as $field_id => $fields)
{
foreach ($fields as $area => $field)
{
@@ -21921,12 +20104,10 @@ class Interpretation extends Fields
}
}
// open the values
- if (isset($this->{$methodName}[$nameSingleCode])
- && ArrayHelper::check(
- $this->{$methodName}[$nameSingleCode]
- ))
+ if (CFactory::_("Compiler.Builder.Items.Method.{$action_}.String")->exists($nameSingleCode))
{
- foreach ($this->{$methodName}[$nameSingleCode] as $item)
+ foreach (CFactory::_("Compiler.Builder.Items.Method.{$action_}.String")->
+ get($nameSingleCode) as $item)
{
switch ($item['method'])
{
@@ -21974,87 +20155,83 @@ class Interpretation extends Fields
if ($item['type'] === 'usergroup' && !$export
&& $item['method'] != 6)
{
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3) . "//"
- . $this->setLine(__LINE__) . " decode " . $item['name'];
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3) . "\$"
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(3) . "//"
+ . Line::_(__Line__, __Class__) . " decode " . $item['name'];
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(3) . "\$"
. $item['name'] . "Array = " . $decode . "(\$item->"
. $item['name'] . $suffix_decode . ");";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3)
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(3)
. "if (" . $Component . "Helper::checkArray(\$"
. $item['name'] . "Array))";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3) . "{";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(4) . "\$"
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(3) . "{";
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(4) . "\$"
. $item['name'] . "Names = array();";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(4)
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(4)
. "foreach (\$" . $item['name'] . "Array as \$"
. $item['name'] . ")";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(4) . "{";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(5) . "\$"
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(4) . "{";
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(5) . "\$"
. $item['name'] . "Names[] = " . $Component
. "Helper::getGroupName(\$" . $item['name'] . ");";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(4) . "}";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(4)
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(4) . "}";
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(4)
. "\$item->" . $item['name'] . " = implode(', ', \$"
. $item['name'] . "Names);";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3) . "}";
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(3) . "}";
}
/* elseif ($item['type'] === 'usergroup' && $export)
{
- $fix .= PHP_EOL.$this->_t(1).$tab.$this->_t(3) . "//".$this->setLine(__LINE__)." decode ".$item['name'];
- $fix .= PHP_EOL.$this->_t(1).$tab.$this->_t(3) . "\$".$item['name']."Array = ".$decode."(\$item->".$item['name'].$suffix_decode.");";
- $fix .= PHP_EOL.$this->_t(1).$tab.$this->_t(3) . "if (".$Component."Helper::checkArray(\$".$item['name']."Array))";
- $fix .= PHP_EOL.$this->_t(1).$tab.$this->_t(3) . "{";
- $fix .= PHP_EOL.$this->_t(1).$tab.$this->_t(4) . "\$item->".$item['name']." = implode('|',\$".$item['name']."Array);";
- $fix .= PHP_EOL.$this->_t(1).$tab.$this->_t(3) . "}";
+ $fix .= PHP_EOL.Indent::_(1).$tab.Indent::_(3) . "//".Line::_(__Line__, __Class__)." decode ".$item['name'];
+ $fix .= PHP_EOL.Indent::_(1).$tab.Indent::_(3) . "\$".$item['name']."Array = ".$decode."(\$item->".$item['name'].$suffix_decode.");";
+ $fix .= PHP_EOL.Indent::_(1).$tab.Indent::_(3) . "if (".$Component."Helper::checkArray(\$".$item['name']."Array))";
+ $fix .= PHP_EOL.Indent::_(1).$tab.Indent::_(3) . "{";
+ $fix .= PHP_EOL.Indent::_(1).$tab.Indent::_(4) . "\$item->".$item['name']." = implode('|',\$".$item['name']."Array);";
+ $fix .= PHP_EOL.Indent::_(1).$tab.Indent::_(3) . "}";
} */
elseif ($item['translation'] && !$export
&& $item['method'] != 6)
{
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3) . "//"
- . $this->setLine(__LINE__) . " decode " . $item['name'];
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3) . "\$"
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(3) . "//"
+ . Line::_(__Line__, __Class__) . " decode " . $item['name'];
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(3) . "\$"
. $item['name'] . "Array = " . $decode . "(\$item->"
. $item['name'] . $suffix_decode . ");";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3)
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(3)
. "if (" . $Component . "Helper::checkArray(\$"
. $item['name'] . "Array))";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3) . "{";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(4) . "\$"
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(3) . "{";
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(4) . "\$"
. $item['name'] . "Names = array();";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(4)
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(4)
. "foreach (\$" . $item['name'] . "Array as \$"
. $item['name'] . ")";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(4) . "{";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(5) . "\$"
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(4) . "{";
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(5) . "\$"
. $item['name'] . "Names[] = JText:"
. ":_(\$this->selectionTranslation(\$" . $item['name']
. ", '" . $item['name'] . "'));";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(4) . "}";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(4)
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(4) . "}";
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(4)
. "\$item->" . $item['name'] . " = implode(', ', \$"
. $item['name'] . "Names);";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3) . "}";
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(3) . "}";
}
else
{
- if ($item['method'] == 2 || $item['method'] == 3
- || $item['method'] == 4
- || $item['method'] == 5
- || $item['method'] == 6)
+ if ($item['method'] == 2 || $item['method'] == 3 || $item['method'] == 4
+ || $item['method'] == 5 || $item['method'] == 6)
{
// expert mode (dev must do it all)
if ($item['method'] == 6)
{
$_placeholder_for_field
- = array('[[[field]]]' => "\$item->"
- . $item['name']);
- $fix .= $this->setPlaceholders(
- PHP_EOL . $this->_t(1) . $tab . $this->_t(3)
- . implode(
- PHP_EOL . $this->_t(1) . $tab . $this->_t(
- 3
- ),
- $this->expertFieldModeling[$nameSingleCode][$item['name']]['get']
+ = array('[[[field]]]' => "\$item->" . $item['name']);
+ $fix .= CFactory::_('Placeholder')->update(
+ PHP_EOL . Indent::_(1) . $tab . Indent::_(3)
+ . implode(PHP_EOL . Indent::_(1) . $tab . Indent::_(3),
+ CFactory::_('Compiler.Builder.Model.Expert.Field')->get(
+ $nameSingleCode . '.' . $item['name'] . '.get', []
+ )
), $_placeholder_for_field
);
}
@@ -22063,68 +20240,68 @@ class Interpretation extends Fields
$taber = '';
if ($item['method'] == 3)
{
- $taber = $this->_t(1);
- $fix .= PHP_EOL . $this->_t(1) . $tab
- . $this->_t(3)
+ $taber = Indent::_(1);
+ $fix .= PHP_EOL . Indent::_(1) . $tab
+ . Indent::_(3)
. "if (\$basickey && !is_numeric(\$item->"
. $item['name'] . ") && \$item->"
. $item['name']
. " === base64_encode(base64_decode(\$item->"
. $item['name'] . ", true)))";
- $fix .= PHP_EOL . $this->_t(1) . $tab
- . $this->_t(3) . "{";
+ $fix .= PHP_EOL . Indent::_(1) . $tab
+ . Indent::_(3) . "{";
}
elseif ($item['method'] == 5)
{
- $taber = $this->_t(1);
- $fix .= PHP_EOL . $this->_t(1) . $tab
- . $this->_t(3)
+ $taber = Indent::_(1);
+ $fix .= PHP_EOL . Indent::_(1) . $tab
+ . Indent::_(3)
. "if (\$mediumkey && !is_numeric(\$item->"
. $item['name'] . ") && \$item->"
. $item['name']
. " === base64_encode(base64_decode(\$item->"
. $item['name'] . ", true)))";
- $fix .= PHP_EOL . $this->_t(1) . $tab
- . $this->_t(3) . "{";
+ $fix .= PHP_EOL . Indent::_(1) . $tab
+ . Indent::_(3) . "{";
}
elseif ($item['method'] == 4)
{
- $taber = $this->_t(1);
- $fix .= PHP_EOL . $this->_t(1) . $tab
- . $this->_t(3)
+ $taber = Indent::_(1);
+ $fix .= PHP_EOL . Indent::_(1) . $tab
+ . Indent::_(3)
. "if (\$whmcskey && !is_numeric(\$item->"
. $item['name'] . ") && \$item->"
. $item['name']
. " === base64_encode(base64_decode(\$item->"
. $item['name'] . ", true)))";
- $fix .= PHP_EOL . $this->_t(1) . $tab
- . $this->_t(3) . "{";
+ $fix .= PHP_EOL . Indent::_(1) . $tab
+ . Indent::_(3) . "{";
}
if ($item['method'] == 3 || $item['method'] == 4
|| $item['method'] == 5)
{
- $fix .= PHP_EOL . $this->_t(1) . $tab
- . $this->_t(4) . "//" . $this->setLine(
- __LINE__
+ $fix .= PHP_EOL . Indent::_(1) . $tab
+ . Indent::_(4) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " decrypt " . $item['name'];
}
else
{
- $fix .= PHP_EOL . $this->_t(1) . $tab . $taber
- . $this->_t(3) . "//" . $this->setLine(
- __LINE__
+ $fix .= PHP_EOL . Indent::_(1) . $tab . $taber
+ . Indent::_(3) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " decode " . $item['name'];
}
- $fix .= PHP_EOL . $this->_t(1) . $tab . $taber
- . $this->_t(3) . "\$item->" . $item['name']
+ $fix .= PHP_EOL . Indent::_(1) . $tab . $taber
+ . Indent::_(3) . "\$item->" . $item['name']
. " = " . $decode . "(\$item->" . $item['name']
. ");";
if ($item['method'] == 3 || $item['method'] == 4
|| $item['method'] == 5)
{
- $fix .= PHP_EOL . $this->_t(1) . $tab
- . $this->_t(3) . "}";
+ $fix .= PHP_EOL . Indent::_(1) . $tab
+ . Indent::_(3) . "}";
}
}
}
@@ -22132,96 +20309,96 @@ class Interpretation extends Fields
{
if ($export && $item['type'] === 'repeatable')
{
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3)
- . "//" . $this->setLine(__LINE__)
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(3)
+ . "//" . Line::_(__Line__, __Class__)
. " decode repeatable " . $item['name'];
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3)
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(3)
. "\$" . $item['name'] . "Array = " . $decode
. "(\$item->" . $item['name'] . $suffix_decode
. ");";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3)
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(3)
. "if (" . $Component . "Helper::checkArray(\$"
. $item['name'] . "Array))";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3)
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(3)
. "{";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(4)
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(4)
. "\$bucket" . $item['name'] . " = array();";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(4)
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(4)
. "foreach (\$" . $item['name'] . "Array as \$"
. $item['name'] . "FieldName => \$"
. $item['name'] . ")";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(4)
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(4)
. "{";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(5)
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(5)
. "if (" . $Component . "Helper::checkArray(\$"
. $item['name'] . "))";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(5)
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(5)
. "{";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(6)
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(6)
. "\$bucket" . $item['name'] . "[] = \$"
. $item['name']
. "FieldName . '<||VDM||>' . implode('<|VDM|>',\$"
. $item['name'] . ");";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(5)
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(5)
. "}";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(4)
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(4)
. "}";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(4)
- . "//" . $this->setLine(__LINE__)
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(4)
+ . "//" . Line::_(__Line__, __Class__)
. " make sure the bucket has values.";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(4)
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(4)
. "if (" . $Component
. "Helper::checkArray(\$bucket" . $item['name']
. "))";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(4)
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(4)
. "{";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(5)
- . "//" . $this->setLine(__LINE__)
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(5)
+ . "//" . Line::_(__Line__, __Class__)
. " clear the repeatable field.";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(5)
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(5)
. "unset(\$item->" . $item['name'] . ");";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(5)
- . "//" . $this->setLine(__LINE__)
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(5)
+ . "//" . Line::_(__Line__, __Class__)
. " set repeatable field for export.";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(5)
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(5)
. "\$item->" . $item['name']
. " = implode('<|||VDM|||>',\$bucket"
. $item['name'] . ");";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(5)
- . "//" . $this->setLine(__LINE__)
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(5)
+ . "//" . Line::_(__Line__, __Class__)
. " unset the bucket.";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(5)
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(5)
. "unset(\$bucket" . $item['name'] . ");";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(4)
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(4)
. "}";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3)
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(3)
. "}";
}
elseif ($item['method'] == 1 && !$export)
{
// TODO we check if this works well.
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3)
- . "//" . $this->setLine(__LINE__) . " convert "
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(3)
+ . "//" . Line::_(__Line__, __Class__) . " convert "
. $item['name'];
if (isset($item['custom']['table']))
{
// check if this is a local table
if (strpos(
- $item['custom']['table'],
- '#__' . $this->componentCodeName . '_'
+ (string) $item['custom']['table'],
+ '#__' . CFactory::_('Config')->component_code_name . '_'
) !== false)
{
$keyTableNAme = str_replace(
- '#__' . $this->componentCodeName . '_',
- '', $item['custom']['table']
+ '#__' . CFactory::_('Config')->component_code_name . '_',
+ '', (string) $item['custom']['table']
);
}
else
{
$keyTableNAme = $item['custom']['table'];
}
- $fix .= PHP_EOL . $this->_t(1) . $tab
- . $this->_t(3) . "\$item->" . $item['name']
+ $fix .= PHP_EOL . Indent::_(1) . $tab
+ . Indent::_(3) . "\$item->" . $item['name']
. " = " . $Component
. "Helper::jsonToString(\$item->"
. $item['name'] . ", ', ', '"
@@ -22231,8 +20408,8 @@ class Interpretation extends Fields
}
else
{
- $fix .= PHP_EOL . $this->_t(1) . $tab
- . $this->_t(3) . "\$item->" . $item['name']
+ $fix .= PHP_EOL . Indent::_(1) . $tab
+ . Indent::_(3) . "\$item->" . $item['name']
. " = " . $Component
. "Helper::jsonToString(\$item->"
. $item['name'] . ", ', ', '"
@@ -22244,12 +20421,12 @@ class Interpretation extends Fields
if (!$export)
{
// For those we have not cached yet.
- $fix .= PHP_EOL . $this->_t(1) . $tab
- . $this->_t(3) . "//" . $this->setLine(
- __LINE__
+ $fix .= PHP_EOL . Indent::_(1) . $tab
+ . Indent::_(3) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " convert " . $item['name'];
- $fix .= PHP_EOL . $this->_t(1) . $tab
- . $this->_t(3) . "\$item->" . $item['name']
+ $fix .= PHP_EOL . Indent::_(1) . $tab
+ . Indent::_(3) . "\$item->" . $item['name']
. " = " . $Component
. "Helper::jsonToString(\$item->"
. $item['name'] . ");";
@@ -22260,21 +20437,19 @@ class Interpretation extends Fields
}
}
/* // set translation (TODO) would be nice to cut down on double loops..
- if (!$export && isset($this->selectionTranslationFixBuilder[$nameListCode]) && ArrayHelper::check($this->selectionTranslationFixBuilder[$nameListCode]))
+ if (!$export && CFactory::_('Compiler.Builder.Selection.Translation')->exists($nameListCode))
{
- foreach ($this->selectionTranslationFixBuilder[$nameListCode] as $name => $values)
+ foreach (CFactory::_('Compiler.Builder.Selection.Translation')->get($nameListCode) as $name => $values)
{
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3) . "//" . $this->setLine(__LINE__) . " convert " . $name;
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3) . "\$item->" . $name . " = \$this->selectionTranslation(\$item->" . $name . ", '" . $name . "');";
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(3) . "//" . Line::_(__Line__, __Class__) . " convert " . $name;
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(3) . "\$item->" . $name . " = \$this->selectionTranslation(\$item->" . $name . ", '" . $name . "');";
}
} */
// load the relations after modeling
- if (isset($this->fieldRelations[$nameListCode])
- && ArrayHelper::check(
- $this->fieldRelations[$nameListCode]
- ))
+ if (($field_relations =
+ CFactory::_('Compiler.Builder.Field.Relations')->get($nameListCode)) !== null)
{
- foreach ($this->fieldRelations[$nameListCode] as $fields)
+ foreach ($field_relations as $fields)
{
foreach ($fields as $area => $field)
{
@@ -22288,34 +20463,30 @@ class Interpretation extends Fields
}
}
// close the foreach if needed
- if (StringHelper::check($fix)
- || StringHelper::check($fix_access)
- || $export
- || $all)
+ if (StringHelper::check($fix) || StringHelper::check($fix_access) || $export || $all)
{
// start the loop
- $forEachStart = PHP_EOL . PHP_EOL . $this->_t(1) . $tab . $this->_t(
+ $forEachStart = PHP_EOL . PHP_EOL . Indent::_(1) . $tab . Indent::_(
1
- ) . "//" . $this->setLine(__LINE__)
+ ) . "//" . Line::_(__Line__, __Class__)
. " Set values to display correctly.";
- $forEachStart .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1)
+ $forEachStart .= PHP_EOL . Indent::_(1) . $tab . Indent::_(1)
. "if (" . $Component . "Helper::checkArray(\$items))";
- $forEachStart .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "{";
+ $forEachStart .= PHP_EOL . Indent::_(1) . $tab . Indent::_(1) . "{";
// do not add to export since it is already done
if (!$export)
{
- $forEachStart .= PHP_EOL . $this->_t(1) . $tab . $this->_t(2)
- . "//" . $this->setLine(__LINE__)
+ $forEachStart .= PHP_EOL . Indent::_(1) . $tab . Indent::_(2)
+ . "//" . Line::_(__Line__, __Class__)
. " Get the user object if not set.";
- $forEachStart .= PHP_EOL . $this->_t(1) . $tab . $this->_t(2)
+ $forEachStart .= PHP_EOL . Indent::_(1) . $tab . Indent::_(2)
. "if (!isset(\$user) || !"
- . $this->fileContentStatic[$this->hhh . 'Component'
- . $this->hhh] . "Helper::checkObject(\$user))";
- $forEachStart .= PHP_EOL . $this->_t(1) . $tab . $this->_t(2)
+ . CFactory::_('Compiler.Builder.Content.One')->get('Component') . "Helper::checkObject(\$user))";
+ $forEachStart .= PHP_EOL . Indent::_(1) . $tab . Indent::_(2)
. "{";
- $forEachStart .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3)
+ $forEachStart .= PHP_EOL . Indent::_(1) . $tab . Indent::_(3)
. "\$user = JFactory::getUser();";
- $forEachStart .= PHP_EOL . $this->_t(1) . $tab . $this->_t(2)
+ $forEachStart .= PHP_EOL . Indent::_(1) . $tab . Indent::_(2)
. "}";
}
// the permissional acttion switch
@@ -22355,11 +20526,11 @@ class Interpretation extends Fields
// add the notes and get the global switch
if ($hasPermissional)
{
- $forEachStart .= PHP_EOL . $this->_t(1) . $tab . $this->_t(
+ $forEachStart .= PHP_EOL . Indent::_(1) . $tab . Indent::_(
2
- ) . "//" . $this->setLine(__LINE__)
+ ) . "//" . Line::_(__Line__, __Class__)
. " Get global permissional control activation. (default is inactive)";
- $forEachStart .= PHP_EOL . $this->_t(1) . $tab . $this->_t(
+ $forEachStart .= PHP_EOL . Indent::_(1) . $tab . Indent::_(
2
)
. "\$strict_permission_per_field = JComponentHelper::getParams('com_"
@@ -22368,20 +20539,20 @@ class Interpretation extends Fields
. PHP_EOL;
}
}
- $forEachStart .= PHP_EOL . $this->_t(1) . $tab . $this->_t(2)
+ $forEachStart .= PHP_EOL . Indent::_(1) . $tab . Indent::_(2)
. "foreach (\$items as \$nr => &\$item)";
- $forEachStart .= PHP_EOL . $this->_t(1) . $tab . $this->_t(2) . "{";
+ $forEachStart .= PHP_EOL . Indent::_(1) . $tab . Indent::_(2) . "{";
// add the access options
$forEachStart .= $fix_access;
// add the permissional removal of values the user has not right to view or access
if ($hasPermissional)
{
- $forEachStart .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3)
- . "//" . $this->setLine(__LINE__)
+ $forEachStart .= PHP_EOL . Indent::_(1) . $tab . Indent::_(3)
+ . "//" . Line::_(__Line__, __Class__)
. " use permissional control if globally set.";
- $forEachStart .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3)
+ $forEachStart .= PHP_EOL . Indent::_(1) . $tab . Indent::_(3)
. "if (\$strict_permission_per_field)";
- $forEachStart .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3)
+ $forEachStart .= PHP_EOL . Indent::_(1) . $tab . Indent::_(3)
. "{";
foreach (
$this->permissionFields[$nameSingleCode] as $fieldName =>
@@ -22396,121 +20567,110 @@ class Interpretation extends Fields
{
case 'access':
case 'view':
- $forEachStart .= PHP_EOL . $this->_t(1) . $tab
- . $this->_t(4) . "//" . $this->setLine(
- __LINE__
+ $forEachStart .= PHP_EOL . Indent::_(1) . $tab
+ . Indent::_(4) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " set " . $permission_option
. " permissional control for " . $fieldName
. " value.";
- $forEachStart .= PHP_EOL . $this->_t(1) . $tab
- . $this->_t(4) . "if (isset(\$item->"
+ $forEachStart .= PHP_EOL . Indent::_(1) . $tab
+ . Indent::_(4) . "if (isset(\$item->"
. $fieldName . ") && (!\$user->authorise('"
. $nameSingleCode . "."
. $permission_option . "." . $fieldName
. "', 'com_" . $component . "."
. $nameSingleCode
. ".' . (int) \$item->id)";
- $forEachStart .= PHP_EOL . $this->_t(1) . $tab
- . $this->_t(5) . "|| !\$user->authorise('"
+ $forEachStart .= PHP_EOL . Indent::_(1) . $tab
+ . Indent::_(5) . "|| !\$user->authorise('"
. $nameSingleCode . "."
. $permission_option . "." . $fieldName
. "', 'com_" . $component . "')))";
- $forEachStart .= PHP_EOL . $this->_t(1) . $tab
- . $this->_t(4) . "{";
- $forEachStart .= PHP_EOL . $this->_t(1) . $tab
- . $this->_t(5) . "//" . $this->setLine(
- __LINE__
+ $forEachStart .= PHP_EOL . Indent::_(1) . $tab
+ . Indent::_(4) . "{";
+ $forEachStart .= PHP_EOL . Indent::_(1) . $tab
+ . Indent::_(5) . "//" . Line::_(
+ __LINE__,__CLASS__
)
. " We JUST empty the value (do you have a better idea)";
- $forEachStart .= PHP_EOL . $this->_t(1) . $tab
- . $this->_t(5) . "\$item->" . $fieldName
+ $forEachStart .= PHP_EOL . Indent::_(1) . $tab
+ . Indent::_(5) . "\$item->" . $fieldName
. " = '';";
- $forEachStart .= PHP_EOL . $this->_t(1) . $tab
- . $this->_t(4) . "}";
+ $forEachStart .= PHP_EOL . Indent::_(1) . $tab
+ . Indent::_(4) . "}";
break;
}
}
}
- $forEachStart .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3)
+ $forEachStart .= PHP_EOL . Indent::_(1) . $tab . Indent::_(3)
. "}";
}
// remove these values if export
if ($export)
{
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3) . "//"
- . $this->setLine(__LINE__)
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(3) . "//"
+ . Line::_(__Line__, __Class__)
. " unset the values we don't want exported.";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3)
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(3)
. "unset(\$item->asset_id);";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3)
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(3)
. "unset(\$item->checked_out);";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3)
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(3)
. "unset(\$item->checked_out_time);";
}
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(2) . "}";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "}";
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(2) . "}";
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(1) . "}";
if ($export)
{
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "//"
- . $this->setLine(__LINE__) . " Add headers to items array.";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1)
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(1) . "//"
+ . Line::_(__Line__, __Class__) . " Add headers to items array.";
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(1)
. "\$headers = \$this->getExImPortHeaders();";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "if ("
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(1) . "if ("
. $Component . "Helper::checkObject(\$headers))";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "{";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(2)
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(1) . "{";
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(2)
. "array_unshift(\$items,\$headers);";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "}";
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(1) . "}";
}
}
// add custom php to getitems method
- $fix .= $this->getCustomScriptBuilder(
+ $fix .= CFactory::_('Customcode.Dispenser')->get(
'php_getitems', $nameSingleCode, PHP_EOL . PHP_EOL . $tab
);
// load the encryption object if needed
$script = '';
- foreach ($this->cryptionTypes as $cryptionType)
+ foreach (CFactory::_('Config')->cryption_types as $cryptionType)
{
if (${$cryptionType . 'Crypt'})
{
if ('expert' !== $cryptionType)
{
- $script .= PHP_EOL . PHP_EOL . $this->_t(1) . $tab
- . $this->_t(1) . "//" . $this->setLine(__LINE__)
+ $script .= PHP_EOL . PHP_EOL . Indent::_(1) . $tab
+ . Indent::_(1) . "//" . Line::_(__Line__, __Class__)
. " Get the " . $cryptionType . " encryption key.";
- $script .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1)
+ $script .= PHP_EOL . Indent::_(1) . $tab . Indent::_(1)
. "\$" . $cryptionType . "key = " . $Component
. "Helper::getCryptKey('" . $cryptionType . "');";
- $script .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1)
- . "//" . $this->setLine(__LINE__)
+ $script .= PHP_EOL . Indent::_(1) . $tab . Indent::_(1)
+ . "//" . Line::_(__Line__, __Class__)
. " Get the encryption object.";
- $script .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1)
- . "\$" . $cryptionType . " = new FOFEncryptAes(\$"
+ $script .= PHP_EOL . Indent::_(1) . $tab . Indent::_(1)
+ . "\$" . $cryptionType . " = new Super___99175f6d_dba8_4086_8a65_5c4ec175e61d___Power(\$"
. $cryptionType . "key);";
}
- elseif (isset(
- $this->{$cryptionType
- . 'FieldModelInitiator'}[$nameSingleCode]
- )
- && isset(
- $this->{$cryptionType
- . 'FieldModelInitiator'}[$nameSingleCode]['get']
- ))
+ elseif (CFactory::_('Compiler.Builder.Model.' . ucfirst($cryptionType). '.Field.Initiator')->
+ exists("{$nameSingleCode}.get"))
{
- foreach (
- $this->{$cryptionType
- . 'FieldModelInitiator'}[$nameSingleCode]['get'] as
- $block
- )
+ foreach (CFactory::_('Compiler.Builder.Model.' . ucfirst($cryptionType). '.Field.Initiator')->
+ get("{$nameSingleCode}.get") as $block)
{
- $script .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1)
- . implode(
- PHP_EOL . $this->_t(1) . $tab . $this->_t(1),
- $block
- );
+ $script .= PHP_EOL . Indent::_(1) . $tab . Indent::_(1) . implode(
+ PHP_EOL . Indent::_(1) . $tab . Indent::_(1), $block
+ );
}
}
}
@@ -22584,7 +20744,7 @@ class Interpretation extends Fields
case 'custom.admin.views':
case 'site.admin.view':
$headers[]
- = 'JHtml::addIncludePath(JPATH_COMPONENT.\'/helpers/html\');';
+ = 'JHtml::addIncludePath(JPATH_COMPONENT.\'/helpers/html\');';
$headers[] = 'JHtml::_(\'behavior.formvalidator\');';
$headers[] = 'JHtml::_(\'formbehavior.chosen\', \'select\');';
$headers[] = 'JHtml::_(\'behavior.keepalive\');';
@@ -22605,11 +20765,8 @@ class Interpretation extends Fields
case 'custom.admin.views.html':
$headers[] = 'use Joomla\CMS\MVC\View\HtmlView;';
// load the file class if uikit is being loaded
- if ((2 == $this->uikit || 1 == $this->uikit)
- && isset($this->uikitComp[$codeName])
- && ArrayHelper::check(
- $this->uikitComp[$codeName]
- ))
+ if ((2 == CFactory::_('Config')->uikit || 1 == CFactory::_('Config')->uikit)
+ && CFactory::_('Compiler.Builder.Uikit.Comp')->exists($codeName))
{
$headers[] = 'use Joomla\CMS\Filesystem\File;';
}
@@ -22621,9 +20778,19 @@ class Interpretation extends Fields
$headers[] = 'use Joomla\Utilities\ArrayHelper;';
break;
case 'custom.admin.view.controller':
+ case 'import.custom.controller':
+ case 'import.controller':
$headers[] = 'use Joomla\CMS\MVC\Controller\BaseController;';
$headers[] = 'use Joomla\Utilities\ArrayHelper;';
break;
+ case 'import.custom.model':
+ case 'import.model':
+ $headers[] = 'use Joomla\CMS\MVC\Model\BaseDatabaseModel;';
+ $headers[] = 'use Joomla\CMS\Filesystem\File;';
+ $headers[] = 'use Joomla\CMS\Filesystem\Folder;';
+ $headers[] = 'use Joomla\Utilities\ArrayHelper;';
+ $headers[] = 'use PhpOffice\PhpSpreadsheet\IOFactory;';
+ break;
case 'admin.views.controller':
case 'custom.admin.views.controller':
case 'dashboard.controller':
@@ -22634,17 +20801,19 @@ class Interpretation extends Fields
$headers[] = 'use Joomla\Utilities\ArrayHelper;';
break;
}
+ // for plugin event TODO change event api signatures
+ $component_context = CFactory::_('Config')->component_context;
// Trigger Event: jcb_ce_setClassHeader
- $this->triggerEvent(
+ CFactory::_('Event')->trigger(
'jcb_ce_setClassHeader',
- array(&$this->componentContext, &$context, &$codeName,
+ array(&$component_context, &$context, &$codeName,
&$headers)
);
// check if headers were added
if (ArrayHelper::check($headers))
{
// return the headers
- return $this->setPlaceholders(implode(PHP_EOL, $headers), $this->placeholders);
+ return CFactory::_('Placeholder')->update_(implode(PHP_EOL, $headers));
}
return $default;
@@ -22661,7 +20830,7 @@ class Interpretation extends Fields
protected function setHelperClassHeader(&$headers, $target_client)
{
// add only to admin client
- if ('admin' === $target_client && $this->addEximport)
+ if ('admin' === $target_client && CFactory::_('Config')->get('add_eximport', false))
{
$headers[] = 'use PhpOffice\PhpSpreadsheet\IOFactory;';
$headers[] = 'use PhpOffice\PhpSpreadsheet\Spreadsheet;';
@@ -22681,40 +20850,30 @@ class Interpretation extends Fields
protected function setChosenMultiSelectionHeaders(&$headers, $nameListCode)
{
// check that the filter type is the new filter option (2 = topbar)
- if (isset($this->adminFilterType[$nameListCode])
- && $this->adminFilterType[$nameListCode] == 2)
+ if (CFactory::_('Compiler.Builder.Admin.Filter.Type')->get($nameListCode, 1) == 2)
{
// add category switch
$add_category = false;
- if (isset($this->categoryBuilder[$nameListCode])
- && ArrayHelper::check(
- $this->categoryBuilder[$nameListCode]
- )
- && isset($this->categoryBuilder[$nameListCode]['extension'])
- && isset($this->categoryBuilder[$nameListCode]['filter'])
- && $this->categoryBuilder[$nameListCode]['filter'] >= 1)
+ if (CFactory::_('Compiler.Builder.Category')->exists("{$nameListCode}.extension")
+ && CFactory::_('Compiler.Builder.Category')->get("{$nameListCode}.filter", 0) >= 1)
{
// is found so add it
$add_category = true;
}
// add accessLevels switch
$add_access_levels = false;
- if (in_array($nameListCode, $this->accessBuilder))
+ if (CFactory::_('Compiler.Builder.Access.Switch.List')->exists($nameListCode))
{
// is found so add it
$add_access_levels = true;
}
// check if this view have filters
- if (isset($this->filterBuilder[$nameListCode])
- && ArrayHelper::check(
- $this->filterBuilder[$nameListCode]
- ))
+ if (CFactory::_('Compiler.Builder.Filter')->exists($nameListCode))
{
- foreach ($this->filterBuilder[$nameListCode] as $filter)
+ foreach (CFactory::_('Compiler.Builder.Filter')->get($nameListCode) as $filter)
{
// we need this only for filters that are multi
- if (isset($filter['multi'])
- && $filter['multi'] == 2)
+ if (isset($filter['multi']) && $filter['multi'] == 2)
{
// if this is a category we should make sure it must be added
if (!$add_category && $filter['type'] === 'category')
@@ -22758,7 +20917,7 @@ class Interpretation extends Fields
$headers[]
= 'JHtml::_(\'formbehavior.chosen\', \'.multipleCategories'
. '\', null, array(\'placeholder_text_multiple\' => \'- \' . JText::_(\''
- . $this->categoryBuilder[$nameListCode]['name']
+ . CFactory::_('Compiler.Builder.Category')->exists("{$nameListCode}.name", 'error')
. '\') . \' -\'));';
}
// add accessLevels if not already added
@@ -22771,8 +20930,8 @@ class Interpretation extends Fields
$filter_name_select, 'U'
);
// and to translation
- $this->setLangContent(
- $this->lang, $filter_name_select_lang, $filter_name_select
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $filter_name_select_lang, $filter_name_select
);
// add the header
$headers[]
@@ -22800,7 +20959,7 @@ class Interpretation extends Fields
foreach ($item['joinfields'] as $join)
{
$field['$item->{' . (int) $join . '}'] = '$item->'
- . $this->listJoinBuilder[$nameListCode][(int) $join]['code'];
+ . CFactory::_('Compiler.Builder.List.Join')->get($nameListCode . '.' . (int) $join . '.code', 'error');
}
}
// set based on join_type
@@ -22809,60 +20968,55 @@ class Interpretation extends Fields
// code
$code = (array) explode(
PHP_EOL, str_replace(
- array_keys($field), array_values($field), $item['set']
+ array_keys($field), array_values($field), (string) $item['set']
)
);
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3) . implode(
- PHP_EOL . $this->_t(1) . $tab . $this->_t(3), $code
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(3) . implode(
+ PHP_EOL . Indent::_(1) . $tab . Indent::_(3), $code
);
}
else
{
// concatenate
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3) . "//"
- . $this->setLine(__LINE__) . " concatenate these fields";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3) . "\$item->"
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(3) . "//"
+ . Line::_(__Line__, __Class__) . " concatenate these fields";
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(3) . "\$item->"
. $item['code'] . ' = ' . implode(
- " . '" . str_replace("'", ''', $item['set']) . "' . ",
+ " . '" . str_replace("'", ''', (string) $item['set']) . "' . ",
$field
) . ';';
}
- return $this->setPlaceholders($fix, $this->placeholders);
+ return CFactory::_('Placeholder')->update_($fix);
}
public function setSelectionTranslationFix($views, $Component, $tab = '')
{
// add the fix if this view has the need for it
$fix = '';
- if (isset($this->selectionTranslationFixBuilder[$views])
- && ArrayHelper::check(
- $this->selectionTranslationFixBuilder[$views]
- ))
+ if (CFactory::_('Compiler.Builder.Selection.Translation')->exists($views))
{
- $fix .= PHP_EOL . PHP_EOL . $this->_t(1) . $tab . $this->_t(1)
- . "//" . $this->setLine(__LINE__)
+ $fix .= PHP_EOL . PHP_EOL . Indent::_(1) . $tab . Indent::_(1)
+ . "//" . Line::_(__Line__, __Class__)
. " set selection value to a translatable value";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "if ("
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(1) . "if ("
. $Component . "Helper::checkArray(\$items))";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "{";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(2)
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(1) . "{";
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(2)
. "foreach (\$items as \$nr => &\$item)";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(2) . "{";
- foreach (
- $this->selectionTranslationFixBuilder[$views] as $name =>
- $values
- )
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(2) . "{";
+ foreach (CFactory::_('Compiler.Builder.Selection.Translation')->
+ get($views) as $name => $values)
{
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3) . "//"
- . $this->setLine(__LINE__) . " convert " . $name;
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3)
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(3) . "//"
+ . Line::_(__Line__, __Class__) . " convert " . $name;
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(3)
. "\$item->" . $name
. " = \$this->selectionTranslation(\$item->" . $name . ", '"
. $name . "');";
}
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(2) . "}";
- $fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "}"
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(2) . "}";
+ $fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(1) . "}"
. PHP_EOL;
}
@@ -22873,34 +21027,29 @@ class Interpretation extends Fields
{
// add the fix if this view has the need for it
$fix = '';
- if (isset($this->selectionTranslationFixBuilder[$views])
- && ArrayHelper::check(
- $this->selectionTranslationFixBuilder[$views]
- ))
+ if (CFactory::_('Compiler.Builder.Selection.Translation')->exists($views))
{
- $fix .= PHP_EOL . PHP_EOL . $this->_t(1) . "/**";
- $fix .= PHP_EOL . $this->_t(1)
+ $fix .= PHP_EOL . PHP_EOL . Indent::_(1) . "/**";
+ $fix .= PHP_EOL . Indent::_(1)
. " * Method to convert selection values to translatable string.";
- $fix .= PHP_EOL . $this->_t(1) . " *";
- $fix .= PHP_EOL . $this->_t(1) . " * @return translatable string";
- $fix .= PHP_EOL . $this->_t(1) . " */";
- $fix .= PHP_EOL . $this->_t(1)
+ $fix .= PHP_EOL . Indent::_(1) . " *";
+ $fix .= PHP_EOL . Indent::_(1) . " * @return translatable string";
+ $fix .= PHP_EOL . Indent::_(1) . " */";
+ $fix .= PHP_EOL . Indent::_(1)
. "public function selectionTranslation(\$value,\$name)";
- $fix .= PHP_EOL . $this->_t(1) . "{";
- foreach (
- $this->selectionTranslationFixBuilder[$views] as $name =>
- $values
- )
+ $fix .= PHP_EOL . Indent::_(1) . "{";
+ foreach (CFactory::_('Compiler.Builder.Selection.Translation')->
+ get($views) as $name => $values)
{
if (ArrayHelper::check($values))
{
- $fix .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(
- __LINE__
+ $fix .= PHP_EOL . Indent::_(2) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " Array of " . $name . " language strings";
- $fix .= PHP_EOL . $this->_t(2) . "if (\$name === '"
+ $fix .= PHP_EOL . Indent::_(2) . "if (\$name === '"
. $name . "')";
- $fix .= PHP_EOL . $this->_t(2) . "{";
- $fix .= PHP_EOL . $this->_t(3) . "\$" . $name
+ $fix .= PHP_EOL . Indent::_(2) . "{";
+ $fix .= PHP_EOL . Indent::_(3) . "\$" . $name
. "Array = array(";
$counter = 0;
foreach ($values as $value => $translang)
@@ -22920,32 +21069,32 @@ class Interpretation extends Fields
}
if ($counter == 0)
{
- $fix .= PHP_EOL . $this->_t(4) . $key . " => '"
+ $fix .= PHP_EOL . Indent::_(4) . $key . " => '"
. $translang . "'";
}
else
{
- $fix .= "," . PHP_EOL . $this->_t(4) . $key
+ $fix .= "," . PHP_EOL . Indent::_(4) . $key
. " => '" . $translang . "'";
}
$counter++;
}
- $fix .= PHP_EOL . $this->_t(3) . ");";
- $fix .= PHP_EOL . $this->_t(3) . "//" . $this->setLine(
- __LINE__
+ $fix .= PHP_EOL . Indent::_(3) . ");";
+ $fix .= PHP_EOL . Indent::_(3) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " Now check if value is found in this array";
- $fix .= PHP_EOL . $this->_t(3) . "if (isset(\$" . $name
+ $fix .= PHP_EOL . Indent::_(3) . "if (isset(\$" . $name
. "Array[\$value]) && " . $Component
. "Helper::checkString(\$" . $name . "Array[\$value]))";
- $fix .= PHP_EOL . $this->_t(3) . "{";
- $fix .= PHP_EOL . $this->_t(4) . "return \$" . $name
+ $fix .= PHP_EOL . Indent::_(3) . "{";
+ $fix .= PHP_EOL . Indent::_(4) . "return \$" . $name
. "Array[\$value];";
- $fix .= PHP_EOL . $this->_t(3) . "}";
- $fix .= PHP_EOL . $this->_t(2) . "}";
+ $fix .= PHP_EOL . Indent::_(3) . "}";
+ $fix .= PHP_EOL . Indent::_(2) . "}";
}
}
- $fix .= PHP_EOL . $this->_t(2) . "return \$value;";
- $fix .= PHP_EOL . $this->_t(1) . "}";
+ $fix .= PHP_EOL . Indent::_(2) . "return \$value;";
+ $fix .= PHP_EOL . Indent::_(1) . "}";
}
return $fix;
@@ -22953,16 +21102,16 @@ class Interpretation extends Fields
public function setRouterCase($viewsCodeName)
{
- if (strlen($viewsCodeName) > 0)
+ if (strlen((string) $viewsCodeName) > 0)
{
- $router = PHP_EOL . $this->_t(2) . "case '" . $viewsCodeName . "':";
- $router .= PHP_EOL . $this->_t(3)
+ $router = PHP_EOL . Indent::_(2) . "case '" . $viewsCodeName . "':";
+ $router .= PHP_EOL . Indent::_(3)
. "\$id = explode(':', \$segments[\$count-1]);";
- $router .= PHP_EOL . $this->_t(3) . "\$vars['id'] = (int) \$id[0];";
- $router .= PHP_EOL . $this->_t(3) . "\$vars['view'] = '"
+ $router .= PHP_EOL . Indent::_(3) . "\$vars['id'] = (int) \$id[0];";
+ $router .= PHP_EOL . Indent::_(3) . "\$vars['view'] = '"
. $viewsCodeName
. "';";
- $router .= PHP_EOL . $this->_t(2) . "break;";
+ $router .= PHP_EOL . Indent::_(2) . "break;";
return $router;
}
@@ -22975,7 +21124,7 @@ class Interpretation extends Fields
$type = ComponentbuilderHelper::imageInfo($path);
if ($type)
{
- $imagePath = $this->componentPath . '/admin/assets/images';
+ $imagePath = CFactory::_('Utilities.Paths')->component_path . '/admin/assets/images';
// move the image to its place
File::copy(
JPATH_SITE . '/' . $path,
@@ -22994,34 +21143,17 @@ class Interpretation extends Fields
public function setDashboardIconAccess()
{
- if (isset($this->permissionDashboard)
- && ArrayHelper::check($this->permissionDashboard))
- {
- $this->permissionDashboard = array_unique(
- $this->permissionDashboard
- );
-
- return PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__)
- . " view access array" . PHP_EOL . $this->_t(2)
- . "\$viewAccess = array(" . PHP_EOL . $this->_t(3) . implode(
- "," . PHP_EOL . $this->_t(3), $this->permissionDashboard
- ) . ");";
- }
-
- return '';
+ return CFactory::_('Compiler.Builder.Permission.Dashboard')->build();
}
public function setDashboardIcons()
{
- if (isset($this->componentData->admin_views)
- && ArrayHelper::check(
- $this->componentData->admin_views
- ))
+ if (CFactory::_('Component')->isArray('admin_views'))
{
$icons = '';
$counter = 0;
$catArray = array();
- foreach ($this->componentData->admin_views as $view)
+ foreach (CFactory::_('Component')->get('admin_views') as $view)
{
$name_single = StringHelper::safe(
$view['settings']->name_single
@@ -23066,7 +21198,7 @@ class Interpretation extends Fields
$view['settings']->name_single, 'U'
) . '_ADD';
// add to lang
- $this->setLangContent($this->lang, $langKey, $langName);
+ CFactory::_('Language')->set(CFactory::_('Config')->lang_target, $langKey, $langName);
$counter++;
}
if (isset($view['dashboard_list'])
@@ -23103,25 +21235,21 @@ class Interpretation extends Fields
$view['settings']->name_list, 'U'
);
// add to lang
- $this->setLangContent($this->lang, $langKey, $langName);
+ CFactory::_('Language')->set(CFactory::_('Config')->lang_target, $langKey, $langName);
$counter++;
}
// dashboard link to category on dashboard is build here
- if (isset($this->categoryBuilder[$name_list])
- && ArrayHelper::check(
- $this->categoryBuilder[$name_list]
- ))
+ if (CFactory::_('Compiler.Builder.Category')->exists("{$name_list}.code"))
{
- $catCode = $this->categoryBuilder[$name_list]['code'];
+ $catCode = CFactory::_('Compiler.Builder.Category')->get("{$name_list}.code");
// check if category has another name
- if (isset($this->catOtherName[$name_list])
- && ArrayHelper::check(
- $this->catOtherName[$name_list]
- ))
+ $otherViews = CFactory::_('Compiler.Builder.Category.Other.Name')->
+ get($name_list . '.views', $name_list);
+ $otherNames = CFactory::_('Compiler.Builder.Category.Other.Name')->
+ get($name_list . '.name');
+ if ($otherNames !== null)
{
- $otherViews = $this->catOtherName[$name_list]['views'];
- $otherNames = $this->catOtherName[$name_list]['name'];
// build lang
$langName = StringHelper::safe(
$otherNames, 'W'
@@ -23129,7 +21257,6 @@ class Interpretation extends Fields
}
else
{
- $otherViews = $name_list;
// build lang
$langName = 'Categories For
'
. StringHelper::safe(
@@ -23142,7 +21269,7 @@ class Interpretation extends Fields
// set the extension key string, new convention (more stable)
$_key_extension = str_replace(
'.', '_po0O0oq_',
- $this->categoryBuilder[$name_list]['extension']
+ (string) CFactory::_('Compiler.Builder.Category')->get("{$name_list}.extension", 'error')
);
// add to lang
@@ -23152,7 +21279,7 @@ class Interpretation extends Fields
) . '_' . StringHelper::safe(
$catCode, 'U'
);
- $this->setLangContent($this->lang, $langKey, $langName);
+ CFactory::_('Language')->set(CFactory::_('Config')->lang_target, $langKey, $langName);
// get image type
$type = ComponentbuilderHelper::imageInfo(
$view['settings']->icon_category
@@ -23202,11 +21329,11 @@ class Interpretation extends Fields
$this->iconBuilder
))
{
- $imagePath = $this->componentPath
+ $imagePath = CFactory::_('Utilities.Paths')->component_path
. '/admin/assets/images/icons';
foreach ($this->iconBuilder as $icon => $path)
{
- $array_buket = explode('.', $icon);
+ $array_buket = explode('.', (string) $icon);
if (count((array) $array_buket) == 3)
{
list($type, $name, $action) = $array_buket;
@@ -23240,22 +21367,20 @@ class Interpretation extends Fields
public function setDashboardModelMethods()
{
- if (isset($this->componentData->php_dashboard_methods)
- && StringHelper::check(
- $this->componentData->php_dashboard_methods
- ))
+ if (CFactory::_('Component')->isString('php_dashboard_methods'))
{
+ // get hte value
+ $php_dashboard_methods = CFactory::_('Component')->get('php_dashboard_methods');
// get all the mothods that should load date to the view
$this->DashboardGetCustomData
= GetHelper::allBetween(
- $this->componentData->php_dashboard_methods,
+ $php_dashboard_methods,
'public function get', '()'
);
// return the methods
- return PHP_EOL . PHP_EOL . $this->setPlaceholders(
- $this->componentData->php_dashboard_methods,
- $this->placeholders
+ return PHP_EOL . PHP_EOL . CFactory::_('Placeholder')->update_(
+ $php_dashboard_methods
);
}
@@ -23280,8 +21405,8 @@ class Interpretation extends Fields
}
// return the gets
- return PHP_EOL . $this->_t(2) . implode(
- PHP_EOL . $this->_t(2), $gets
+ return PHP_EOL . Indent::_(2) . implode(
+ PHP_EOL . Indent::_(2), $gets
);
}
@@ -23294,33 +21419,30 @@ class Interpretation extends Fields
$display = array();
$mainAccordianName = 'cPanel';
$builder = array();
- $tab = $this->_t(1);
+ $tab = Indent::_(1);
$loadTabs = false;
// check if we have custom tabs
- if (isset($this->componentData->dashboard_tab)
- && ArrayHelper::check(
- $this->componentData->dashboard_tab
- ))
+ if (CFactory::_('Component')->isArray('dashboard_tab'))
{
// build the tabs and accordians
- foreach ($this->componentData->dashboard_tab as $data)
+ foreach (CFactory::_('Component')->get('dashboard_tab') as $data)
{
$builder[$data['name']][$data['header']]
- = $this->setPlaceholders(
- $data['html'], $this->placeholders
+ = CFactory::_('Placeholder')->update_(
+ $data['html']
);
}
// since we have custom tabs we must load the tab structure around the cpanel
$display[] = '';
- $display[] = $this->_t(1) . '';
- $display[] = $this->_t(1)
+ $display[] = Indent::_(1) . '';
+ $display[] = Indent::_(1)
. " 'cpanel')); ?>";
- $display[] = PHP_EOL . $this->_t(2)
+ $display[] = PHP_EOL . Indent::_(2)
. "";
- $display[] = $this->_t(2) . '';
+ $display[] = Indent::_(2) . '';
// set the tab to insure correct spacing
- $tab = $this->_t(3);
+ $tab = Indent::_(3);
// change the name of the main tab
$mainAccordianName = 'Control Panel';
$loadTabs = true;
@@ -23331,49 +21453,49 @@ class Interpretation extends Fields
}
// set dashboard display
$display[] = $tab . '';
- $display[] = $tab . $this->_t(1)
+ $display[] = $tab . Indent::_(1)
. " 'main')); ?>";
- $display[] = $tab . $this->_t(2)
+ $display[] = $tab . Indent::_(2)
. "";
- $display[] = $tab . $this->_t(3)
+ $display[] = $tab . Indent::_(3)
. "loadTemplate('main');?>";
- $display[] = $tab . $this->_t(2)
+ $display[] = $tab . Indent::_(2)
. "";
- $display[] = $tab . $this->_t(1)
+ $display[] = $tab . Indent::_(1)
. "";
$display[] = $tab . "";
$display[] = $tab . '';
- $display[] = $tab . $this->_t(1)
+ $display[] = $tab . Indent::_(1)
. " 'vdm')); ?>";
- $display[] = $tab . $this->_t(2)
+ $display[] = $tab . Indent::_(2)
. "fileContentStatic[$this->hhh . 'COMPANYNAME' . $this->hhh]
+ . CFactory::_('Compiler.Builder.Content.One')->get('COMPANYNAME')
. "', 'vdm'); ?>";
- $display[] = $tab . $this->_t(3)
+ $display[] = $tab . Indent::_(3)
. "loadTemplate('vdm');?>";
- $display[] = $tab . $this->_t(2)
+ $display[] = $tab . Indent::_(2)
. "";
- $display[] = $tab . $this->_t(1)
+ $display[] = $tab . Indent::_(1)
. "";
$display[] = $tab . "";
if ($loadTabs)
{
- $display[] = $this->_t(2) . "";
- $display[] = $this->_t(2)
+ $display[] = Indent::_(2) . "";
+ $display[] = Indent::_(2)
. "";
// load the new tabs
foreach ($builder as $tabname => $accordians)
{
$alias = StringHelper::safe($tabname);
- $display[] = PHP_EOL . $this->_t(2)
+ $display[] = PHP_EOL . Indent::_(2)
. "";
- $display[] = $this->_t(2) . '';
+ $display[] = Indent::_(2) . '';
$display[] = $tab . '';
- $display[] = $tab . $this->_t(1)
+ $display[] = $tab . Indent::_(1)
. " '" . $alias
. "_one')); ?>";
@@ -23387,45 +21509,39 @@ class Interpretation extends Fields
$slidecounter
);
$tempName = $alias . '_' . $ac_alias;
- $display[] = $tab . $this->_t(2)
+ $display[] = $tab . Indent::_(2)
. "";
- $display[] = $tab . $this->_t(3)
+ $display[] = $tab . Indent::_(3)
. "loadTemplate('" . $tempName
. "');?>";
- $display[] = $tab . $this->_t(2)
+ $display[] = $tab . Indent::_(2)
. "";
$slidecounter++;
// build the template file
- $target = array('custom_admin' => $this->componentCodeName);
- $this->buildDynamique($target, 'template', $tempName);
+ $target = array('custom_admin' => CFactory::_('Config')->component_code_name);
+ CFactory::_('Utilities.Structure')->build($target, 'template', $tempName);
// set the file data
$TARGET = StringHelper::safe(
- $this->target, 'U'
+ CFactory::_('Config')->build_target, 'U'
);
// SITE_TEMPLATE_BODY <<>>
- $this->fileContentDynamic[$this->componentCodeName . '_'
- . $tempName][$this->hhh . 'CUSTOM_ADMIN_TEMPLATE_BODY'
- . $this->hhh]
- = PHP_EOL . $html;
+ CFactory::_('Compiler.Builder.Content.Multi')->set(CFactory::_('Config')->component_code_name . '_' . $tempName . '|CUSTOM_ADMIN_TEMPLATE_BODY', PHP_EOL . $html);
// SITE_TEMPLATE_CODE_BODY <<>>
- $this->fileContentDynamic[$this->componentCodeName . '_'
- . $tempName][$this->hhh . 'CUSTOM_ADMIN_TEMPLATE_CODE_BODY'
- . $this->hhh]
- = '';
+ CFactory::_('Compiler.Builder.Content.Multi')->set(CFactory::_('Config')->component_code_name . '_' . $tempName . '|CUSTOM_ADMIN_TEMPLATE_CODE_BODY', '');
}
- $display[] = $tab . $this->_t(1)
+ $display[] = $tab . Indent::_(1)
. "";
$display[] = $tab . " ";
- $display[] = $this->_t(2) . "";
- $display[] = $this->_t(2)
+ $display[] = Indent::_(2) . "";
+ $display[] = Indent::_(2)
. "";
}
- $display[] = PHP_EOL . $this->_t(1)
+ $display[] = PHP_EOL . Indent::_(1)
. "";
- $display[] = $this->_t(1) . "";
+ $display[] = Indent::_(1) . "";
}
$display[] = "";
@@ -23436,12 +21552,9 @@ class Interpretation extends Fields
public function addCustomDashboardIcons(&$view, &$counter)
{
$icon = '';
- if (isset($this->componentData->custom_admin_views)
- && ArrayHelper::check(
- $this->componentData->custom_admin_views
- ))
+ if (CFactory::_('Component')->isArray('custom_admin_views'))
{
- foreach ($this->componentData->custom_admin_views as $nr => $menu)
+ foreach (CFactory::_('Component')->get('custom_admin_views') as $nr => $menu)
{
if (!isset($this->customAdminAdded[$menu['settings']->code])
&& isset($menu['dashboard_list'])
@@ -23467,7 +21580,7 @@ class Interpretation extends Fields
$langKey = $this->langPrefix . '_DASHBOARD_'
. $menu['settings']->CODE;
// add to lang
- $this->setLangContent($this->lang, $langKey, $langName);
+ CFactory::_('Language')->set(CFactory::_('Config')->lang_target, $langKey, $langName);
// set icon
if ($counter == 0)
{
@@ -23504,7 +21617,7 @@ class Interpretation extends Fields
$langKey = $this->langPrefix . '_DASHBOARD_'
. $menu['settings']->CODE;
// add to lang
- $this->setLangContent($this->lang, $langKey, $langName);
+ CFactory::_('Language')->set(CFactory::_('Config')->lang_target, $langKey, $langName);
// set icon
$this->lastCustomDashboardIcon[$nr] = ", '" . $type
. $menu['settings']->code . "'";
@@ -23512,12 +21625,9 @@ class Interpretation extends Fields
}
}
// see if we should have custom menus
- if (isset($this->componentData->custommenus)
- && ArrayHelper::check(
- $this->componentData->custommenus
- ))
+ if (CFactory::_('Component')->isArray('custommenus'))
{
- foreach ($this->componentData->custommenus as $nr => $menu)
+ foreach (CFactory::_('Component')->get('custommenus') as $nr => $menu)
{
$nr = $nr + 100;
$nameList = StringHelper::safe(
@@ -23547,7 +21657,7 @@ class Interpretation extends Fields
$langName = $menu['name'] . '
';
$langKey = $this->langPrefix . '_DASHBOARD_' . $nameUpper;
// add to lang
- $this->setLangContent($this->lang, $langKey, $langName);
+ CFactory::_('Language')->set(CFactory::_('Config')->lang_target, $langKey, $langName);
// if this is a link build the icon values with pipe
if (isset($menu['link'])
@@ -23603,7 +21713,7 @@ class Interpretation extends Fields
$langName = $menu['name'] . '
';
$langKey = $this->langPrefix . '_DASHBOARD_' . $nameUpper;
// add to lang
- $this->setLangContent($this->lang, $langKey, $langName);
+ CFactory::_('Language')->set(CFactory::_('Config')->lang_target, $langKey, $langName);
// if this is a link build the icon values with pipe
if (isset($menu['link'])
@@ -23628,30 +21738,27 @@ class Interpretation extends Fields
public function setSubMenus()
{
- if (isset($this->componentData->admin_views)
- && ArrayHelper::check(
- $this->componentData->admin_views
- ))
+ if (CFactory::_('Component')->isArray('admin_views'))
{
$menus = '';
// main lang prefix
$lang = $this->langPrefix . '_SUBMENU';
// set the code name
- $codeName = $this->componentCodeName;
+ $codeName = CFactory::_('Config')->component_code_name;
// set default dashboard
- if (!StringHelper::check($this->dynamicDashboard))
+ if (!CFactory::_('Registry')->get('build.dashboard'))
{
$menus .= "JHtmlSidebar::addEntry(JText:" . ":_('" . $lang
. "_DASHBOARD'), 'index.php?option=com_" . $codeName
. "&view=" . $codeName . "', \$submenu === '" . $codeName
. "');";
- $this->setLangContent(
- $this->lang, $lang . '_DASHBOARD', 'Dashboard'
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_DASHBOARD', 'Dashboard'
);
}
$catArray = array();
// loop over all the admin views
- foreach ($this->componentData->admin_views as $view)
+ foreach (CFactory::_('Component')->get('admin_views') as $view)
{
// set custom menu
$menus .= $this->addCustomSubMenu(
@@ -23667,67 +21774,41 @@ class Interpretation extends Fields
{
// setup access defaults
$tab = "";
- $coreLoad = false;
- if (isset($this->permissionCore[$nameSingleCode]))
- {
- $core = $this->permissionCore[$nameSingleCode];
- $coreLoad = true;
- }
// check if the item has permissions.
- if ($coreLoad && isset($core['core.access'])
- && isset($this->permissionBuilder['global'][$core['core.access']])
- && ArrayHelper::check(
- $this->permissionBuilder['global'][$core['core.access']]
- )
- && in_array(
- $nameSingleCode,
- $this->permissionBuilder['global'][$core['core.access']]
- ))
+ if (CFactory::_('Compiler.Creator.Permission')->globalExist($nameSingleCode, 'core.access'))
{
- $menus .= PHP_EOL . $this->_t(2)
- . "if (\$user->authorise('" . $core['core.access']
+ $menus .= PHP_EOL . Indent::_(2)
+ . "if (\$user->authorise('"
+ . CFactory::_('Compiler.Creator.Permission')->getGlobal($nameSingleCode, 'core.access')
. "', 'com_" . $codeName
. "') && \$user->authorise('" . $nameSingleCode
. ".submenu', 'com_" . $codeName . "'))";
- $menus .= PHP_EOL . $this->_t(2) . "{";
+ $menus .= PHP_EOL . Indent::_(2) . "{";
// add tab to lines to follow
- $tab = $this->_t(1);
+ $tab = Indent::_(1);
}
- $menus .= PHP_EOL . $this->_t(2) . $tab
+ $menus .= PHP_EOL . Indent::_(2) . $tab
. "JHtmlSidebar::addEntry(JText:" . ":_('" . $lang . "_"
. $nameUpper . "'), 'index.php?option=com_" . $codeName
. "&view=" . $nameListCode . "', \$submenu === '"
. $nameListCode . "');";
- $this->setLangContent(
- $this->lang, $lang . "_" . $nameUpper,
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . "_" . $nameUpper,
$view['settings']->name_list
);
// check if category has another name
- if (isset($this->catOtherName[$nameListCode])
- && ArrayHelper::check(
- $this->catOtherName[$nameListCode]
- ))
- {
- $otherViews
- = $this->catOtherName[$nameListCode]['views'];
- }
- else
- {
- $otherViews = $nameListCode;
- }
+ $otherViews = CFactory::_('Compiler.Builder.Category.Other.Name')->
+ get($nameListCode . '.views', $nameListCode);
// first check if category sub-menu should be added
// then check if view has category, if true add sub-menu for it
if ($view['settings']->add_category_submenu == 1
- && isset($this->categoryBuilder[$nameListCode])
- && ArrayHelper::check(
- $this->categoryBuilder[$nameListCode]
- )
+ && CFactory::_('Compiler.Builder.Category')->exists("{$nameListCode}.extension")
&& !in_array($otherViews, $catArray))
{
// get the extension array
$_extension_array = (array) explode(
'.',
- $this->categoryBuilder[$nameListCode]['extension']
+ (string) CFactory::_('Compiler.Builder.Category')->get("{$nameListCode}.extension")
);
// set the menu selection
if (isset($_extension_array[1]))
@@ -23739,55 +21820,47 @@ class Interpretation extends Fields
$_menu = "categories";
}
// now load the menus
- $menus .= PHP_EOL . $this->_t(2) . $tab
+ $menus .= PHP_EOL . Indent::_(2) . $tab
. "JHtmlSidebar::addEntry(JText:" . ":_('"
- . $this->categoryBuilder[$nameListCode]['name']
+ . CFactory::_('Compiler.Builder.Category')->get("{$nameListCode}.name", 'error')
. "'), 'index.php?option=com_categories&view=categories&extension="
- . $this->categoryBuilder[$nameListCode]['extension']
+ . CFactory::_('Compiler.Builder.Category')->get("{$nameListCode}.extension")
. "', \$submenu === '" . $_menu . "');";
// make sure we add a category only once
$catArray[] = $otherViews;
}
// check if the item has permissions.
- if ($coreLoad && isset($core['core.access'])
- && isset($this->permissionBuilder['global'][$core['core.access']])
- && ArrayHelper::check(
- $this->permissionBuilder['global'][$core['core.access']]
- )
- && in_array(
- $nameSingleCode,
- $this->permissionBuilder['global'][$core['core.access']]
- ))
+ if (CFactory::_('Compiler.Creator.Permission')->getGlobal($nameSingleCode, 'core.access'))
{
- $menus .= PHP_EOL . $this->_t(2) . "}";
+ $menus .= PHP_EOL . Indent::_(2) . "}";
}
}
// set the Joomla custom fields options
if (isset($view['joomla_fields'])
&& $view['joomla_fields'] == 1)
{
- $menus .= PHP_EOL . $this->_t(2)
+ $menus .= PHP_EOL . Indent::_(2)
. "if (JComponentHelper::isEnabled('com_fields'))";
- $menus .= PHP_EOL . $this->_t(2) . "{";
- $menus .= PHP_EOL . $this->_t(3)
+ $menus .= PHP_EOL . Indent::_(2) . "{";
+ $menus .= PHP_EOL . Indent::_(3)
. "JHtmlSidebar::addEntry(JText:" . ":_('" . $lang . "_"
. $nameUpper
. "_FIELDS'), 'index.php?option=com_fields&context=com_"
. $codeName . "." . $nameSingleCode
. "', \$submenu === 'fields.fields');";
- $menus .= PHP_EOL . $this->_t(3)
+ $menus .= PHP_EOL . Indent::_(3)
. "JHtmlSidebar::addEntry(JText:" . ":_('" . $lang . "_"
. $nameUpper
. "_FIELDS_GROUPS'), 'index.php?option=com_fields&view=groups&context=com_"
. $codeName . "." . $nameSingleCode
. "', \$submenu === 'fields.groups');";
- $menus .= PHP_EOL . $this->_t(2) . "}";
- $this->setLangContent(
- $this->lang, $lang . "_" . $nameUpper . "_FIELDS",
+ $menus .= PHP_EOL . Indent::_(2) . "}";
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . "_" . $nameUpper . "_FIELDS",
$view['settings']->name_list . ' Fields'
);
- $this->setLangContent(
- $this->lang,
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target,
$lang . "_" . $nameUpper . "_FIELDS_GROUPS",
$view['settings']->name_list . ' Field Groups'
);
@@ -23795,7 +21868,7 @@ class Interpretation extends Fields
$this->uninstallScriptBuilder[$nameSingleCode] = 'com_'
. $codeName . '.' . $nameSingleCode;
$this->uninstallScriptFields[$nameSingleCode]
- = $nameSingleCode;
+ = $nameSingleCode;
}
}
if (isset($this->lastCustomSubMenu)
@@ -23818,12 +21891,9 @@ class Interpretation extends Fields
{
// see if we should have custom menus
$custom = '';
- if (isset($this->componentData->custom_admin_views)
- && ArrayHelper::check(
- $this->componentData->custom_admin_views
- ))
+ if (CFactory::_('Component')->isArray('custom_admin_views'))
{
- foreach ($this->componentData->custom_admin_views as $nr => $menu)
+ foreach (CFactory::_('Component')->get('custom_admin_views') as $nr => $menu)
{
if (!isset($this->customAdminAdded[$menu['settings']->code]))
{
@@ -23836,12 +21906,9 @@ class Interpretation extends Fields
}
}
}
- if (isset($this->componentData->custommenus)
- && ArrayHelper::check(
- $this->componentData->custommenus
- ))
+ if (CFactory::_('Component')->isArray('custommenus'))
{
- foreach ($this->componentData->custommenus as $nr => $menu)
+ foreach (CFactory::_('Component')->get('custommenus') as $nr => $menu)
{
if (($_custom = $this->setCustomAdminSubMenu(
$view, $codeName, $lang, $nr, $menu, 'customMenu'
@@ -23880,47 +21947,32 @@ class Interpretation extends Fields
{
// setup access defaults
$tab = "";
-
- $coreLoad = false;
- if (isset($this->permissionCore[$nameSingle]))
- {
- $core = $this->permissionCore[$nameSingle];
- $coreLoad = true;
- }
$custom = '';
// check if the item has permissions.
- if ($coreLoad && isset($core['core.access'])
- && isset($this->permissionBuilder['global'][$core['core.access']])
- && ArrayHelper::check(
- $this->permissionBuilder['global'][$core['core.access']]
- )
- && in_array(
- $nameSingle,
- $this->permissionBuilder['global'][$core['core.access']]
- ))
+ if (CFactory::_('Compiler.Creator.Permission')->globalExist($nameSingle, 'core.access'))
{
- $custom .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(
- __LINE__
- ) . " Access control (" . $core['core.access'] . " && "
+ $custom .= PHP_EOL . Indent::_(2) . "//" . Line::_(
+ __LINE__,__CLASS__
+ ) . " Access control (" . CFactory::_('Compiler.Creator.Permission')->getGlobal($nameSingle, 'core.access') . " && "
. $nameSingle . ".submenu).";
- $custom .= PHP_EOL . $this->_t(2) . "if (\$user->authorise('"
- . $core['core.access'] . "', 'com_" . $codeName
+ $custom .= PHP_EOL . Indent::_(2) . "if (\$user->authorise('"
+ . CFactory::_('Compiler.Creator.Permission')->getGlobal($nameSingle, 'core.access') . "', 'com_" . $codeName
. "') && \$user->authorise('" . $nameSingle
. ".submenu', 'com_" . $codeName . "'))";
- $custom .= PHP_EOL . $this->_t(2) . "{";
+ $custom .= PHP_EOL . Indent::_(2) . "{";
// add tab to lines to follow
- $tab = $this->_t(1);
+ $tab = Indent::_(1);
}
else
{
- $custom .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(
- __LINE__
+ $custom .= PHP_EOL . Indent::_(2) . "//" . Line::_(
+ __LINE__,__CLASS__
) . " Access control (" . $nameSingle . ".submenu).";
- $custom .= PHP_EOL . $this->_t(2) . "if (\$user->authorise('"
+ $custom .= PHP_EOL . Indent::_(2) . "if (\$user->authorise('"
. $nameSingle . ".submenu', 'com_" . $codeName . "'))";
- $custom .= PHP_EOL . $this->_t(2) . "{";
+ $custom .= PHP_EOL . Indent::_(2) . "{";
// add tab to lines to follow
- $tab = $this->_t(1);
+ $tab = Indent::_(1);
}
if (isset($menu['link'])
&& StringHelper::check(
@@ -23928,29 +21980,29 @@ class Interpretation extends Fields
))
{
- $this->setLangContent(
- $this->lang, $lang . '_' . $nameUpper, $name
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_' . $nameUpper, $name
);
// add custom menu
- $custom .= PHP_EOL . $this->_t(2) . $tab
+ $custom .= PHP_EOL . Indent::_(2) . $tab
. "JHtmlSidebar::addEntry(JText:" . ":_('" . $lang . "_"
. $nameUpper . "'), '" . $menu['link']
. "', \$submenu === '" . $nameList . "');";
}
else
{
- $this->setLangContent(
- $this->lang, $lang . '_' . $nameUpper, $name
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_' . $nameUpper, $name
);
// add custom menu
- $custom .= PHP_EOL . $this->_t(2) . $tab
+ $custom .= PHP_EOL . Indent::_(2) . $tab
. "JHtmlSidebar::addEntry(JText:" . ":_('" . $lang . "_"
. $nameUpper . "'), 'index.php?option=com_" . $codeName
. "&view=" . $nameList . "', \$submenu === '" . $nameList
. "');";
}
// check if the item has permissions.
- $custom .= PHP_EOL . $this->_t(2) . "}";
+ $custom .= PHP_EOL . Indent::_(2) . "}";
return $custom;
}
@@ -23960,69 +22012,55 @@ class Interpretation extends Fields
// setup access defaults
$tab = "";
$nameSingle = StringHelper::safe($name);
- $coreLoad = false;
- if (isset($this->permissionCore[$nameSingle]))
- {
- $core = $this->permissionCore[$nameSingle];
- $coreLoad = true;
- }
$this->lastCustomSubMenu[$nr] = '';
// check if the item has permissions.
- if ($coreLoad && isset($core['core.access'])
- && isset($this->permissionBuilder['global'][$core['core.access']])
- && ArrayHelper::check(
- $this->permissionBuilder['global'][$core['core.access']]
- )
- && in_array(
- $nameSingle,
- $this->permissionBuilder['global'][$core['core.access']]
- ))
+ if (CFactory::_('Compiler.Creator.Permission')->globalExist($nameSingle, 'core.access'))
{
- $this->lastCustomSubMenu[$nr] .= PHP_EOL . $this->_t(2)
- . "if (\$user->authorise('" . $core['core.access']
+ $this->lastCustomSubMenu[$nr] .= PHP_EOL . Indent::_(2)
+ . "if (\$user->authorise('" . CFactory::_('Compiler.Creator.Permission')->getGlobal($nameSingle, 'core.access')
. "', 'com_" . $codeName . "') && \$user->authorise('"
. $nameSingle . ".submenu', 'com_" . $codeName . "'))";
- $this->lastCustomSubMenu[$nr] .= PHP_EOL . $this->_t(2) . "{";
+ $this->lastCustomSubMenu[$nr] .= PHP_EOL . Indent::_(2) . "{";
// add tab to lines to follow
- $tab = $this->_t(1);
+ $tab = Indent::_(1);
}
else
{
- $this->lastCustomSubMenu[$nr] .= PHP_EOL . $this->_t(2)
+ $this->lastCustomSubMenu[$nr] .= PHP_EOL . Indent::_(2)
. "if (\$user->authorise('" . $nameSingle
. ".submenu', 'com_" . $codeName . "'))";
- $this->lastCustomSubMenu[$nr] .= PHP_EOL . $this->_t(2) . "{";
+ $this->lastCustomSubMenu[$nr] .= PHP_EOL . Indent::_(2) . "{";
// add tab to lines to follow
- $tab = $this->_t(1);
+ $tab = Indent::_(1);
}
if (isset($menu['link'])
&& StringHelper::check(
$menu['link']
))
{
- $this->setLangContent(
- $this->lang, $lang . '_' . $nameUpper, $name
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_' . $nameUpper, $name
);
// add custom menu
- $this->lastCustomSubMenu[$nr] .= PHP_EOL . $this->_t(2) . $tab
+ $this->lastCustomSubMenu[$nr] .= PHP_EOL . Indent::_(2) . $tab
. "JHtmlSidebar::addEntry(JText:" . ":_('" . $lang . "_"
. $nameUpper . "'), '" . $menu['link']
. "', \$submenu === '" . $nameList . "');";
}
else
{
- $this->setLangContent(
- $this->lang, $lang . '_' . $nameUpper, $name
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_' . $nameUpper, $name
);
// add custom menu
- $this->lastCustomSubMenu[$nr] .= PHP_EOL . $this->_t(2) . $tab
+ $this->lastCustomSubMenu[$nr] .= PHP_EOL . Indent::_(2) . $tab
. "JHtmlSidebar::addEntry(JText:" . ":_('" . $lang . "_"
. $nameUpper . "'), 'index.php?option=com_" . $codeName
. "&view=" . $nameList . "', \$submenu === '" . $nameList
. "');";
}
// check if the item has permissions.
- $this->lastCustomSubMenu[$nr] .= PHP_EOL . $this->_t(2) . "}";
+ $this->lastCustomSubMenu[$nr] .= PHP_EOL . Indent::_(2) . "}";
}
return false;
@@ -24030,32 +22068,23 @@ class Interpretation extends Fields
public function setMainMenus()
{
- if (isset($this->componentData->admin_views)
- && ArrayHelper::check(
- $this->componentData->admin_views
- ))
+ if (CFactory::_('Component')->isArray('admin_views'))
{
$menus = '';
// main lang prefix
$lang = $this->langPrefix . '_MENU';
// set the code name
- $codeName = $this->componentCodeName;
+ $codeName = CFactory::_('Config')->component_code_name;
// default prefix is none
$prefix = '';
// check if local is set
- if (isset($this->componentData->add_menu_prefix)
- && is_numeric(
- $this->componentData->add_menu_prefix
- ))
+ if (CFactory::_('Component')->isNumeric('add_menu_prefix'))
{
// set main menu prefix switch
- $addPrefix = $this->componentData->add_menu_prefix;
- if ($addPrefix == 1 && isset($this->componentData->menu_prefix)
- && StringHelper::check(
- $this->componentData->menu_prefix
- ))
+ $addPrefix = CFactory::_('Component')->get('add_menu_prefix');
+ if ($addPrefix == 1 && CFactory::_('Component')->isString('menu_prefix'))
{
- $prefix = trim($this->componentData->menu_prefix) . ' ';
+ $prefix = trim((string) CFactory::_('Component')->get('menu_prefix')) . ' ';
}
}
else
@@ -24064,25 +22093,25 @@ class Interpretation extends Fields
$addPrefix = $this->params->get('add_menu_prefix', 1);
if ($addPrefix == 1)
{
- $prefix = trim($this->params->get('menu_prefix', '»'))
+ $prefix = trim((string) $this->params->get('menu_prefix', '»'))
. ' ';
}
}
// add the prefix
if ($addPrefix == 1)
{
- $this->setLangContent(
- 'adminsys', $lang, $prefix . $this->componentData->name
+ CFactory::_('Language')->set(
+ 'adminsys', $lang, $prefix . CFactory::_('Component')->get('name')
);
}
else
{
- $this->setLangContent(
- 'adminsys', $lang, $this->componentData->name
+ CFactory::_('Language')->set(
+ 'adminsys', $lang, CFactory::_('Component')->get('name')
);
}
// loop over the admin views
- foreach ($this->componentData->admin_views as $view)
+ foreach (CFactory::_('Component')->get('admin_views') as $view)
{
// set custom menu
$menus .= $this->addCustomMainMenu($view, $codeName, $lang);
@@ -24094,10 +22123,10 @@ class Interpretation extends Fields
$nameUpper = StringHelper::safe(
$view['settings']->name_list, 'U'
);
- $menus .= PHP_EOL . $this->_t(3) . '';
- $this->setLangContent(
+ CFactory::_('Language')->set(
'adminsys', $lang . '_' . $nameUpper,
$view['settings']->name_list
);
@@ -24125,24 +22154,21 @@ class Interpretation extends Fields
{
$customMenu = '';
// see if we should have custom admin views
- if (isset($this->componentData->custom_admin_views)
- && ArrayHelper::check(
- $this->componentData->custom_admin_views
- ))
+ if (CFactory::_('Component')->isArray('custom_admin_views'))
{
- foreach ($this->componentData->custom_admin_views as $nr => $menu)
+ foreach (CFactory::_('Component')->get('custom_admin_views') as $nr => $menu)
{
if (!isset($this->customAdminAdded[$menu['settings']->code]))
{
if (isset($menu['mainmenu']) && $menu['mainmenu'] == 1
&& $view['adminview'] == $menu['before'])
{
- $this->setLangContent(
+ CFactory::_('Language')->set(
'adminsys', $lang . '_' . $menu['settings']->CODE,
$menu['settings']->name
);
// add custom menu
- $customMenu .= PHP_EOL . $this->_t(3)
+ $customMenu .= PHP_EOL . Indent::_(3)
. '';
@@ -24150,12 +22176,12 @@ class Interpretation extends Fields
elseif (isset($menu['mainmenu']) && $menu['mainmenu'] == 1
&& empty($menu['before']))
{
- $this->setLangContent(
+ CFactory::_('Language')->set(
'adminsys', $lang . '_' . $menu['settings']->CODE,
$menu['settings']->name
);
// add custom menu
- $this->lastCustomMainMenu[$nr] = PHP_EOL . $this->_t(3)
+ $this->lastCustomMainMenu[$nr] = PHP_EOL . Indent::_(3)
. '';
@@ -24164,12 +22190,9 @@ class Interpretation extends Fields
}
}
// see if we should have custom menus
- if (isset($this->componentData->custommenus)
- && ArrayHelper::check(
- $this->componentData->custommenus
- ))
+ if (CFactory::_('Component')->isArray('custommenus'))
{
- foreach ($this->componentData->custommenus as $nr => $menu)
+ foreach (CFactory::_('Component')->get('custommenus') as $nr => $menu)
{
$nr = $nr + 100;
if (isset($menu['mainmenu']) && $menu['mainmenu'] == 1
@@ -24184,14 +22207,14 @@ class Interpretation extends Fields
$nameUpper = StringHelper::safe(
$menu['name'], 'U'
);
- $this->setLangContent(
+ CFactory::_('Language')->set(
'adminsys', $lang . '_' . $nameUpper, $menu['name']
);
// sanitize url
- if (strpos($menu['link'], 'http') === false)
+ if (strpos((string) $menu['link'], 'http') === false)
{
$menu['link'] = str_replace(
- '/administrator/index.php?', '', $menu['link']
+ '/administrator/index.php?', '', (string) $menu['link']
);
$menu['link'] = str_replace(
'administrator/index.php?', '', $menu['link']
@@ -24209,10 +22232,10 @@ class Interpretation extends Fields
}
// urlencode
$menu['link'] = htmlspecialchars(
- $menu['link'], ENT_XML1, 'UTF-8'
+ (string) $menu['link'], ENT_XML1, 'UTF-8'
);
// add custom menu
- $customMenu .= PHP_EOL . $this->_t(3) . '';
}
@@ -24224,11 +22247,11 @@ class Interpretation extends Fields
$nameUpper = StringHelper::safe(
$menu['name_code'], 'U'
);
- $this->setLangContent(
+ CFactory::_('Language')->set(
'adminsys', $lang . '_' . $nameUpper, $menu['name']
);
// add custom menu
- $customMenu .= PHP_EOL . $this->_t(3)
+ $customMenu .= PHP_EOL . Indent::_(3)
. '';
@@ -24246,14 +22269,14 @@ class Interpretation extends Fields
$nameUpper = StringHelper::safe(
$menu['name'], 'U'
);
- $this->setLangContent(
+ CFactory::_('Language')->set(
'adminsys', $lang . '_' . $nameUpper, $menu['name']
);
// sanitize url
- if (strpos($menu['link'], 'http') === false)
+ if (strpos((string) $menu['link'], 'http') === false)
{
$menu['link'] = str_replace(
- '/administrator/index.php?', '', $menu['link']
+ '/administrator/index.php?', '', (string) $menu['link']
);
$menu['link'] = str_replace(
'administrator/index.php?', '', $menu['link']
@@ -24271,10 +22294,10 @@ class Interpretation extends Fields
}
// urlencode
$menu['link'] = htmlspecialchars(
- $menu['link'], ENT_XML1, 'UTF-8'
+ (string) $menu['link'], ENT_XML1, 'UTF-8'
);
// add custom menu
- $this->lastCustomMainMenu[$nr] = PHP_EOL . $this->_t(3)
+ $this->lastCustomMainMenu[$nr] = PHP_EOL . Indent::_(3)
. '';
}
@@ -24286,11 +22309,11 @@ class Interpretation extends Fields
$nameUpper = StringHelper::safe(
$menu['name_code'], 'U'
);
- $this->setLangContent(
+ CFactory::_('Language')->set(
'adminsys', $lang . '_' . $nameUpper, $menu['name']
);
// add custom menu
- $this->lastCustomMainMenu[$nr] = PHP_EOL . $this->_t(3)
+ $this->lastCustomMainMenu[$nr] = PHP_EOL . Indent::_(3)
. '';
@@ -24306,86 +22329,79 @@ class Interpretation extends Fields
{
// main lang prefix
$lang = $this->langPrefix . '_CONFIG';
+ // for plugin event TODO change event api signatures
+ $component_context = CFactory::_('Config')->component_context;
if (1 == $timer) // this is before the admin views are build
{
// start loading Global params
$autorName = StringHelper::html(
- $this->componentData->author
+ CFactory::_('Component')->get('author')
);
$autorEmail = StringHelper::html(
- $this->componentData->email
+ CFactory::_('Component')->get('email')
);
$this->extensionsParams[] = '"autorName":"' . $autorName
. '","autorEmail":"' . $autorEmail . '"';
// set the custom fields
- if (isset($this->componentData->config)
- && ArrayHelper::check(
- $this->componentData->config
- ))
+ if (CFactory::_('Component')->isArray('config'))
{
// set component code name
- $component = $this->componentCodeName;
+ $component = CFactory::_('Config')->component_code_name;
$nameSingleCode = 'config';
$nameListCode = 'configs';
// set place holders
$placeholders = array();
- $placeholders[$this->hhh . 'component' . $this->hhh]
- = $this->componentCodeName;
- $placeholders[$this->hhh . 'Component' . $this->hhh]
- = StringHelper::safe(
- $this->componentData->name_code, 'F'
+ $placeholders[Placefix::_h('component')]
+ = CFactory::_('Config')->component_code_name;
+ $placeholders[Placefix::_h('Component')]
+ = StringHelper::safe(
+ CFactory::_('Component')->get('name_code'), 'F'
);
- $placeholders[$this->hhh . 'COMPONENT' . $this->hhh]
- = StringHelper::safe(
- $this->componentData->name_code, 'U'
+ $placeholders[Placefix::_h('COMPONENT')]
+ = StringHelper::safe(
+ CFactory::_('Component')->get('name_code'), 'U'
);
- $placeholders[$this->hhh . 'view' . $this->hhh]
- = $nameSingleCode;
- $placeholders[$this->hhh . 'views' . $this->hhh]
- = $nameListCode;
- $placeholders[$this->bbb . 'component' . $this->ddd]
- = $this->componentCodeName;
- $placeholders[$this->bbb . 'Component' . $this->ddd]
- = $placeholders[$this->hhh . 'Component'
- . $this->hhh];
- $placeholders[$this->bbb . 'COMPONENT' . $this->ddd]
- = $placeholders[$this->hhh . 'COMPONENT'
- . $this->hhh];
- $placeholders[$this->bbb . 'view' . $this->ddd]
- = $nameSingleCode;
- $placeholders[$this->bbb . 'views' . $this->ddd]
- = $nameListCode;
+ $placeholders[Placefix::_h('view')]
+ = $nameSingleCode;
+ $placeholders[Placefix::_h('views')]
+ = $nameListCode;
+ $placeholders[Placefix::_('component')]
+ = CFactory::_('Config')->component_code_name;
+ $placeholders[Placefix::_('Component')]
+ = $placeholders[Placefix::_h('Component')];
+ $placeholders[Placefix::_('COMPONENT')]
+ = $placeholders[Placefix::_h('COMPONENT')];
+ $placeholders[Placefix::_('view')]
+ = $nameSingleCode;
+ $placeholders[Placefix::_('views')]
+ = $nameListCode;
// load the global placeholders
- if (ArrayHelper::check(
- $this->globalPlaceholders
- ))
+ foreach (CFactory::_('Component.Placeholder')->get() as $globalPlaceholder => $gloabalValue)
{
- foreach (
- $this->globalPlaceholders as $globalPlaceholder =>
- $gloabalValue
- )
- {
- $placeholders[$globalPlaceholder] = $gloabalValue;
- }
+ $placeholders[$globalPlaceholder] = $gloabalValue;
}
- $view = '';
+ $view = [];
$viewType = 0;
// set the custom table key
$dbkey = 'g';
+ // TODO: change plubin signature
+ $config_ = CFactory::_('Component')->get('config');
// Trigger Event: jcb_ce_onBeforeSetConfigFieldsets
- $this->triggerEvent(
+ CFactory::_('Event')->trigger(
'jcb_ce_onBeforeSetConfigFieldsets',
- array(&$this->componentContext, &$timer,
+ array(&$component_context, &$timer,
&$this->configFieldSets,
&$this->configFieldSetsCustomField,
- &$this->componentData->config,
+ &$config_,
&$this->extensionsParams, &$placeholders)
);
+ // update global values
+ CFactory::_('Component')->set('config', $config_);
// build the config fields
- foreach ($this->componentData->config as $field)
+ foreach ($config_ as $field)
{
// get the xml string
- $xmlField = $this->getFieldXMLString(
+ $xmlField = CFactory::_('Compiler.Creator.Field.As.String')->get(
$field, $view, $viewType, $lang, $nameSingleCode,
$nameListCode, $placeholders, $dbkey, false
);
@@ -24400,13 +22416,13 @@ class Interpretation extends Fields
= $xmlField;
// set global params to db on install
$fieldName = StringHelper::safe(
- $this->setPlaceholders(
+ CFactory::_('Placeholder')->update(
GetHelper::between(
$xmlField, 'name="', '"'
), $placeholders
)
);
- $fieldDefault = $this->setPlaceholders(
+ $fieldDefault = CFactory::_('Placeholder')->update(
GetHelper::between(
$xmlField, 'default="', '"'
), $placeholders
@@ -24417,8 +22433,8 @@ class Interpretation extends Fields
))
{
// add array if found
- if ((strpos($field['custom_value'], '["') !== false)
- && (strpos($field['custom_value'], '"]')
+ if ((strpos((string) $field['custom_value'], '["') !== false)
+ && (strpos((string) $field['custom_value'], '"]')
!== false))
{
// load the Global checkin defautls
@@ -24449,15 +22465,20 @@ class Interpretation extends Fields
}
elseif (2 == $timer) // this is after the admin views are build
{
+ // for plugin event TODO change event api signatures
+ $placeholders = CFactory::_('Placeholder')->active;
+ $config_ = CFactory::_('Component')->get('config');
// Trigger Event: jcb_ce_onBeforeSetConfigFieldsets
- $this->triggerEvent(
+ CFactory::_('Event')->trigger(
'jcb_ce_onBeforeSetConfigFieldsets',
- array(&$this->componentContext, &$timer,
+ array(&$component_context, &$timer,
&$this->configFieldSets,
&$this->configFieldSetsCustomField,
- &$this->componentData->config, &$this->extensionsParams,
- &$this->placeholders)
+ &$config_, &$this->extensionsParams,
+ &$placeholders)
);
+ // update global values
+ CFactory::_('Component')->set('config', $config_);
// these field sets can only be added after admin view is build
$this->setGroupControlConfigFieldsets($lang);
// these can be added anytime really (but looks best after groups
@@ -24468,12 +22489,14 @@ class Interpretation extends Fields
// these are the coustom settings
$this->setCustomControlConfigFieldsets($lang);
}
+ // for plugin event TODO change event api signatures
+ $placeholders = CFactory::_('Placeholder')->active;
// Trigger Event: jcb_ce_onAfterSetConfigFieldsets
- $this->triggerEvent(
+ CFactory::_('Event')->trigger(
'jcb_ce_onAfterSetConfigFieldsets',
- array(&$this->componentContext, &$timer, &$this->configFieldSets,
+ array(&$component_context, &$timer, &$this->configFieldSets,
&$this->configFieldSetsCustomField, &$this->extensionsParams,
- &$this->frontEndParams, &$this->placeholders)
+ &$this->frontEndParams, &$placeholders)
);
}
@@ -24481,13 +22504,10 @@ class Interpretation extends Fields
{
$front_end = array();
// do quick build of front-end views
- if (isset($this->componentData->site_views)
- && ArrayHelper::check(
- $this->componentData->site_views
- ))
+ if (CFactory::_('Component')->isArray('site_views'))
{
// load the names only to link the page params
- foreach ($this->componentData->site_views as $siteView)
+ foreach (CFactory::_('Component')->get('site_views') as $siteView)
{
// now load the view name to the front-end array
$front_end[] = $siteView['settings']->name;
@@ -24510,7 +22530,7 @@ class Interpretation extends Fields
$viewRequest = 'name="' . $tabLower . '_request_id';
foreach ($tabFields as $et => $id_field)
{
- if (strpos($id_field, $viewRequest) !== false)
+ if (strpos((string) $id_field, $viewRequest) !== false)
{
$this->setRequestValues(
$tabLower, $id_field, $viewRequest, 'id',
@@ -24518,7 +22538,7 @@ class Interpretation extends Fields
);
unset($tabFields[$et]);
}
- elseif (strpos($id_field, '_request_id') !== false)
+ elseif (strpos((string) $id_field, '_request_id') !== false)
{
// not loaded to a tab "view" name
$_viewRequest = GetHelper::between(
@@ -24537,7 +22557,7 @@ class Interpretation extends Fields
$viewRequestC = 'name="' . $tabLower . '_request_catid';
foreach ($tabFields as $ci => $catid_field)
{
- if (strpos($catid_field, $viewRequestC) !== false)
+ if (strpos((string) $catid_field, $viewRequestC) !== false)
{
$this->setRequestValues(
@@ -24546,7 +22566,7 @@ class Interpretation extends Fields
);
unset($tabFields[$ci]);
}
- elseif (strpos($catid_field, '_request_catid') !== false)
+ elseif (strpos((string) $catid_field, '_request_catid') !== false)
{
// not loaded to a tab "view" name
$_viewRequestC = GetHelper::between(
@@ -24566,12 +22586,12 @@ class Interpretation extends Fields
$pageSettings = array();
foreach ($tabFields as $ct => $field)
{
- if (strpos($field, $menuSetter) !== false)
+ if (strpos((string) $field, $menuSetter) !== false)
{
// set the values needed to insure route is done correclty
$this->hasMenuGlobal[$tabLower] = $menuSetter;
}
- elseif (strpos($field, '_menu"') !== false)
+ elseif (strpos((string) $field, '_menu"') !== false)
{
// not loaded to a tab "view" name
$_tabLower = GetHelper::between(
@@ -24602,13 +22622,13 @@ class Interpretation extends Fields
// is not having special var
$key = $target;
// update field
- $field = str_replace($search . '"', 'name="' . $key . '"', $field);
+ $field = str_replace($search . '"', 'name="' . $key . '"', (string) $field);
}
else
{
// update field
$field = str_replace(
- $search . $key . '"', 'name="' . $key . '"', $field
+ $search . $key . '"', 'name="' . $key . '"', (string) $field
);
}
if (!isset($this->{$store}[$view]))
@@ -24645,7 +22665,7 @@ class Interpretation extends Fields
{
// remove this display since it is not used in Joomla
$bucket[] = str_replace(
- 'display="config"', '', $tabField
+ 'display="config"', '', (string) $tabField
);
}
}
@@ -24653,19 +22673,19 @@ class Interpretation extends Fields
if (ArrayHelper::check($bucket))
{
// setup lang
- $this->setLangContent(
- $this->lang, $lang . '_' . $tabUpper, $tab
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_' . $tabUpper, $tab
);
// start field set
- $this->configFieldSets[] = $this->_t(1) . "configFieldSets[] = $this->_t(2) . 'name="'
+ $this->configFieldSets[] = Indent::_(1) . "configFieldSets[] = Indent::_(2) . 'name="'
. $tabCode . '"';
- $this->configFieldSets[] = $this->_t(2) . 'label="' . $lang
+ $this->configFieldSets[] = Indent::_(2) . 'label="' . $lang
. '_' . $tabUpper . '">';
// set the fields
$this->configFieldSets[] = implode("", $bucket);
// close field set
- $this->configFieldSets[] = $this->_t(1) . "";
+ $this->configFieldSets[] = Indent::_(1) . "";
}
// remove after loading
unset($this->configFieldSetsCustomField[$tab]);
@@ -24676,42 +22696,39 @@ class Interpretation extends Fields
public function setGroupControlConfigFieldsets($lang)
{
// start loading Group control params if needed
- if (isset($this->setGroupControl)
- && ArrayHelper::check(
- $this->setGroupControl
- ))
+ if (CFactory::_('Compiler.Builder.Field.Group.Control')->isActive())
{
// start building field set for config
- $this->configFieldSets[] = $this->_t(1) . "configFieldSets[] = $this->_t(2) . 'name="group_config"';
- $this->configFieldSets[] = $this->_t(2) . 'label="' . $lang
+ $this->configFieldSets[] = Indent::_(1) . "configFieldSets[] = Indent::_(2) . 'name="group_config"';
+ $this->configFieldSets[] = Indent::_(2) . 'label="' . $lang
. '_GROUPS_LABEL"';
- $this->configFieldSets[] = $this->_t(2) . 'description="' . $lang
+ $this->configFieldSets[] = Indent::_(2) . 'description="' . $lang
. '_GROUPS_DESC">';
// setup lang
- $this->setLangContent(
- $this->lang, $lang . '_GROUPS_LABEL', "Target Groups"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_GROUPS_LABEL', "Target Groups"
);
- $this->setLangContent(
- $this->lang, $lang . '_GROUPS_DESC',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_GROUPS_DESC',
"The Parameters for the targeted groups are set here."
);
- $this->setLangContent(
- $this->lang, $lang . '_TARGET_GROUP_DESC',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_TARGET_GROUP_DESC',
"Set the group/s being targeted by this user type."
);
- foreach ($this->setGroupControl as $selector => $label)
+ foreach (CFactory::_('Compiler.Builder.Field.Group.Control')->allActive() as $selector => $label)
{
- $this->configFieldSets[] = $this->_t(2) . 'configFieldSets[] = $this->_t(3) . 'type="usergroup"';
- $this->configFieldSets[] = $this->_t(3) . 'label="' . $label
+ $this->configFieldSets[] = Indent::_(3) . 'type="usergroup"';
+ $this->configFieldSets[] = Indent::_(3) . 'label="' . $label
. '"';
- $this->configFieldSets[] = $this->_t(3) . 'description="'
+ $this->configFieldSets[] = Indent::_(3) . 'description="'
. $lang . '_TARGET_GROUP_DESC"';
- $this->configFieldSets[] = $this->_t(3) . 'multiple="true"';
- $this->configFieldSets[] = $this->_t(2) . "/>";
+ $this->configFieldSets[] = Indent::_(3) . 'multiple="true"';
+ $this->configFieldSets[] = Indent::_(2) . "/>";
// set params defaults
$this->extensionsParams[] = '"' . $selector . '":["2"]';
}
@@ -24727,7 +22744,7 @@ class Interpretation extends Fields
unset($this->configFieldSetsCustomField['Target Groups']);
}
// close that fieldse
- $this->configFieldSets[] = $this->_t(1) . "";
+ $this->configFieldSets[] = Indent::_(1) . "";
}
}
@@ -24739,120 +22756,120 @@ class Interpretation extends Fields
public function setGlobalConfigFieldsets($lang, $autorName, $autorEmail)
{
// set component name
- $component = $this->componentCodeName;
+ $component = CFactory::_('Config')->component_code_name;
// start building field set for config
$this->configFieldSets[] = 'configFieldSets[] = $this->_t(2)
+ $this->configFieldSets[] = Indent::_(2)
. 'addrulepath="/administrator/components/com_' . $component
. '/models/rules"';
- $this->configFieldSets[] = $this->_t(2)
+ $this->configFieldSets[] = Indent::_(2)
. 'addfieldpath="/administrator/components/com_' . $component
. '/models/fields"';
- $this->configFieldSets[] = $this->_t(2) . 'name="global_config"';
- $this->configFieldSets[] = $this->_t(2) . 'label="' . $lang
+ $this->configFieldSets[] = Indent::_(2) . 'name="global_config"';
+ $this->configFieldSets[] = Indent::_(2) . 'label="' . $lang
. '_GLOBAL_LABEL"';
- $this->configFieldSets[] = $this->_t(2) . 'description="' . $lang
+ $this->configFieldSets[] = Indent::_(2) . 'description="' . $lang
. '_GLOBAL_DESC">';
// setup lang
- $this->setLangContent($this->lang, $lang . '_GLOBAL_LABEL', "Global");
- $this->setLangContent(
- $this->lang, $lang . '_GLOBAL_DESC', "The Global Parameters"
+ CFactory::_('Language')->set(CFactory::_('Config')->lang_target, $lang . '_GLOBAL_LABEL', "Global");
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_GLOBAL_DESC', "The Global Parameters"
);
- // add auto checin if required
- if ($this->addCheckin)
+ // add auto checkin if required
+ if (CFactory::_('Config')->get('add_checkin', false))
{
- $this->configFieldSets[] = $this->_t(2) . "configFieldSets[] = $this->_t(3) . 'name="check_in"';
- $this->configFieldSets[] = $this->_t(3) . 'type="list"';
- $this->configFieldSets[] = $this->_t(3) . 'default="0"';
- $this->configFieldSets[] = $this->_t(3) . 'label="' . $lang
+ $this->configFieldSets[] = Indent::_(2) . "configFieldSets[] = Indent::_(3) . 'name="check_in"';
+ $this->configFieldSets[] = Indent::_(3) . 'type="list"';
+ $this->configFieldSets[] = Indent::_(3) . 'default="0"';
+ $this->configFieldSets[] = Indent::_(3) . 'label="' . $lang
. '_CHECK_TIMER_LABEL"';
- $this->configFieldSets[] = $this->_t(3) . 'description="' . $lang
+ $this->configFieldSets[] = Indent::_(3) . 'description="' . $lang
. '_CHECK_TIMER_DESC">';
- $this->configFieldSets[] = $this->_t(3) . 'configFieldSets[] = $this->_t(4) . 'value="-5 hours">'
+ $this->configFieldSets[] = Indent::_(3) . 'configFieldSets[] = Indent::_(4) . 'value="-5 hours">'
. $lang . '_CHECK_TIMER_OPTION_ONE';
- $this->configFieldSets[] = $this->_t(3) . 'configFieldSets[] = $this->_t(4) . 'value="-12 hours">'
+ $this->configFieldSets[] = Indent::_(3) . 'configFieldSets[] = Indent::_(4) . 'value="-12 hours">'
. $lang . '_CHECK_TIMER_OPTION_TWO';
- $this->configFieldSets[] = $this->_t(3) . 'configFieldSets[] = $this->_t(4) . 'value="-1 day">' . $lang
+ $this->configFieldSets[] = Indent::_(3) . 'configFieldSets[] = Indent::_(4) . 'value="-1 day">' . $lang
. '_CHECK_TIMER_OPTION_THREE';
- $this->configFieldSets[] = $this->_t(3) . 'configFieldSets[] = $this->_t(4) . 'value="-2 day">' . $lang
+ $this->configFieldSets[] = Indent::_(3) . 'configFieldSets[] = Indent::_(4) . 'value="-2 day">' . $lang
. '_CHECK_TIMER_OPTION_FOUR';
- $this->configFieldSets[] = $this->_t(3) . 'configFieldSets[] = $this->_t(4) . 'value="-1 week">' . $lang
+ $this->configFieldSets[] = Indent::_(3) . 'configFieldSets[] = Indent::_(4) . 'value="-1 week">' . $lang
. '_CHECK_TIMER_OPTION_FIVE';
- $this->configFieldSets[] = $this->_t(3) . 'configFieldSets[] = $this->_t(4) . 'value="0">' . $lang
+ $this->configFieldSets[] = Indent::_(3) . 'configFieldSets[] = Indent::_(4) . 'value="0">' . $lang
. '_CHECK_TIMER_OPTION_SIX';
- $this->configFieldSets[] = $this->_t(2) . " ";
- $this->configFieldSets[] = $this->_t(2)
+ $this->configFieldSets[] = Indent::_(2) . "";
+ $this->configFieldSets[] = Indent::_(2)
. 'configFieldSets[] = $this->_t(3) . 'name="save_history"';
- $this->configFieldSets[] = $this->_t(3) . 'type="radio"';
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(2) . "configFieldSets[] = Indent::_(3) . 'name="save_history"';
+ $this->configFieldSets[] = Indent::_(3) . 'type="radio"';
+ $this->configFieldSets[] = Indent::_(3)
. 'class="btn-group btn-group-yesno"';
- $this->configFieldSets[] = $this->_t(3) . 'default="1"';
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3) . 'default="1"';
+ $this->configFieldSets[] = Indent::_(3)
. 'label="JGLOBAL_SAVE_HISTORY_OPTIONS_LABEL"';
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3)
. 'description="JGLOBAL_SAVE_HISTORY_OPTIONS_DESC"';
- $this->configFieldSets[] = $this->_t(3) . ">";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3) . ">";
+ $this->configFieldSets[] = Indent::_(3)
. '';
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3)
. '';
- $this->configFieldSets[] = $this->_t(2) . "";
- $this->configFieldSets[] = $this->_t(2) . "configFieldSets[] = $this->_t(3) . 'name="history_limit"';
- $this->configFieldSets[] = $this->_t(3) . 'type="text"';
- $this->configFieldSets[] = $this->_t(3) . 'filter="integer"';
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(2) . "";
+ $this->configFieldSets[] = Indent::_(2) . "configFieldSets[] = Indent::_(3) . 'name="history_limit"';
+ $this->configFieldSets[] = Indent::_(3) . 'type="text"';
+ $this->configFieldSets[] = Indent::_(3) . 'filter="integer"';
+ $this->configFieldSets[] = Indent::_(3)
. 'label="JGLOBAL_HISTORY_LIMIT_OPTIONS_LABEL"';
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3)
. 'description="JGLOBAL_HISTORY_LIMIT_OPTIONS_DESC"';
- $this->configFieldSets[] = $this->_t(3) . 'default="10"';
- $this->configFieldSets[] = $this->_t(2) . "/>";
- $this->configFieldSets[] = $this->_t(2)
+ $this->configFieldSets[] = Indent::_(3) . 'default="10"';
+ $this->configFieldSets[] = Indent::_(2) . "/>";
+ $this->configFieldSets[] = Indent::_(2)
. 'configFieldSets[] = $this->_t(3) . 'type="spacer"';
- $this->configFieldSets[] = $this->_t(3) . 'label="' . $lang
+ $this->configFieldSets[] = Indent::_(2) . 'configFieldSets[] = Indent::_(3) . 'type="spacer"';
+ $this->configFieldSets[] = Indent::_(3) . 'label="' . $lang
. '_AUTHOR"';
- $this->configFieldSets[] = $this->_t(2) . "/>";
- $this->configFieldSets[] = $this->_t(2) . 'configFieldSets[] = $this->_t(3) . 'type="text"';
- $this->configFieldSets[] = $this->_t(3) . 'label="' . $lang
+ $this->configFieldSets[] = Indent::_(2) . "/>";
+ $this->configFieldSets[] = Indent::_(2) . 'configFieldSets[] = Indent::_(3) . 'type="text"';
+ $this->configFieldSets[] = Indent::_(3) . 'label="' . $lang
. '_AUTHOR_NAME_LABEL"';
- $this->configFieldSets[] = $this->_t(3) . 'description="' . $lang
+ $this->configFieldSets[] = Indent::_(3) . 'description="' . $lang
. '_AUTHOR_NAME_DESC"';
- $this->configFieldSets[] = $this->_t(3) . 'size="60"';
- $this->configFieldSets[] = $this->_t(3) . 'default="' . $autorName
+ $this->configFieldSets[] = Indent::_(3) . 'size="60"';
+ $this->configFieldSets[] = Indent::_(3) . 'default="' . $autorName
. '"';
- $this->configFieldSets[] = $this->_t(3) . 'readonly="true"';
- $this->configFieldSets[] = $this->_t(3) . 'class="readonly"';
- $this->configFieldSets[] = $this->_t(2) . "/>";
- $this->configFieldSets[] = $this->_t(2) . 'configFieldSets[] = $this->_t(3) . 'type="email"';
- $this->configFieldSets[] = $this->_t(3) . 'label="' . $lang
+ $this->configFieldSets[] = Indent::_(3) . 'readonly="true"';
+ $this->configFieldSets[] = Indent::_(3) . 'class="readonly"';
+ $this->configFieldSets[] = Indent::_(2) . "/>";
+ $this->configFieldSets[] = Indent::_(2) . 'configFieldSets[] = Indent::_(3) . 'type="email"';
+ $this->configFieldSets[] = Indent::_(3) . 'label="' . $lang
. '_AUTHOR_EMAIL_LABEL"';
- $this->configFieldSets[] = $this->_t(3) . 'description="' . $lang
+ $this->configFieldSets[] = Indent::_(3) . 'description="' . $lang
. '_AUTHOR_EMAIL_DESC"';
- $this->configFieldSets[] = $this->_t(3) . 'size="60"';
- $this->configFieldSets[] = $this->_t(3) . 'default="' . $autorEmail
+ $this->configFieldSets[] = Indent::_(3) . 'size="60"';
+ $this->configFieldSets[] = Indent::_(3) . 'default="' . $autorEmail
. '"';
- $this->configFieldSets[] = $this->_t(3) . 'readonly="true"';
- $this->configFieldSets[] = $this->_t(3) . 'class="readonly"';
- $this->configFieldSets[] = $this->_t(2) . "/>";
+ $this->configFieldSets[] = Indent::_(3) . 'readonly="true"';
+ $this->configFieldSets[] = Indent::_(3) . 'class="readonly"';
+ $this->configFieldSets[] = Indent::_(2) . "/>";
// setup lang
- $this->setLangContent($this->lang, $lang . '_AUTHOR', "Author Info");
- $this->setLangContent(
- $this->lang, $lang . '_AUTHOR_NAME_LABEL', "Author Name"
+ CFactory::_('Language')->set(CFactory::_('Config')->lang_target, $lang . '_AUTHOR', "Author Info");
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_AUTHOR_NAME_LABEL', "Author Name"
);
- $this->setLangContent(
- $this->lang, $lang . '_AUTHOR_NAME_DESC',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_AUTHOR_NAME_DESC',
"The name of the author of this component."
);
- $this->setLangContent(
- $this->lang, $lang . '_AUTHOR_EMAIL_LABEL', "Author Email"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_AUTHOR_EMAIL_LABEL', "Author Email"
);
- $this->setLangContent(
- $this->lang, $lang . '_AUTHOR_EMAIL_DESC',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_AUTHOR_EMAIL_DESC',
"The email address of the author of this component."
);
// set if contributors were added
$langCont = $lang . '_CONTRIBUTOR';
- if (isset($this->addContributors) && $this->addContributors
- && isset($this->componentData->contributors)
- && ArrayHelper::check(
- $this->componentData->contributors
- ))
+ if (CFactory::_('Config')->get('add_contributors', false)
+ && CFactory::_('Component')->isArray('contributors'))
{
foreach (
- $this->componentData->contributors as $counter => $contributor
+ CFactory::_('Component')->get('contributors') as $counter => $contributor
)
{
// make sure we dont use 0
@@ -24933,115 +22947,115 @@ class Interpretation extends Fields
$COUNTER = StringHelper::safe($counter, 'U');
// set the dynamic values
$cbTitle = htmlspecialchars(
- $contributor['title'], ENT_XML1, 'UTF-8'
+ (string) $contributor['title'], ENT_XML1, 'UTF-8'
);
$cbName = htmlspecialchars(
- $contributor['name'], ENT_XML1, 'UTF-8'
+ (string) $contributor['name'], ENT_XML1, 'UTF-8'
);
$cbEmail = htmlspecialchars(
- $contributor['email'], ENT_XML1, 'UTF-8'
+ (string) $contributor['email'], ENT_XML1, 'UTF-8'
);
$cbWebsite = htmlspecialchars(
- $contributor['website'], ENT_XML1, 'UTF-8'
+ (string) $contributor['website'], ENT_XML1, 'UTF-8'
); // StringHelper::html($contributor['website']);
// load to the $fieldsets
- $this->configFieldSets[] = $this->_t(2)
+ $this->configFieldSets[] = Indent::_(2)
. 'configFieldSets[] = $this->_t(3) . 'type="spacer"';
- $this->configFieldSets[] = $this->_t(3) . 'class="text"';
- $this->configFieldSets[] = $this->_t(3) . 'label="' . $langCont
+ $this->configFieldSets[] = Indent::_(3) . 'type="spacer"';
+ $this->configFieldSets[] = Indent::_(3) . 'class="text"';
+ $this->configFieldSets[] = Indent::_(3) . 'label="' . $langCont
. '_' . $COUNTER . '"';
- $this->configFieldSets[] = $this->_t(2) . "/>";
- $this->configFieldSets[] = $this->_t(2)
+ $this->configFieldSets[] = Indent::_(2) . "/>";
+ $this->configFieldSets[] = Indent::_(2)
. 'configFieldSets[] = $this->_t(3) . 'type="text"';
- $this->configFieldSets[] = $this->_t(3) . 'label="' . $langCont
+ $this->configFieldSets[] = Indent::_(3) . 'type="text"';
+ $this->configFieldSets[] = Indent::_(3) . 'label="' . $langCont
. '_TITLE_LABEL"';
- $this->configFieldSets[] = $this->_t(3) . 'description="'
+ $this->configFieldSets[] = Indent::_(3) . 'description="'
. $langCont . '_TITLE_DESC"';
- $this->configFieldSets[] = $this->_t(3) . 'size="60"';
- $this->configFieldSets[] = $this->_t(3) . 'default="' . $cbTitle
+ $this->configFieldSets[] = Indent::_(3) . 'size="60"';
+ $this->configFieldSets[] = Indent::_(3) . 'default="' . $cbTitle
. '"';
- $this->configFieldSets[] = $this->_t(2) . "/>";
- $this->configFieldSets[] = $this->_t(2)
+ $this->configFieldSets[] = Indent::_(2) . "/>";
+ $this->configFieldSets[] = Indent::_(2)
. 'configFieldSets[] = $this->_t(3) . 'type="text"';
- $this->configFieldSets[] = $this->_t(3) . 'label="' . $langCont
+ $this->configFieldSets[] = Indent::_(3) . 'type="text"';
+ $this->configFieldSets[] = Indent::_(3) . 'label="' . $langCont
. '_NAME_LABEL"';
- $this->configFieldSets[] = $this->_t(3) . 'description="'
+ $this->configFieldSets[] = Indent::_(3) . 'description="'
. $langCont . '_NAME_DESC"';
- $this->configFieldSets[] = $this->_t(3) . 'size="60"';
- $this->configFieldSets[] = $this->_t(3) . 'default="' . $cbName
+ $this->configFieldSets[] = Indent::_(3) . 'size="60"';
+ $this->configFieldSets[] = Indent::_(3) . 'default="' . $cbName
. '"';
- $this->configFieldSets[] = $this->_t(2) . "/>";
- $this->configFieldSets[] = $this->_t(2)
+ $this->configFieldSets[] = Indent::_(2) . "/>";
+ $this->configFieldSets[] = Indent::_(2)
. 'configFieldSets[] = $this->_t(3) . 'type="email"';
- $this->configFieldSets[] = $this->_t(3) . 'label="' . $langCont
+ $this->configFieldSets[] = Indent::_(3) . 'type="email"';
+ $this->configFieldSets[] = Indent::_(3) . 'label="' . $langCont
. '_EMAIL_LABEL"';
- $this->configFieldSets[] = $this->_t(3) . 'description="'
+ $this->configFieldSets[] = Indent::_(3) . 'description="'
. $langCont . '_EMAIL_DESC"';
- $this->configFieldSets[] = $this->_t(3) . 'size="60"';
- $this->configFieldSets[] = $this->_t(3) . 'default="' . $cbEmail
+ $this->configFieldSets[] = Indent::_(3) . 'size="60"';
+ $this->configFieldSets[] = Indent::_(3) . 'default="' . $cbEmail
. '"';
- $this->configFieldSets[] = $this->_t(2) . "/>";
- $this->configFieldSets[] = $this->_t(2)
+ $this->configFieldSets[] = Indent::_(2) . "/>";
+ $this->configFieldSets[] = Indent::_(2)
. 'configFieldSets[] = $this->_t(3) . 'type="url"';
- $this->configFieldSets[] = $this->_t(3) . 'label="' . $langCont
+ $this->configFieldSets[] = Indent::_(3) . 'type="url"';
+ $this->configFieldSets[] = Indent::_(3) . 'label="' . $langCont
. '_LINK_LABEL"';
- $this->configFieldSets[] = $this->_t(3) . 'description="'
+ $this->configFieldSets[] = Indent::_(3) . 'description="'
. $langCont . '_LINK_DESC"';
- $this->configFieldSets[] = $this->_t(3) . 'size="60"';
- $this->configFieldSets[] = $this->_t(3) . 'default="'
+ $this->configFieldSets[] = Indent::_(3) . 'size="60"';
+ $this->configFieldSets[] = Indent::_(3) . 'default="'
. $cbWebsite . '"';
- $this->configFieldSets[] = $this->_t(2) . "/>";
- $this->configFieldSets[] = $this->_t(2)
+ $this->configFieldSets[] = Indent::_(2) . "/>";
+ $this->configFieldSets[] = Indent::_(2)
. 'configFieldSets[] = $this->_t(3) . 'type="list"';
- $this->configFieldSets[] = $this->_t(3) . 'default="'
+ $this->configFieldSets[] = Indent::_(3) . 'type="list"';
+ $this->configFieldSets[] = Indent::_(3) . 'default="'
. (int) $contributor['use'] . '"';
- $this->configFieldSets[] = $this->_t(3) . 'label="' . $langCont
+ $this->configFieldSets[] = Indent::_(3) . 'label="' . $langCont
. '_USE_LABEL"';
- $this->configFieldSets[] = $this->_t(3) . 'description="'
+ $this->configFieldSets[] = Indent::_(3) . 'description="'
. $langCont . '_USE_DESC">';
- $this->configFieldSets[] = $this->_t(3) . '';
- $this->configFieldSets[] = $this->_t(3) . '';
- $this->configFieldSets[] = $this->_t(3) . '';
- $this->configFieldSets[] = $this->_t(2) . " ";
- $this->configFieldSets[] = $this->_t(2)
+ $this->configFieldSets[] = Indent::_(2) . " ";
+ $this->configFieldSets[] = Indent::_(2)
. 'configFieldSets[] = $this->_t(3) . 'type="list"';
- $this->configFieldSets[] = $this->_t(3) . 'default="'
+ $this->configFieldSets[] = Indent::_(3) . 'type="list"';
+ $this->configFieldSets[] = Indent::_(3) . 'default="'
. (int) $contributor['show'] . '"';
- $this->configFieldSets[] = $this->_t(3) . 'label="' . $langCont
+ $this->configFieldSets[] = Indent::_(3) . 'label="' . $langCont
. '_SHOW_LABEL"';
- $this->configFieldSets[] = $this->_t(3) . 'description="'
+ $this->configFieldSets[] = Indent::_(3) . 'description="'
. $langCont . '_SHOW_DESC">';
- $this->configFieldSets[] = $this->_t(3) . '';
- $this->configFieldSets[] = $this->_t(3) . '';
- $this->configFieldSets[] = $this->_t(3) . '';
- $this->configFieldSets[] = $this->_t(3) . '';
- $this->configFieldSets[] = $this->_t(2) . " ";
+ $this->configFieldSets[] = Indent::_(2) . " ";
// add the contributor
- $this->theContributors .= PHP_EOL . $this->_t(1) . "@"
- . strtolower($contributor['title']) . $this->_t(2)
+ $this->theContributors .= PHP_EOL . Indent::_(1) . "@"
+ . strtolower((string) $contributor['title']) . Indent::_(2)
. $contributor['name'] . ' <' . $contributor['website']
. '>';
// setup lang
$Counter = StringHelper::safe($counter, 'Ww');
- $this->setLangContent(
- $this->lang, $langCont . '_' . $COUNTER,
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $langCont . '_' . $COUNTER,
"Contributor " . $Counter
);
// load the Global checkin defautls
@@ -25060,7 +23074,7 @@ class Interpretation extends Fields
}
}
// add more contributors if required
- if (1 == $this->componentData->emptycontributors)
+ if (1 == CFactory::_('Component')->get('emptycontributors', 0))
{
if (isset($counter))
{
@@ -25071,385 +23085,420 @@ class Interpretation extends Fields
{
$min = 1;
}
- $max = $min + $this->componentData->number - 1;
+ $max = $min + CFactory::_('Component')->get('number') - 1;
$moreContributerFields = range($min, $max, 1);
foreach ($moreContributerFields as $counter)
{
$COUNTER = StringHelper::safe($counter, 'U');
- $this->configFieldSets[] = $this->_t(2)
+ $this->configFieldSets[] = Indent::_(2)
. 'configFieldSets[] = $this->_t(3) . 'type="spacer"';
- $this->configFieldSets[] = $this->_t(3) . 'class="text"';
- $this->configFieldSets[] = $this->_t(3) . 'label="' . $langCont
+ $this->configFieldSets[] = Indent::_(3) . 'type="spacer"';
+ $this->configFieldSets[] = Indent::_(3) . 'class="text"';
+ $this->configFieldSets[] = Indent::_(3) . 'label="' . $langCont
. '_' . $COUNTER . '"';
- $this->configFieldSets[] = $this->_t(2) . "/>";
- $this->configFieldSets[] = $this->_t(2)
+ $this->configFieldSets[] = Indent::_(2) . "/>";
+ $this->configFieldSets[] = Indent::_(2)
. 'configFieldSets[] = $this->_t(3) . 'type="text"';
- $this->configFieldSets[] = $this->_t(3) . 'label="' . $langCont
+ $this->configFieldSets[] = Indent::_(3) . 'type="text"';
+ $this->configFieldSets[] = Indent::_(3) . 'label="' . $langCont
. '_TITLE_LABEL"';
- $this->configFieldSets[] = $this->_t(3) . 'description="'
+ $this->configFieldSets[] = Indent::_(3) . 'description="'
. $langCont . '_TITLE_DESC"';
- $this->configFieldSets[] = $this->_t(3) . 'size="60"';
- $this->configFieldSets[] = $this->_t(3) . 'default=""';
- $this->configFieldSets[] = $this->_t(2) . "/>";
- $this->configFieldSets[] = $this->_t(2)
+ $this->configFieldSets[] = Indent::_(3) . 'size="60"';
+ $this->configFieldSets[] = Indent::_(3) . 'default=""';
+ $this->configFieldSets[] = Indent::_(2) . "/>";
+ $this->configFieldSets[] = Indent::_(2)
. 'configFieldSets[] = $this->_t(3) . 'type="text"';
- $this->configFieldSets[] = $this->_t(3) . 'label="' . $langCont
+ $this->configFieldSets[] = Indent::_(3) . 'type="text"';
+ $this->configFieldSets[] = Indent::_(3) . 'label="' . $langCont
. '_NAME_LABEL"';
- $this->configFieldSets[] = $this->_t(3) . 'description="'
+ $this->configFieldSets[] = Indent::_(3) . 'description="'
. $langCont . '_NAME_DESC"';
- $this->configFieldSets[] = $this->_t(3) . 'size="60"';
- $this->configFieldSets[] = $this->_t(3) . 'default=""';
- $this->configFieldSets[] = $this->_t(2) . "/>";
- $this->configFieldSets[] = $this->_t(2)
+ $this->configFieldSets[] = Indent::_(3) . 'size="60"';
+ $this->configFieldSets[] = Indent::_(3) . 'default=""';
+ $this->configFieldSets[] = Indent::_(2) . "/>";
+ $this->configFieldSets[] = Indent::_(2)
. 'configFieldSets[] = $this->_t(3) . 'type="email"';
- $this->configFieldSets[] = $this->_t(3) . 'label="' . $langCont
+ $this->configFieldSets[] = Indent::_(3) . 'type="email"';
+ $this->configFieldSets[] = Indent::_(3) . 'label="' . $langCont
. '_EMAIL_LABEL"';
- $this->configFieldSets[] = $this->_t(3) . 'description="'
+ $this->configFieldSets[] = Indent::_(3) . 'description="'
. $langCont . '_EMAIL_DESC"';
- $this->configFieldSets[] = $this->_t(3) . 'size="60"';
- $this->configFieldSets[] = $this->_t(3) . 'default=""';
- $this->configFieldSets[] = $this->_t(2) . "/>";
- $this->configFieldSets[] = $this->_t(2)
+ $this->configFieldSets[] = Indent::_(3) . 'size="60"';
+ $this->configFieldSets[] = Indent::_(3) . 'default=""';
+ $this->configFieldSets[] = Indent::_(2) . "/>";
+ $this->configFieldSets[] = Indent::_(2)
. 'configFieldSets[] = $this->_t(3) . 'type="url"';
- $this->configFieldSets[] = $this->_t(3) . 'label="' . $langCont
+ $this->configFieldSets[] = Indent::_(3) . 'type="url"';
+ $this->configFieldSets[] = Indent::_(3) . 'label="' . $langCont
. '_LINK_LABEL"';
- $this->configFieldSets[] = $this->_t(3) . 'description="'
+ $this->configFieldSets[] = Indent::_(3) . 'description="'
. $langCont . '_LINK_DESC"';
- $this->configFieldSets[] = $this->_t(3) . 'size="60"';
- $this->configFieldSets[] = $this->_t(3) . 'default=""';
- $this->configFieldSets[] = $this->_t(2) . "/>";
- $this->configFieldSets[] = $this->_t(2)
+ $this->configFieldSets[] = Indent::_(3) . 'size="60"';
+ $this->configFieldSets[] = Indent::_(3) . 'default=""';
+ $this->configFieldSets[] = Indent::_(2) . "/>";
+ $this->configFieldSets[] = Indent::_(2)
. 'configFieldSets[] = $this->_t(3) . 'type="list"';
- $this->configFieldSets[] = $this->_t(3) . 'default="0"';
- $this->configFieldSets[] = $this->_t(3) . 'label="' . $langCont
+ $this->configFieldSets[] = Indent::_(3) . 'type="list"';
+ $this->configFieldSets[] = Indent::_(3) . 'default="0"';
+ $this->configFieldSets[] = Indent::_(3) . 'label="' . $langCont
. '_USE_LABEL"';
- $this->configFieldSets[] = $this->_t(3) . 'description="'
+ $this->configFieldSets[] = Indent::_(3) . 'description="'
. $langCont . '_USE_DESC">';
- $this->configFieldSets[] = $this->_t(3) . '';
- $this->configFieldSets[] = $this->_t(3) . '';
- $this->configFieldSets[] = $this->_t(3) . '';
- $this->configFieldSets[] = $this->_t(2) . " ";
- $this->configFieldSets[] = $this->_t(2)
+ $this->configFieldSets[] = Indent::_(2) . " ";
+ $this->configFieldSets[] = Indent::_(2)
. 'configFieldSets[] = $this->_t(3) . 'type="list"';
- $this->configFieldSets[] = $this->_t(3) . 'default="0"';
- $this->configFieldSets[] = $this->_t(3) . 'label="' . $langCont
+ $this->configFieldSets[] = Indent::_(3) . 'type="list"';
+ $this->configFieldSets[] = Indent::_(3) . 'default="0"';
+ $this->configFieldSets[] = Indent::_(3) . 'label="' . $langCont
. '_SHOW_LABEL"';
- $this->configFieldSets[] = $this->_t(3) . 'description="'
+ $this->configFieldSets[] = Indent::_(3) . 'description="'
. $langCont . '_SHOW_DESC">';
- $this->configFieldSets[] = $this->_t(3) . '';
- $this->configFieldSets[] = $this->_t(3) . '';
- $this->configFieldSets[] = $this->_t(3) . '';
- $this->configFieldSets[] = $this->_t(3) . '';
- $this->configFieldSets[] = $this->_t(2) . " ";
+ $this->configFieldSets[] = Indent::_(2) . " ";
// setup lang
$Counter = StringHelper::safe($counter, 'Ww');
- $this->setLangContent(
- $this->lang, $langCont . '_' . $COUNTER,
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $langCont . '_' . $COUNTER,
"Contributor " . $Counter
);
}
}
- if ($this->addContributors
- || $this->componentData->emptycontributors == 1)
+ if (CFactory::_('Config')->get('add_contributors', false)
+ || CFactory::_('Component')->get('emptycontributors', 0) == 1)
{
// setup lang
- $this->setLangContent(
- $this->lang, $langCont . '_TITLE_LABEL', "Contributor Job Title"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $langCont . '_TITLE_LABEL', "Contributor Job Title"
);
- $this->setLangContent(
- $this->lang, $langCont . '_TITLE_DESC',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $langCont . '_TITLE_DESC',
"The job title that best describes the contributor's relationship to this component."
);
- $this->setLangContent(
- $this->lang, $langCont . '_NAME_LABEL', "Contributor Name"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $langCont . '_NAME_LABEL', "Contributor Name"
);
- $this->setLangContent(
- $this->lang, $langCont . '_NAME_DESC',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $langCont . '_NAME_DESC',
"The name of this contributor."
);
- $this->setLangContent(
- $this->lang, $langCont . '_EMAIL_LABEL', "Contributor Email"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $langCont . '_EMAIL_LABEL', "Contributor Email"
);
- $this->setLangContent(
- $this->lang, $langCont . '_EMAIL_DESC',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $langCont . '_EMAIL_DESC',
"The email of this contributor."
);
- $this->setLangContent(
- $this->lang, $langCont . '_LINK_LABEL', "Contributor Website"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $langCont . '_LINK_LABEL', "Contributor Website"
);
- $this->setLangContent(
- $this->lang, $langCont . '_LINK_DESC',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $langCont . '_LINK_DESC',
"The link to this contributor's website."
);
- $this->setLangContent($this->lang, $langCont . '_USE_LABEL', "Use");
- $this->setLangContent(
- $this->lang, $langCont . '_USE_DESC',
+ CFactory::_('Language')->set(CFactory::_('Config')->lang_target, $langCont . '_USE_LABEL', "Use");
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $langCont . '_USE_DESC',
"How should we link to this contributor."
);
- $this->setLangContent($this->lang, $langCont . '_USE_NONE', "None");
- $this->setLangContent(
- $this->lang, $langCont . '_USE_EMAIL', "Email"
+ CFactory::_('Language')->set(CFactory::_('Config')->lang_target, $langCont . '_USE_NONE', "None");
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $langCont . '_USE_EMAIL', "Email"
);
- $this->setLangContent(
- $this->lang, $langCont . '_USE_WWW', "Website"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $langCont . '_USE_WWW', "Website"
);
- $this->setLangContent(
- $this->lang, $langCont . '_SHOW_LABEL', "Show"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $langCont . '_SHOW_LABEL', "Show"
);
- $this->setLangContent(
- $this->lang, $langCont . '_SHOW_DESC',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $langCont . '_SHOW_DESC',
"Select where you want this contributor's details to show in the component."
);
- $this->setLangContent(
- $this->lang, $langCont . '_SHOW_NONE', "Hide"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $langCont . '_SHOW_NONE', "Hide"
);
- $this->setLangContent(
- $this->lang, $langCont . '_SHOW_BACK', "Back-end"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $langCont . '_SHOW_BACK', "Back-end"
);
- $this->setLangContent(
- $this->lang, $langCont . '_SHOW_FRONT', "Front-end"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $langCont . '_SHOW_FRONT', "Front-end"
);
- $this->setLangContent(
- $this->lang, $langCont . '_SHOW_ALL', "Both Front & Back-end"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $langCont . '_SHOW_ALL', "Both Front & Back-end"
);
}
// close that fieldset
- $this->configFieldSets[] = $this->_t(1) . "";
+ $this->configFieldSets[] = Indent::_(1) . "";
}
public function setUikitConfigFieldsets($lang)
{
- if ($this->uikit > 0)
+ if (CFactory::_('Config')->uikit > 0)
{
// main lang prefix
$lang = $lang . '';
// start building field set for uikit functions
- $this->configFieldSets[] = $this->_t(1) . "configFieldSets[] = $this->_t(2) . 'name="uikit_config"';
- $this->configFieldSets[] = $this->_t(2) . 'label="' . $lang
+ $this->configFieldSets[] = Indent::_(1) . "configFieldSets[] = Indent::_(2) . 'name="uikit_config"';
+ $this->configFieldSets[] = Indent::_(2) . 'label="' . $lang
. '_UIKIT_LABEL"';
- $this->configFieldSets[] = $this->_t(2) . 'description="' . $lang
+ $this->configFieldSets[] = Indent::_(2) . 'description="' . $lang
. '_UIKIT_DESC">';
// set tab lang
- if (1 == $this->uikit)
+ if (1 == CFactory::_('Config')->uikit)
{
- $this->setLangContent(
- $this->lang, $lang . '_UIKIT_LABEL', "Uikit2 Settings"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_UIKIT_LABEL', "Uikit2 Settings"
);
- $this->setLangContent(
- $this->lang, $lang . '_UIKIT_DESC', "The Parameters for the uikit are set here.
Uikit is a lightweight and modular front-end framework
-for developing fast and powerful web interfaces. For more info visit https://getuikit.com/v2/"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_UIKIT_DESC', "The Parameters for the uikit are set here.
Uikit is a lightweight and modular front-end framework
+for developing fast and powerful web interfaces. For more info visit https://getuikit.com/v2/"
);
}
- elseif (2 == $this->uikit)
+ elseif (2 == CFactory::_('Config')->uikit)
{
- $this->setLangContent(
- $this->lang, $lang . '_UIKIT_LABEL',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_UIKIT_LABEL',
"Uikit2 and Uikit3 Settings"
);
- $this->setLangContent(
- $this->lang, $lang . '_UIKIT_DESC', "The Parameters for the uikit are set here.
Uikit is a lightweight and modular front-end framework
-for developing fast and powerful web interfaces. For more info visit version 2 or version 3"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_UIKIT_DESC', "The Parameters for the uikit are set here.
Uikit is a lightweight and modular front-end framework
+for developing fast and powerful web interfaces. For more info visit version 2 or version 3"
);
}
- elseif (3 == $this->uikit)
+ elseif (3 == CFactory::_('Config')->uikit)
{
- $this->setLangContent(
- $this->lang, $lang . '_UIKIT_LABEL', "Uikit3 Settings"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_UIKIT_LABEL', "Uikit3 Settings"
);
- $this->setLangContent(
- $this->lang, $lang . '_UIKIT_DESC', "The Parameters for the uikit are set here.
Uikit is a lightweight and modular front-end framework
-for developing fast and powerful web interfaces. For more info visit https://getuikit.com/"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_UIKIT_DESC', "The Parameters for the uikit are set here.
Uikit is a lightweight and modular front-end framework
+for developing fast and powerful web interfaces. For more info visit https://getuikit.com/"
);
}
+ // set field lang
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_JQUERY_LOAD_LABEL', "Load Joomla jQuery"
+ );
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_JQUERY_LOAD_DESC',
+ "Would you like to load the Joomla jQuery Framework?"
+ );
+ CFactory::_('Language')->set(CFactory::_('Config')->lang_target, $lang . '_JQUERY_LOAD', "Load jQuery");
+ CFactory::_('Language')->set(CFactory::_('Config')->lang_target, $lang . '_JQUERY_REMOVE', "Remove jQuery");
+
+ // set the field
+ $this->configFieldSets[] = Indent::_(2)
+ . 'configFieldSets[] = Indent::_(3) . 'type="radio"';
+ $this->configFieldSets[] = Indent::_(3) . 'label="' . $lang
+ . '_JQUERY_LOAD_LABEL"';
+ $this->configFieldSets[] = Indent::_(3) . 'description="' . $lang
+ . '_JQUERY_LOAD_DESC"';
+ $this->configFieldSets[] = Indent::_(3)
+ . 'class="btn-group btn-group-yesno"';
+ $this->configFieldSets[] = Indent::_(3) . 'default="">';
+ $this->configFieldSets[] = Indent::_(3) . '';
+ $this->configFieldSets[] = Indent::_(3) . '"';
+ $this->configFieldSets[] = Indent::_(3) . '"';
+ $this->configFieldSets[] = Indent::_(2) . " ";
+ // set params defaults
+ $this->extensionsParams[] = '"add_jquery_framework":"1"';
+
// add version selection
- if (2 == $this->uikit)
+ if (2 == CFactory::_('Config')->uikit)
{
// set field lang
- $this->setLangContent(
- $this->lang, $lang . '_UIKIT_VERSION_LABEL',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_UIKIT_VERSION_LABEL',
"Uikit Versions"
);
- $this->setLangContent(
- $this->lang, $lang . '_UIKIT_VERSION_DESC',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_UIKIT_VERSION_DESC',
"Select what version you would like to use"
);
- $this->setLangContent(
- $this->lang, $lang . '_UIKIT_V2', "Version 2"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_UIKIT_V2', "Version 2"
);
- $this->setLangContent(
- $this->lang, $lang . '_UIKIT_V3', "Version 3"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_UIKIT_V3', "Version 3"
);
// set the field
- $this->configFieldSets[] = $this->_t(2)
+ $this->configFieldSets[] = Indent::_(2)
. 'configFieldSets[] = $this->_t(3) . 'type="radio"';
- $this->configFieldSets[] = $this->_t(3) . 'label="' . $lang
+ $this->configFieldSets[] = Indent::_(3) . 'type="radio"';
+ $this->configFieldSets[] = Indent::_(3) . 'label="' . $lang
. '_UIKIT_VERSION_LABEL"';
- $this->configFieldSets[] = $this->_t(3) . 'description="'
+ $this->configFieldSets[] = Indent::_(3) . 'description="'
. $lang . '_UIKIT_VERSION_DESC"';
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3)
. 'class="btn-group btn-group-yesno"';
- $this->configFieldSets[] = $this->_t(3) . 'default="2">';
- $this->configFieldSets[] = $this->_t(3) . '';
- $this->configFieldSets[] = $this->_t(3) . '"';
- $this->configFieldSets[] = $this->_t(3) . '"';
- $this->configFieldSets[] = $this->_t(2) . " ";
+ $this->configFieldSets[] = Indent::_(2) . " ";
// set params defaults
$this->extensionsParams[] = '"uikit_version":"2"';
}
// set field lang
- $this->setLangContent(
- $this->lang, $lang . '_UIKIT_LOAD_LABEL', "Loading Options"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_UIKIT_LOAD_LABEL', "Loading Options"
);
- $this->setLangContent(
- $this->lang, $lang . '_UIKIT_LOAD_DESC',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_UIKIT_LOAD_DESC',
"Set the uikit loading option."
);
- $this->setLangContent($this->lang, $lang . '_AUTO_LOAD', "Auto");
- $this->setLangContent($this->lang, $lang . '_FORCE_LOAD', "Force");
- $this->setLangContent($this->lang, $lang . '_DONT_LOAD', "Not");
- $this->setLangContent(
- $this->lang, $lang . '_ONLY_EXTRA', "Only Extra"
+ CFactory::_('Language')->set(CFactory::_('Config')->lang_target, $lang . '_AUTO_LOAD', "Auto");
+ CFactory::_('Language')->set(CFactory::_('Config')->lang_target, $lang . '_FORCE_LOAD', "Force");
+ CFactory::_('Language')->set(CFactory::_('Config')->lang_target, $lang . '_DONT_LOAD', "Not");
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_ONLY_EXTRA', "Only Extra"
);
// set the field
- $this->configFieldSets[] = $this->_t(2)
+ $this->configFieldSets[] = Indent::_(2)
. 'configFieldSets[] = $this->_t(3) . 'type="radio"';
- $this->configFieldSets[] = $this->_t(3) . 'label="' . $lang
+ $this->configFieldSets[] = Indent::_(3) . 'type="radio"';
+ $this->configFieldSets[] = Indent::_(3) . 'label="' . $lang
. '_UIKIT_LOAD_LABEL"';
- $this->configFieldSets[] = $this->_t(3) . 'description="' . $lang
+ $this->configFieldSets[] = Indent::_(3) . 'description="' . $lang
. '_UIKIT_LOAD_DESC"';
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3)
. 'class="btn-group btn-group-yesno"';
- $this->configFieldSets[] = $this->_t(3) . 'default="">';
- $this->configFieldSets[] = $this->_t(3) . '';
- $this->configFieldSets[] = $this->_t(3) . '"';
- $this->configFieldSets[] = $this->_t(3) . '"';
- if (2 == $this->uikit || 1 == $this->uikit)
+ if (2 == CFactory::_('Config')->uikit || 1 == CFactory::_('Config')->uikit)
{
- $this->configFieldSets[] = $this->_t(3) . '"';
}
- $this->configFieldSets[] = $this->_t(3) . '"';
- $this->configFieldSets[] = $this->_t(2) . " ";
+ $this->configFieldSets[] = Indent::_(2) . " ";
// set params defaults
$this->extensionsParams[] = '"uikit_load":"1"';
// set field lang
- $this->setLangContent(
- $this->lang, $lang . '_UIKIT_MIN_LABEL', "Load Minified"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_UIKIT_MIN_LABEL', "Load Minified"
);
- $this->setLangContent(
- $this->lang, $lang . '_UIKIT_MIN_DESC',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_UIKIT_MIN_DESC',
"Should the minified version of uikit files be loaded?"
);
- $this->setLangContent($this->lang, $lang . '_YES', "Yes");
- $this->setLangContent($this->lang, $lang . '_NO', "No");
+ CFactory::_('Language')->set(CFactory::_('Config')->lang_target, $lang . '_YES', "Yes");
+ CFactory::_('Language')->set(CFactory::_('Config')->lang_target, $lang . '_NO', "No");
// set the field
- $this->configFieldSets[] = $this->_t(2) . 'configFieldSets[] = $this->_t(3) . 'type="radio"';
- $this->configFieldSets[] = $this->_t(3) . 'label="' . $lang
+ $this->configFieldSets[] = Indent::_(2) . 'configFieldSets[] = Indent::_(3) . 'type="radio"';
+ $this->configFieldSets[] = Indent::_(3) . 'label="' . $lang
. '_UIKIT_MIN_LABEL"';
- $this->configFieldSets[] = $this->_t(3) . 'description="' . $lang
+ $this->configFieldSets[] = Indent::_(3) . 'description="' . $lang
. '_UIKIT_MIN_DESC"';
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3)
. 'class="btn-group btn-group-yesno"';
- $this->configFieldSets[] = $this->_t(3) . 'default="">';
- $this->configFieldSets[] = $this->_t(3) . '';
- $this->configFieldSets[] = $this->_t(3) . '"';
- $this->configFieldSets[] = $this->_t(3) . '"';
- $this->configFieldSets[] = $this->_t(2) . " ";
+ $this->configFieldSets[] = Indent::_(3) . '"';
+ $this->configFieldSets[] = Indent::_(3) . '"';
+ $this->configFieldSets[] = Indent::_(2) . " ";
// set params defaults
$this->extensionsParams[] = '"uikit_min":""';
- if (2 == $this->uikit || 1 == $this->uikit)
+ if (2 == CFactory::_('Config')->uikit || 1 == CFactory::_('Config')->uikit)
{
// set field lang
- $this->setLangContent(
- $this->lang, $lang . '_UIKIT_STYLE_LABEL', "css Style"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_UIKIT_STYLE_LABEL', "css Style"
);
- $this->setLangContent(
- $this->lang, $lang . '_UIKIT_STYLE_DESC',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_UIKIT_STYLE_DESC',
"Set the css style that should be used."
);
- $this->setLangContent(
- $this->lang, $lang . '_FLAT_LOAD', "Flat"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_FLAT_LOAD', "Flat"
);
- $this->setLangContent(
- $this->lang, $lang . '_ALMOST_FLAT_LOAD', "Almost Flat"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_ALMOST_FLAT_LOAD', "Almost Flat"
);
- $this->setLangContent(
- $this->lang, $lang . '_GRADIANT_LOAD', "Gradient"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_GRADIANT_LOAD', "Gradient"
);
// set the field
- $this->configFieldSets[] = $this->_t(2)
+ $this->configFieldSets[] = Indent::_(2)
. 'configFieldSets[] = $this->_t(3) . 'type="radio"';
- $this->configFieldSets[] = $this->_t(3) . 'label="' . $lang
+ $this->configFieldSets[] = Indent::_(3) . 'type="radio"';
+ $this->configFieldSets[] = Indent::_(3) . 'label="' . $lang
. '_UIKIT_STYLE_LABEL"';
- $this->configFieldSets[] = $this->_t(3) . 'description="'
+ $this->configFieldSets[] = Indent::_(3) . 'description="'
. $lang . '_UIKIT_STYLE_DESC"';
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3)
. 'class="btn-group btn-group-yesno"';
- if (2 == $this->uikit)
+ if (2 == CFactory::_('Config')->uikit)
{
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3)
. 'showon="uikit_version:2"';
}
- $this->configFieldSets[] = $this->_t(3) . 'default="">';
- $this->configFieldSets[] = $this->_t(3) . '';
- $this->configFieldSets[] = $this->_t(3) . '"';
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3)
. '"';
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3)
. '"';
- $this->configFieldSets[] = $this->_t(2) . " ";
+ $this->configFieldSets[] = Indent::_(2) . " ";
// set params defaults
$this->extensionsParams[] = '"uikit_style":""';
}
@@ -25465,27 +23514,26 @@ for developing fast and powerful web interfaces. For more info visit configFieldSetsCustomField['Uikit Settings']);
}
// close that fieldset
- $this->configFieldSets[] = $this->_t(1) . "";
+ $this->configFieldSets[] = Indent::_(1) . "";
}
}
public function setEmailHelperConfigFieldsets($lang)
{
- if (isset($this->componentData->add_email_helper)
- && $this->componentData->add_email_helper)
+ if (CFactory::_('Component')->get('add_email_helper'))
{
// main lang prefix
$lang = $lang . '';
// set main lang string
- $this->setLangContent(
- $this->lang, $lang . '_MAIL_CONFIGURATION', "Mail Configuration"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_MAIL_CONFIGURATION', "Mail Configuration"
);
- $this->setLangContent($this->lang, $lang . '_DKIM', "DKIM");
+ CFactory::_('Language')->set(CFactory::_('Config')->lang_target, $lang . '_DKIM', "DKIM");
// start building field set for email helper functions
- $this->configFieldSets[] = PHP_EOL . $this->_t(1) . "configFieldSets[] = $this->_t(2)
+ $this->configFieldSets[] = PHP_EOL . Indent::_(1) . "configFieldSets[] = Indent::_(2)
. "name=\"mail_configuration_custom_config\"";
- $this->configFieldSets[] = $this->_t(2) . "label=\"" . $lang
+ $this->configFieldSets[] = Indent::_(2) . "label=\"" . $lang
. "_MAIL_CONFIGURATION\">";
// add custom Mail Configurations
if (isset($this->configFieldSetsCustomField['Mail Configuration'])
@@ -25501,459 +23549,459 @@ for developing fast and powerful web interfaces. For more info visit setLangContent(
- $this->lang, $lang . '_MAILONLINE_LABEL', "Mailer Status"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_MAILONLINE_LABEL', "Mailer Status"
);
- $this->setLangContent(
- $this->lang, $lang . '_MAILONLINE_DESCRIPTION',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_MAILONLINE_DESCRIPTION',
"Warning this will stop all emails from going out."
);
- $this->setLangContent($this->lang, $lang . '_ON', "On");
- $this->setLangContent($this->lang, $lang . '_OFF', "Off");
- $this->setLangContent(
- $this->lang, $lang . '_MAILER_LABEL', "Mailer"
+ CFactory::_('Language')->set(CFactory::_('Config')->lang_target, $lang . '_ON', "On");
+ CFactory::_('Language')->set(CFactory::_('Config')->lang_target, $lang . '_OFF', "Off");
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_MAILER_LABEL', "Mailer"
);
- $this->setLangContent(
- $this->lang, $lang . '_MAILER_DESCRIPTION',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_MAILER_DESCRIPTION',
"Select what mailer you would like to use to send emails."
);
- $this->setLangContent($this->lang, $lang . '_GLOBAL', "Global");
- $this->setLangContent(
- $this->lang, $lang . '_PHP_MAIL', "PHP Mail"
+ CFactory::_('Language')->set(CFactory::_('Config')->lang_target, $lang . '_GLOBAL', "Global");
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_PHP_MAIL', "PHP Mail"
);
- $this->setLangContent(
- $this->lang, $lang . '_SENDMAIL', "Sendmail"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_SENDMAIL', "Sendmail"
);
- $this->setLangContent($this->lang, $lang . '_SMTP', "SMTP");
- $this->setLangContent(
- $this->lang, $lang . '_EMAILFROM_LABEL', " From Email"
+ CFactory::_('Language')->set(CFactory::_('Config')->lang_target, $lang . '_SMTP', "SMTP");
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_EMAILFROM_LABEL', " From Email"
);
- $this->setLangContent(
- $this->lang, $lang . '_EMAILFROM_DESCRIPTION',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_EMAILFROM_DESCRIPTION',
"The global email address that will be used to send system email."
);
- $this->setLangContent(
- $this->lang, $lang . '_EMAILFROM_HINT', "Email Address Here"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_EMAILFROM_HINT', "Email Address Here"
);
- $this->setLangContent(
- $this->lang, $lang . '_FROMNAME_LABEL', "From Name"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_FROMNAME_LABEL', "From Name"
);
- $this->setLangContent(
- $this->lang, $lang . '_FROMNAME_DESCRIPTION',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_FROMNAME_DESCRIPTION',
"Text displayed in the header "From:" field when sending a site email. Usually the site name."
);
- $this->setLangContent(
- $this->lang, $lang . '_FROMNAME_HINT', "From Name Here"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_FROMNAME_HINT', "From Name Here"
);
- $this->setLangContent(
- $this->lang, $lang . '_EMAILREPLY_LABEL', " Reply to Email"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_EMAILREPLY_LABEL', " Reply to Email"
);
- $this->setLangContent(
- $this->lang, $lang . '_EMAILREPLY_DESCRIPTION',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_EMAILREPLY_DESCRIPTION',
"The global email address that will be used to set as the reply email. (leave blank for none)"
);
- $this->setLangContent(
- $this->lang, $lang . '_EMAILREPLY_HINT',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_EMAILREPLY_HINT',
"Email Address Here"
);
- $this->setLangContent(
- $this->lang, $lang . '_REPLYNAME_LABEL', "Reply to Name"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_REPLYNAME_LABEL', "Reply to Name"
);
- $this->setLangContent(
- $this->lang, $lang . '_REPLYNAME_DESCRIPTION',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_REPLYNAME_DESCRIPTION',
"Text displayed in the header "Reply To:" field when replying to the site email. Usually the the person that receives the response. (leave blank for none)"
);
- $this->setLangContent(
- $this->lang, $lang . '_REPLYNAME_HINT', "Reply Name Here"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_REPLYNAME_HINT', "Reply Name Here"
);
- $this->setLangContent(
- $this->lang, $lang . '_SENDMAIL_LABEL', "Sendmail Path"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_SENDMAIL_LABEL', "Sendmail Path"
);
- $this->setLangContent(
- $this->lang, $lang . '_SENDMAIL_DESCRIPTION',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_SENDMAIL_DESCRIPTION',
"Enter the path to the sendmail program directory on your host server."
);
- $this->setLangContent(
- $this->lang, $lang . '_SENDMAIL_HINT', "/usr/sbin/sendmail"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_SENDMAIL_HINT', "/usr/sbin/sendmail"
);
- $this->setLangContent(
- $this->lang, $lang . '_SMTPAUTH_LABEL',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_SMTPAUTH_LABEL',
"SMTP Authentication"
);
- $this->setLangContent(
- $this->lang, $lang . '_SMTPAUTH_DESCRIPTION',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_SMTPAUTH_DESCRIPTION',
"Select yes if your SMTP host requires SMTP Authentication."
);
- $this->setLangContent($this->lang, $lang . '_YES', "Yes");
- $this->setLangContent($this->lang, $lang . '_NO', "No");
- $this->setLangContent(
- $this->lang, $lang . '_SMTPSECURE_LABEL', "SMTP Security"
+ CFactory::_('Language')->set(CFactory::_('Config')->lang_target, $lang . '_YES', "Yes");
+ CFactory::_('Language')->set(CFactory::_('Config')->lang_target, $lang . '_NO', "No");
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_SMTPSECURE_LABEL', "SMTP Security"
);
- $this->setLangContent(
- $this->lang, $lang . '_SMTPSECURE_DESCRIPTION',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_SMTPSECURE_DESCRIPTION',
"Select the security model that your SMTP server uses."
);
- $this->setLangContent($this->lang, $lang . '_NONE', "None");
- $this->setLangContent($this->lang, $lang . '_SSL', "SSL");
- $this->setLangContent($this->lang, $lang . '_TLS', "TLS");
- $this->setLangContent(
- $this->lang, $lang . '_SMTPPORT_LABEL', "SMTP Port"
+ CFactory::_('Language')->set(CFactory::_('Config')->lang_target, $lang . '_NONE', "None");
+ CFactory::_('Language')->set(CFactory::_('Config')->lang_target, $lang . '_SSL', "SSL");
+ CFactory::_('Language')->set(CFactory::_('Config')->lang_target, $lang . '_TLS', "TLS");
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_SMTPPORT_LABEL', "SMTP Port"
);
- $this->setLangContent(
- $this->lang, $lang . '_SMTPPORT_DESCRIPTION',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_SMTPPORT_DESCRIPTION',
"Enter the port number of your SMTP server. Use 25 for most unsecured servers and 465 for most secure servers."
);
- $this->setLangContent(
- $this->lang, $lang . '_SMTPPORT_HINT', "25"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_SMTPPORT_HINT', "25"
);
- $this->setLangContent(
- $this->lang, $lang . '_SMTPUSER_LABEL', "SMTP Username"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_SMTPUSER_LABEL', "SMTP Username"
);
- $this->setLangContent(
- $this->lang, $lang . '_SMTPUSER_DESCRIPTION',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_SMTPUSER_DESCRIPTION',
"Enter the username for access to the SMTP host."
);
- $this->setLangContent(
- $this->lang, $lang . '_SMTPUSER_HINT', "email@demo.com"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_SMTPUSER_HINT', "email@demo.com"
);
- $this->setLangContent(
- $this->lang, $lang . '_SMTPPASS_LABEL', "SMTP Password"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_SMTPPASS_LABEL', "SMTP Password"
);
- $this->setLangContent(
- $this->lang, $lang . '_SMTPPASS_DESCRIPTION',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_SMTPPASS_DESCRIPTION',
"Enter the password for access to the SMTP host."
);
- $this->setLangContent(
- $this->lang, $lang . '_SMTPHOST_LABEL', "SMTP Host"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_SMTPHOST_LABEL', "SMTP Host"
);
- $this->setLangContent(
- $this->lang, $lang . '_SMTPHOST_DESCRIPTION',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_SMTPHOST_DESCRIPTION',
"Enter the name of the SMTP host."
);
- $this->setLangContent(
- $this->lang, $lang . '_SMTPHOST_HINT', "localhost"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_SMTPHOST_HINT', "localhost"
);
// set the mailer fields
- $this->configFieldSets[] = PHP_EOL . $this->_t(2) . "";
- $this->configFieldSets[] = $this->_t(2) . "configFieldSets[] = $this->_t(3) . "type=\"radio\"";
- $this->configFieldSets[] = $this->_t(3) . "name=\"mailonline\"";
- $this->configFieldSets[] = $this->_t(3) . "label=\"" . $lang
+ $this->configFieldSets[] = Indent::_(2) . "configFieldSets[] = Indent::_(3) . "type=\"radio\"";
+ $this->configFieldSets[] = Indent::_(3) . "name=\"mailonline\"";
+ $this->configFieldSets[] = Indent::_(3) . "label=\"" . $lang
. "_MAILONLINE_LABEL\"";
- $this->configFieldSets[] = $this->_t(3) . "description=\""
+ $this->configFieldSets[] = Indent::_(3) . "description=\""
. $lang . "_MAILONLINE_DESCRIPTION\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3)
. "class=\"btn-group btn-group-yesno\"";
- $this->configFieldSets[] = $this->_t(3) . "default=\"1\">";
- $this->configFieldSets[] = $this->_t(3) . "";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3) . "default=\"1\">";
+ $this->configFieldSets[] = Indent::_(3) . "";
+ $this->configFieldSets[] = Indent::_(3)
. "";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3)
. "";
- $this->configFieldSets[] = $this->_t(2) . " ";
- $this->configFieldSets[] = $this->_t(2) . "";
- $this->configFieldSets[] = $this->_t(2) . "configFieldSets[] = $this->_t(3) . "type=\"list\"";
- $this->configFieldSets[] = $this->_t(3) . "name=\"mailer\"";
- $this->configFieldSets[] = $this->_t(3) . "label=\"" . $lang
+ $this->configFieldSets[] = Indent::_(2) . "configFieldSets[] = Indent::_(3) . "type=\"list\"";
+ $this->configFieldSets[] = Indent::_(3) . "name=\"mailer\"";
+ $this->configFieldSets[] = Indent::_(3) . "label=\"" . $lang
. "_MAILER_LABEL\"";
- $this->configFieldSets[] = $this->_t(3) . "description=\""
+ $this->configFieldSets[] = Indent::_(3) . "description=\""
. $lang . "_MAILER_DESCRIPTION\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3)
. "class=\"list_class\"";
- $this->configFieldSets[] = $this->_t(3) . "multiple=\"false\"";
- $this->configFieldSets[] = $this->_t(3) . "filter=\"WORD\"";
- $this->configFieldSets[] = $this->_t(3) . "required=\"true\"";
- $this->configFieldSets[] = $this->_t(3) . "default=\"global\">";
- $this->configFieldSets[] = $this->_t(3) . "";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3) . "multiple=\"false\"";
+ $this->configFieldSets[] = Indent::_(3) . "filter=\"WORD\"";
+ $this->configFieldSets[] = Indent::_(3) . "required=\"true\"";
+ $this->configFieldSets[] = Indent::_(3) . "default=\"global\">";
+ $this->configFieldSets[] = Indent::_(3) . "";
+ $this->configFieldSets[] = Indent::_(3)
. "";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3)
. "";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3)
. "";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3)
. "";
- $this->configFieldSets[] = $this->_t(2) . " ";
- $this->configFieldSets[] = $this->_t(2) . "";
- $this->configFieldSets[] = $this->_t(2) . "configFieldSets[] = $this->_t(3) . "type=\"text\"";
- $this->configFieldSets[] = $this->_t(3) . "name=\"emailfrom\"";
- $this->configFieldSets[] = $this->_t(3) . "label=\"" . $lang
+ $this->configFieldSets[] = Indent::_(2) . "configFieldSets[] = Indent::_(3) . "type=\"text\"";
+ $this->configFieldSets[] = Indent::_(3) . "name=\"emailfrom\"";
+ $this->configFieldSets[] = Indent::_(3) . "label=\"" . $lang
. "_EMAILFROM_LABEL\"";
- $this->configFieldSets[] = $this->_t(3) . "size=\"60\"";
- $this->configFieldSets[] = $this->_t(3) . "maxlength=\"150\"";
- $this->configFieldSets[] = $this->_t(3) . "description=\""
+ $this->configFieldSets[] = Indent::_(3) . "size=\"60\"";
+ $this->configFieldSets[] = Indent::_(3) . "maxlength=\"150\"";
+ $this->configFieldSets[] = Indent::_(3) . "description=\""
. $lang . "_EMAILFROM_DESCRIPTION\"";
- $this->configFieldSets[] = $this->_t(3) . "class=\"text_area\"";
- $this->configFieldSets[] = $this->_t(3) . "filter=\"STRING\"";
- $this->configFieldSets[] = $this->_t(3) . "validate=\"email\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3) . "class=\"text_area\"";
+ $this->configFieldSets[] = Indent::_(3) . "filter=\"STRING\"";
+ $this->configFieldSets[] = Indent::_(3) . "validate=\"email\"";
+ $this->configFieldSets[] = Indent::_(3)
. "message=\"Error! Please add email address here.\"";
- $this->configFieldSets[] = $this->_t(3) . "hint=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "hint=\"" . $lang
. "_EMAILFROM_HINT\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3)
. "showon=\"mailer:smtp,sendmail,default\"";
- $this->configFieldSets[] = $this->_t(2) . "/>";
- $this->configFieldSets[] = $this->_t(2) . "";
- $this->configFieldSets[] = $this->_t(2) . "configFieldSets[] = $this->_t(3) . "type=\"text\"";
- $this->configFieldSets[] = $this->_t(3) . "name=\"fromname\"";
- $this->configFieldSets[] = $this->_t(3) . "label=\"" . $lang
+ $this->configFieldSets[] = Indent::_(2) . "configFieldSets[] = Indent::_(3) . "type=\"text\"";
+ $this->configFieldSets[] = Indent::_(3) . "name=\"fromname\"";
+ $this->configFieldSets[] = Indent::_(3) . "label=\"" . $lang
. "_FROMNAME_LABEL\"";
- $this->configFieldSets[] = $this->_t(3) . "size=\"60\"";
- $this->configFieldSets[] = $this->_t(3) . "maxlength=\"150\"";
- $this->configFieldSets[] = $this->_t(3) . "description=\""
+ $this->configFieldSets[] = Indent::_(3) . "size=\"60\"";
+ $this->configFieldSets[] = Indent::_(3) . "maxlength=\"150\"";
+ $this->configFieldSets[] = Indent::_(3) . "description=\""
. $lang . "_FROMNAME_DESCRIPTION\"";
- $this->configFieldSets[] = $this->_t(3) . "class=\"text_area\"";
- $this->configFieldSets[] = $this->_t(3) . "filter=\"STRING\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3) . "class=\"text_area\"";
+ $this->configFieldSets[] = Indent::_(3) . "filter=\"STRING\"";
+ $this->configFieldSets[] = Indent::_(3)
. "message=\"Error! Please add some name here.\"";
- $this->configFieldSets[] = $this->_t(3) . "hint=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "hint=\"" . $lang
. "_FROMNAME_HINT\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3)
. "showon=\"mailer:smtp,sendmail,default\"";
- $this->configFieldSets[] = $this->_t(2) . "/>";
- $this->configFieldSets[] = $this->_t(2) . "";
- $this->configFieldSets[] = $this->_t(2) . "configFieldSets[] = $this->_t(3) . "type=\"text\"";
- $this->configFieldSets[] = $this->_t(3) . "name=\"replyto\"";
- $this->configFieldSets[] = $this->_t(3) . "label=\"" . $lang
+ $this->configFieldSets[] = Indent::_(2) . "configFieldSets[] = Indent::_(3) . "type=\"text\"";
+ $this->configFieldSets[] = Indent::_(3) . "name=\"replyto\"";
+ $this->configFieldSets[] = Indent::_(3) . "label=\"" . $lang
. "_EMAILREPLY_LABEL\"";
- $this->configFieldSets[] = $this->_t(3) . "size=\"60\"";
- $this->configFieldSets[] = $this->_t(3) . "maxlength=\"150\"";
- $this->configFieldSets[] = $this->_t(3) . "description=\""
+ $this->configFieldSets[] = Indent::_(3) . "size=\"60\"";
+ $this->configFieldSets[] = Indent::_(3) . "maxlength=\"150\"";
+ $this->configFieldSets[] = Indent::_(3) . "description=\""
. $lang . "_EMAILREPLY_DESCRIPTION\"";
- $this->configFieldSets[] = $this->_t(3) . "class=\"text_area\"";
- $this->configFieldSets[] = $this->_t(3) . "filter=\"STRING\"";
- $this->configFieldSets[] = $this->_t(3) . "validate=\"email\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3) . "class=\"text_area\"";
+ $this->configFieldSets[] = Indent::_(3) . "filter=\"STRING\"";
+ $this->configFieldSets[] = Indent::_(3) . "validate=\"email\"";
+ $this->configFieldSets[] = Indent::_(3)
. "message=\"Error! Please add email address here.\"";
- $this->configFieldSets[] = $this->_t(3) . "hint=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "hint=\"" . $lang
. "_EMAILREPLY_HINT\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3)
. "showon=\"mailer:smtp,sendmail,default\"";
- $this->configFieldSets[] = $this->_t(2) . "/>";
- $this->configFieldSets[] = $this->_t(2) . "";
- $this->configFieldSets[] = $this->_t(2) . "configFieldSets[] = $this->_t(3) . "type=\"text\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(2) . "configFieldSets[] = Indent::_(3) . "type=\"text\"";
+ $this->configFieldSets[] = Indent::_(3)
. "name=\"replytoname\"";
- $this->configFieldSets[] = $this->_t(3) . "label=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "label=\"" . $lang
. "_REPLYNAME_LABEL\"";
- $this->configFieldSets[] = $this->_t(3) . "size=\"60\"";
- $this->configFieldSets[] = $this->_t(3) . "maxlength=\"150\"";
- $this->configFieldSets[] = $this->_t(3) . "description=\""
+ $this->configFieldSets[] = Indent::_(3) . "size=\"60\"";
+ $this->configFieldSets[] = Indent::_(3) . "maxlength=\"150\"";
+ $this->configFieldSets[] = Indent::_(3) . "description=\""
. $lang . "_REPLYNAME_DESCRIPTION\"";
- $this->configFieldSets[] = $this->_t(3) . "class=\"text_area\"";
- $this->configFieldSets[] = $this->_t(3) . "filter=\"STRING\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3) . "class=\"text_area\"";
+ $this->configFieldSets[] = Indent::_(3) . "filter=\"STRING\"";
+ $this->configFieldSets[] = Indent::_(3)
. "message=\"Error! Please add some name here.\"";
- $this->configFieldSets[] = $this->_t(3) . "hint=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "hint=\"" . $lang
. "_REPLYNAME_HINT\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3)
. "showon=\"mailer:smtp,sendmail,default\"";
- $this->configFieldSets[] = $this->_t(2) . "/>";
- $this->configFieldSets[] = $this->_t(2) . "";
- $this->configFieldSets[] = $this->_t(2) . "configFieldSets[] = $this->_t(3) . "type=\"text\"";
- $this->configFieldSets[] = $this->_t(3) . "name=\"sendmail\"";
- $this->configFieldSets[] = $this->_t(3) . "label=\"" . $lang
+ $this->configFieldSets[] = Indent::_(2) . "configFieldSets[] = Indent::_(3) . "type=\"text\"";
+ $this->configFieldSets[] = Indent::_(3) . "name=\"sendmail\"";
+ $this->configFieldSets[] = Indent::_(3) . "label=\"" . $lang
. "_SENDMAIL_LABEL\"";
- $this->configFieldSets[] = $this->_t(3) . "size=\"60\"";
- $this->configFieldSets[] = $this->_t(3) . "maxlength=\"150\"";
- $this->configFieldSets[] = $this->_t(3) . "description=\""
+ $this->configFieldSets[] = Indent::_(3) . "size=\"60\"";
+ $this->configFieldSets[] = Indent::_(3) . "maxlength=\"150\"";
+ $this->configFieldSets[] = Indent::_(3) . "description=\""
. $lang . "_SENDMAIL_DESCRIPTION\"";
- $this->configFieldSets[] = $this->_t(3) . "class=\"text_area\"";
- $this->configFieldSets[] = $this->_t(3) . "required=\"false\"";
- $this->configFieldSets[] = $this->_t(3) . "filter=\"PATH\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3) . "class=\"text_area\"";
+ $this->configFieldSets[] = Indent::_(3) . "required=\"false\"";
+ $this->configFieldSets[] = Indent::_(3) . "filter=\"PATH\"";
+ $this->configFieldSets[] = Indent::_(3)
. "message=\"Error! Please add path to you local sendmail here.\"";
- $this->configFieldSets[] = $this->_t(3) . "hint=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "hint=\"" . $lang
. "_SENDMAIL_HINT\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3)
. "showon=\"mailer:sendmail\"";
- $this->configFieldSets[] = $this->_t(2) . "/>";
- $this->configFieldSets[] = $this->_t(2) . "";
- $this->configFieldSets[] = $this->_t(2) . "configFieldSets[] = $this->_t(3) . "type=\"radio\"";
- $this->configFieldSets[] = $this->_t(3) . "name=\"smtpauth\"";
- $this->configFieldSets[] = $this->_t(3) . "label=\"" . $lang
+ $this->configFieldSets[] = Indent::_(2) . "configFieldSets[] = Indent::_(3) . "type=\"radio\"";
+ $this->configFieldSets[] = Indent::_(3) . "name=\"smtpauth\"";
+ $this->configFieldSets[] = Indent::_(3) . "label=\"" . $lang
. "_SMTPAUTH_LABEL\"";
- $this->configFieldSets[] = $this->_t(3) . "description=\""
+ $this->configFieldSets[] = Indent::_(3) . "description=\""
. $lang . "_SMTPAUTH_DESCRIPTION\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3)
. "class=\"btn-group btn-group-yesno\"";
- $this->configFieldSets[] = $this->_t(3) . "default=\"0\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3) . "default=\"0\"";
+ $this->configFieldSets[] = Indent::_(3)
. "showon=\"mailer:smtp\">";
- $this->configFieldSets[] = $this->_t(3) . "";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3) . "";
+ $this->configFieldSets[] = Indent::_(3)
. "";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3)
. "";
- $this->configFieldSets[] = $this->_t(2) . " ";
- $this->configFieldSets[] = $this->_t(2) . "";
- $this->configFieldSets[] = $this->_t(2) . "configFieldSets[] = $this->_t(3) . "type=\"list\"";
- $this->configFieldSets[] = $this->_t(3) . "name=\"smtpsecure\"";
- $this->configFieldSets[] = $this->_t(3) . "label=\"" . $lang
+ $this->configFieldSets[] = Indent::_(2) . "configFieldSets[] = Indent::_(3) . "type=\"list\"";
+ $this->configFieldSets[] = Indent::_(3) . "name=\"smtpsecure\"";
+ $this->configFieldSets[] = Indent::_(3) . "label=\"" . $lang
. "_SMTPSECURE_LABEL\"";
- $this->configFieldSets[] = $this->_t(3) . "description=\""
+ $this->configFieldSets[] = Indent::_(3) . "description=\""
. $lang . "_SMTPSECURE_DESCRIPTION\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3)
. "class=\"list_class\"";
- $this->configFieldSets[] = $this->_t(3) . "multiple=\"false\"";
- $this->configFieldSets[] = $this->_t(3) . "filter=\"WORD\"";
- $this->configFieldSets[] = $this->_t(3) . "default=\"none\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3) . "multiple=\"false\"";
+ $this->configFieldSets[] = Indent::_(3) . "filter=\"WORD\"";
+ $this->configFieldSets[] = Indent::_(3) . "default=\"none\"";
+ $this->configFieldSets[] = Indent::_(3)
. "showon=\"mailer:smtp\">";
- $this->configFieldSets[] = $this->_t(3) . "";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3) . "";
+ $this->configFieldSets[] = Indent::_(3)
. "";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3)
. "";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3)
. "";
- $this->configFieldSets[] = $this->_t(2) . " ";
- $this->configFieldSets[] = $this->_t(2) . "";
- $this->configFieldSets[] = $this->_t(2) . "configFieldSets[] = $this->_t(3) . "type=\"text\"";
- $this->configFieldSets[] = $this->_t(3) . "name=\"smtpport\"";
- $this->configFieldSets[] = $this->_t(3) . "label=\"" . $lang
+ $this->configFieldSets[] = Indent::_(2) . "configFieldSets[] = Indent::_(3) . "type=\"text\"";
+ $this->configFieldSets[] = Indent::_(3) . "name=\"smtpport\"";
+ $this->configFieldSets[] = Indent::_(3) . "label=\"" . $lang
. "_SMTPPORT_LABEL\"";
- $this->configFieldSets[] = $this->_t(3) . "size=\"60\"";
- $this->configFieldSets[] = $this->_t(3) . "maxlength=\"150\"";
- $this->configFieldSets[] = $this->_t(3) . "default=\"25\"";
- $this->configFieldSets[] = $this->_t(3) . "description=\""
+ $this->configFieldSets[] = Indent::_(3) . "size=\"60\"";
+ $this->configFieldSets[] = Indent::_(3) . "maxlength=\"150\"";
+ $this->configFieldSets[] = Indent::_(3) . "default=\"25\"";
+ $this->configFieldSets[] = Indent::_(3) . "description=\""
. $lang . "_SMTPPORT_DESCRIPTION\"";
- $this->configFieldSets[] = $this->_t(3) . "class=\"text_area\"";
- $this->configFieldSets[] = $this->_t(3) . "filter=\"INT\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3) . "class=\"text_area\"";
+ $this->configFieldSets[] = Indent::_(3) . "filter=\"INT\"";
+ $this->configFieldSets[] = Indent::_(3)
. "message=\"Error! Please add the port number of your SMTP server here.\"";
- $this->configFieldSets[] = $this->_t(3) . "hint=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "hint=\"" . $lang
. "_SMTPPORT_HINT\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3)
. "showon=\"mailer:smtp\"";
- $this->configFieldSets[] = $this->_t(2) . "/>";
- $this->configFieldSets[] = $this->_t(2) . "";
- $this->configFieldSets[] = $this->_t(2) . "configFieldSets[] = $this->_t(3) . "type=\"text\"";
- $this->configFieldSets[] = $this->_t(3) . "name=\"smtpuser\"";
- $this->configFieldSets[] = $this->_t(3) . "label=\"" . $lang
+ $this->configFieldSets[] = Indent::_(2) . "configFieldSets[] = Indent::_(3) . "type=\"text\"";
+ $this->configFieldSets[] = Indent::_(3) . "name=\"smtpuser\"";
+ $this->configFieldSets[] = Indent::_(3) . "label=\"" . $lang
. "_SMTPUSER_LABEL\"";
- $this->configFieldSets[] = $this->_t(3) . "size=\"60\"";
- $this->configFieldSets[] = $this->_t(3) . "maxlength=\"150\"";
- $this->configFieldSets[] = $this->_t(3) . "description=\""
+ $this->configFieldSets[] = Indent::_(3) . "size=\"60\"";
+ $this->configFieldSets[] = Indent::_(3) . "maxlength=\"150\"";
+ $this->configFieldSets[] = Indent::_(3) . "description=\""
. $lang . "_SMTPUSER_DESCRIPTION\"";
- $this->configFieldSets[] = $this->_t(3) . "class=\"text_area\"";
- $this->configFieldSets[] = $this->_t(3) . "filter=\"STRING\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3) . "class=\"text_area\"";
+ $this->configFieldSets[] = Indent::_(3) . "filter=\"STRING\"";
+ $this->configFieldSets[] = Indent::_(3)
. "message=\"Error! Please add the username for SMTP server here.\"";
- $this->configFieldSets[] = $this->_t(3) . "hint=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "hint=\"" . $lang
. "_SMTPUSER_HINT\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3)
. "showon=\"mailer:smtp\"";
- $this->configFieldSets[] = $this->_t(2) . "/>";
- $this->configFieldSets[] = $this->_t(2) . "";
- $this->configFieldSets[] = $this->_t(2) . "configFieldSets[] = $this->_t(3) . "type=\"password\"";
- $this->configFieldSets[] = $this->_t(3) . "name=\"smtppass\"";
- $this->configFieldSets[] = $this->_t(3) . "label=\"" . $lang
+ $this->configFieldSets[] = Indent::_(2) . "configFieldSets[] = Indent::_(3) . "type=\"password\"";
+ $this->configFieldSets[] = Indent::_(3) . "name=\"smtppass\"";
+ $this->configFieldSets[] = Indent::_(3) . "label=\"" . $lang
. "_SMTPPASS_LABEL\"";
- $this->configFieldSets[] = $this->_t(3) . "size=\"60\"";
- $this->configFieldSets[] = $this->_t(3) . "description=\""
+ $this->configFieldSets[] = Indent::_(3) . "size=\"60\"";
+ $this->configFieldSets[] = Indent::_(3) . "description=\""
. $lang . "_SMTPPASS_DESCRIPTION\"";
- $this->configFieldSets[] = $this->_t(3) . "class=\"text_area\"";
- $this->configFieldSets[] = $this->_t(3) . "filter=\"raw\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3) . "class=\"text_area\"";
+ $this->configFieldSets[] = Indent::_(3) . "filter=\"raw\"";
+ $this->configFieldSets[] = Indent::_(3)
. "message=\"Error! Please add the password for SMTP server here.\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3)
. "showon=\"mailer:smtp\"";
- $this->configFieldSets[] = $this->_t(2) . "/>";
- $this->configFieldSets[] = $this->_t(2) . "";
- $this->configFieldSets[] = $this->_t(2) . "configFieldSets[] = $this->_t(3) . "type=\"text\"";
- $this->configFieldSets[] = $this->_t(3) . "name=\"smtphost\"";
- $this->configFieldSets[] = $this->_t(3) . "label=\"" . $lang
+ $this->configFieldSets[] = Indent::_(2) . "configFieldSets[] = Indent::_(3) . "type=\"text\"";
+ $this->configFieldSets[] = Indent::_(3) . "name=\"smtphost\"";
+ $this->configFieldSets[] = Indent::_(3) . "label=\"" . $lang
. "_SMTPHOST_LABEL\"";
- $this->configFieldSets[] = $this->_t(3) . "size=\"60\"";
- $this->configFieldSets[] = $this->_t(3) . "maxlength=\"150\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3) . "size=\"60\"";
+ $this->configFieldSets[] = Indent::_(3) . "maxlength=\"150\"";
+ $this->configFieldSets[] = Indent::_(3)
. "default=\"localhost\"";
- $this->configFieldSets[] = $this->_t(3) . "description=\""
+ $this->configFieldSets[] = Indent::_(3) . "description=\""
. $lang . "_SMTPHOST_DESCRIPTION\"";
- $this->configFieldSets[] = $this->_t(3) . "class=\"text_area\"";
- $this->configFieldSets[] = $this->_t(3) . "filter=\"STRING\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3) . "class=\"text_area\"";
+ $this->configFieldSets[] = Indent::_(3) . "filter=\"STRING\"";
+ $this->configFieldSets[] = Indent::_(3)
. "message=\"Error! Please add the name of the SMTP host here.\"";
- $this->configFieldSets[] = $this->_t(3) . "hint=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "hint=\"" . $lang
. "_SMTPHOST_HINT\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3)
. "showon=\"mailer:smtp\"";
- $this->configFieldSets[] = $this->_t(2) . "/>";
+ $this->configFieldSets[] = Indent::_(2) . "/>";
}
// close that fieldset
- $this->configFieldSets[] = $this->_t(1) . "";
+ $this->configFieldSets[] = Indent::_(1) . "";
// start dkim field set
- $this->configFieldSets[] = $this->_t(1) . "configFieldSets[] = $this->_t(2)
+ $this->configFieldSets[] = Indent::_(1) . "configFieldSets[] = Indent::_(2)
. "name=\"dkim_custom_config\"";
- $this->configFieldSets[] = $this->_t(2) . "label=\"" . $lang
+ $this->configFieldSets[] = Indent::_(2) . "label=\"" . $lang
. "_DKIM\">";
// add custom DKIM fields
if (isset($this->configFieldSetsCustomField['DKIM'])
@@ -25968,74 +24016,74 @@ for developing fast and powerful web interfaces. For more info visit setLangContent(
- $this->lang, $lang . '_DKIM_LABEL', "Enable DKIM"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_DKIM_LABEL', "Enable DKIM"
);
- $this->setLangContent(
- $this->lang, $lang . '_DKIM_DESCRIPTION',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_DKIM_DESCRIPTION',
"Set this option to Yes if you want to sign your emails using DKIM."
);
- $this->setLangContent($this->lang, $lang . '_YES', "Yes");
- $this->setLangContent($this->lang, $lang . '_NO', "No");
- $this->setLangContent(
- $this->lang, $lang . '_DKIM_DOMAIN_LABEL', "Domain"
+ CFactory::_('Language')->set(CFactory::_('Config')->lang_target, $lang . '_YES', "Yes");
+ CFactory::_('Language')->set(CFactory::_('Config')->lang_target, $lang . '_NO', "No");
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_DKIM_DOMAIN_LABEL', "Domain"
);
- $this->setLangContent(
- $this->lang, $lang . '_DKIM_DOMAIN_DESCRIPTION',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_DKIM_DOMAIN_DESCRIPTION',
"Set the domain. Eg. domain.com"
);
- $this->setLangContent(
- $this->lang, $lang . '_DKIM_DOMAIN_HINT', "domain.com"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_DKIM_DOMAIN_HINT', "domain.com"
);
- $this->setLangContent(
- $this->lang, $lang . '_DKIM_SELECTOR_LABEL', "Selector"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_DKIM_SELECTOR_LABEL', "Selector"
);
- $this->setLangContent(
- $this->lang, $lang . '_DKIM_SELECTOR_DESCRIPTION',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_DKIM_SELECTOR_DESCRIPTION',
"Set your DKIM/DNS selector."
);
- $this->setLangContent(
- $this->lang, $lang . '_DKIM_SELECTOR_HINT', "vdm"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_DKIM_SELECTOR_HINT', "vdm"
);
- $this->setLangContent(
- $this->lang, $lang . '_DKIM_PASSPHRASE_LABEL', "Passphrase"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_DKIM_PASSPHRASE_LABEL', "Passphrase"
);
- $this->setLangContent(
- $this->lang, $lang . '_DKIM_PASSPHRASE_DESCRIPTION',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_DKIM_PASSPHRASE_DESCRIPTION',
"Enter your passphrase here."
);
- $this->setLangContent(
- $this->lang, $lang . '_DKIM_IDENTITY_LABEL', "Identity"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_DKIM_IDENTITY_LABEL', "Identity"
);
- $this->setLangContent(
- $this->lang, $lang . '_DKIM_IDENTITY_DESCRIPTION',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_DKIM_IDENTITY_DESCRIPTION',
"Set DKIM identity. This can be in the format of an email address 'you@yourdomain.com' typically used as the source of the email."
);
- $this->setLangContent(
- $this->lang, $lang . '_DKIM_IDENTITY_HINT',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_DKIM_IDENTITY_HINT',
"you@yourdomain.com"
);
- $this->setLangContent(
- $this->lang, $lang . '_DKIM_PRIVATE_KEY_LABEL',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_DKIM_PRIVATE_KEY_LABEL',
"Private key"
);
- $this->setLangContent(
- $this->lang, $lang . '_DKIM_PRIVATE_KEY_DESCRIPTION',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_DKIM_PRIVATE_KEY_DESCRIPTION',
"set private key"
);
- $this->setLangContent(
- $this->lang, $lang . '_DKIM_PUBLIC_KEY_LABEL', "Public key"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_DKIM_PUBLIC_KEY_LABEL', "Public key"
);
- $this->setLangContent(
- $this->lang, $lang . '_DKIM_PUBLIC_KEY_DESCRIPTION',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_DKIM_PUBLIC_KEY_DESCRIPTION',
"set public key"
);
- $this->setLangContent(
- $this->lang, $lang . '_NOTE_DKIM_USE_LABEL',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_NOTE_DKIM_USE_LABEL',
"Server Configuration"
);
- $this->setLangContent(
- $this->lang, $lang . '_NOTE_DKIM_USE_DESCRIPTION', "Using the below details, you need to configure your DNS by adding a TXT record on your domain:
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_NOTE_DKIM_USE_DESCRIPTION', "Using the below details, you need to configure your DNS by adding a TXT record on your domain:
"
);
- $this->setLangContent(
- $this->lang, $lang . '_DKIM_KEY_LABEL', "Key"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_DKIM_KEY_LABEL', "Key"
);
- $this->setLangContent(
- $this->lang, $lang . '_DKIM_KEY_DESCRIPTION',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_DKIM_KEY_DESCRIPTION',
"This is the KEY to use in the DNS record."
);
- $this->setLangContent(
- $this->lang, $lang . '_DKIM_KEY_HINT', "vdm._domainkey"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_DKIM_KEY_HINT', "vdm._domainkey"
);
- $this->setLangContent(
- $this->lang, $lang . '_DKIM_VALUE_LABEL', "Value"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_DKIM_VALUE_LABEL', "Value"
);
- $this->setLangContent(
- $this->lang, $lang . '_DKIM_VALUE_DESCRIPTION',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_DKIM_VALUE_DESCRIPTION',
"This is the TXT value to use in the DNS. Replace the PUBLICKEY with your public key."
);
- $this->setLangContent(
- $this->lang, $lang . '_DKIM_VALUE_HINT',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_DKIM_VALUE_HINT',
"v=DKIM1;k=rsa;g=*;s=email;h=sha1;t=s;p=PUBLICKEY"
);
- $this->configFieldSets[] = PHP_EOL . $this->_t(2) . "";
- $this->configFieldSets[] = $this->_t(2) . "configFieldSets[] = $this->_t(3) . "type=\"radio\"";
- $this->configFieldSets[] = $this->_t(3) . "name=\"dkim\"";
- $this->configFieldSets[] = $this->_t(3) . "label=\"" . $lang
+ $this->configFieldSets[] = Indent::_(2) . "configFieldSets[] = Indent::_(3) . "type=\"radio\"";
+ $this->configFieldSets[] = Indent::_(3) . "name=\"dkim\"";
+ $this->configFieldSets[] = Indent::_(3) . "label=\"" . $lang
. "_DKIM_LABEL\"";
- $this->configFieldSets[] = $this->_t(3) . "description=\""
+ $this->configFieldSets[] = Indent::_(3) . "description=\""
. $lang . "_DKIM_DESCRIPTION\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3)
. "class=\"btn-group btn-group-yesno\"";
- $this->configFieldSets[] = $this->_t(3) . "default=\"0\"";
- $this->configFieldSets[] = $this->_t(3) . "required=\"true\">";
- $this->configFieldSets[] = $this->_t(3) . "";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3) . "default=\"0\"";
+ $this->configFieldSets[] = Indent::_(3) . "required=\"true\">";
+ $this->configFieldSets[] = Indent::_(3) . "";
+ $this->configFieldSets[] = Indent::_(3)
. "";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3)
. "";
- $this->configFieldSets[] = $this->_t(2) . " ";
- $this->configFieldSets[] = $this->_t(2) . "";
- $this->configFieldSets[] = $this->_t(2) . "configFieldSets[] = $this->_t(3) . "type=\"text\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(2) . "configFieldSets[] = Indent::_(3) . "type=\"text\"";
+ $this->configFieldSets[] = Indent::_(3)
. "name=\"dkim_domain\"";
- $this->configFieldSets[] = $this->_t(3) . "label=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "label=\"" . $lang
. "_DKIM_DOMAIN_LABEL\"";
- $this->configFieldSets[] = $this->_t(3) . "size=\"60\"";
- $this->configFieldSets[] = $this->_t(3) . "maxlength=\"150\"";
- $this->configFieldSets[] = $this->_t(3) . "description=\""
+ $this->configFieldSets[] = Indent::_(3) . "size=\"60\"";
+ $this->configFieldSets[] = Indent::_(3) . "maxlength=\"150\"";
+ $this->configFieldSets[] = Indent::_(3) . "description=\""
. $lang . "_DKIM_DOMAIN_DESCRIPTION\"";
- $this->configFieldSets[] = $this->_t(3) . "class=\"text_area\"";
- $this->configFieldSets[] = $this->_t(3) . "filter=\"STRING\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3) . "class=\"text_area\"";
+ $this->configFieldSets[] = Indent::_(3) . "filter=\"STRING\"";
+ $this->configFieldSets[] = Indent::_(3)
. "message=\"Error! Please add DKIM Domain here.\"";
- $this->configFieldSets[] = $this->_t(3) . "hint=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "hint=\"" . $lang
. "_DKIM_DOMAIN_HINT\"";
- $this->configFieldSets[] = $this->_t(3) . "showon=\"dkim:1\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3) . "showon=\"dkim:1\"";
+ $this->configFieldSets[] = Indent::_(3)
. "onchange=\"vdm_dkim();\"";
- $this->configFieldSets[] = $this->_t(2) . "/>";
- $this->configFieldSets[] = $this->_t(2) . "";
- $this->configFieldSets[] = $this->_t(2) . "configFieldSets[] = $this->_t(3) . "type=\"text\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(2) . "configFieldSets[] = Indent::_(3) . "type=\"text\"";
+ $this->configFieldSets[] = Indent::_(3)
. "name=\"dkim_selector\"";
- $this->configFieldSets[] = $this->_t(3) . "label=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "label=\"" . $lang
. "_DKIM_SELECTOR_LABEL\"";
- $this->configFieldSets[] = $this->_t(3) . "size=\"60\"";
- $this->configFieldSets[] = $this->_t(3) . "maxlength=\"150\"";
- $this->configFieldSets[] = $this->_t(3) . "default=\"vdm\"";
- $this->configFieldSets[] = $this->_t(3) . "description=\""
+ $this->configFieldSets[] = Indent::_(3) . "size=\"60\"";
+ $this->configFieldSets[] = Indent::_(3) . "maxlength=\"150\"";
+ $this->configFieldSets[] = Indent::_(3) . "default=\"vdm\"";
+ $this->configFieldSets[] = Indent::_(3) . "description=\""
. $lang . "_DKIM_SELECTOR_DESCRIPTION\"";
- $this->configFieldSets[] = $this->_t(3) . "class=\"text_area\"";
- $this->configFieldSets[] = $this->_t(3) . "filter=\"STRING\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3) . "class=\"text_area\"";
+ $this->configFieldSets[] = Indent::_(3) . "filter=\"STRING\"";
+ $this->configFieldSets[] = Indent::_(3)
. "message=\"Error! Please add DKIM/DNS selector here.\"";
- $this->configFieldSets[] = $this->_t(3) . "hint=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "hint=\"" . $lang
. "_DKIM_SELECTOR_HINT\"";
- $this->configFieldSets[] = $this->_t(3) . "showon=\"dkim:1\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3) . "showon=\"dkim:1\"";
+ $this->configFieldSets[] = Indent::_(3)
. "onchange=\"vdm_dkim();\"";
- $this->configFieldSets[] = $this->_t(2) . "/>";
- $this->configFieldSets[] = $this->_t(2) . "";
- $this->configFieldSets[] = $this->_t(2) . "configFieldSets[] = $this->_t(3) . "type=\"password\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(2) . "configFieldSets[] = Indent::_(3) . "type=\"password\"";
+ $this->configFieldSets[] = Indent::_(3)
. "name=\"dkim_passphrase\"";
- $this->configFieldSets[] = $this->_t(3) . "label=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "label=\"" . $lang
. "_DKIM_PASSPHRASE_LABEL\"";
- $this->configFieldSets[] = $this->_t(3) . "size=\"60\"";
- $this->configFieldSets[] = $this->_t(3) . "description=\""
+ $this->configFieldSets[] = Indent::_(3) . "size=\"60\"";
+ $this->configFieldSets[] = Indent::_(3) . "description=\""
. $lang . "_DKIM_PASSPHRASE_DESCRIPTION\"";
- $this->configFieldSets[] = $this->_t(3) . "class=\"text_area\"";
- $this->configFieldSets[] = $this->_t(3) . "filter=\"raw\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3) . "class=\"text_area\"";
+ $this->configFieldSets[] = Indent::_(3) . "filter=\"raw\"";
+ $this->configFieldSets[] = Indent::_(3)
. "message=\"Error! Please add passphrase here.\"";
- $this->configFieldSets[] = $this->_t(3) . "showon=\"dkim:1\"";
- $this->configFieldSets[] = $this->_t(2) . "/>";
- $this->configFieldSets[] = $this->_t(2) . "";
- $this->configFieldSets[] = $this->_t(2) . "configFieldSets[] = $this->_t(3) . "type=\"text\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(2) . "configFieldSets[] = Indent::_(3) . "type=\"text\"";
+ $this->configFieldSets[] = Indent::_(3)
. "name=\"dkim_identity\"";
- $this->configFieldSets[] = $this->_t(3) . "label=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "label=\"" . $lang
. "_DKIM_IDENTITY_LABEL\"";
- $this->configFieldSets[] = $this->_t(3) . "size=\"60\"";
- $this->configFieldSets[] = $this->_t(3) . "maxlength=\"150\"";
- $this->configFieldSets[] = $this->_t(3) . "description=\""
+ $this->configFieldSets[] = Indent::_(3) . "size=\"60\"";
+ $this->configFieldSets[] = Indent::_(3) . "maxlength=\"150\"";
+ $this->configFieldSets[] = Indent::_(3) . "description=\""
. $lang . "_DKIM_IDENTITY_DESCRIPTION\"";
- $this->configFieldSets[] = $this->_t(3) . "class=\"text_area\"";
- $this->configFieldSets[] = $this->_t(3) . "filter=\"raw\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3) . "class=\"text_area\"";
+ $this->configFieldSets[] = Indent::_(3) . "filter=\"raw\"";
+ $this->configFieldSets[] = Indent::_(3)
. "message=\"Error! Please add DKIM Identity here.\"";
- $this->configFieldSets[] = $this->_t(3) . "hint=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "hint=\"" . $lang
. "_DKIM_IDENTITY_HINT\"";
- $this->configFieldSets[] = $this->_t(3) . "showon=\"dkim:1\"";
- $this->configFieldSets[] = $this->_t(2) . "/>";
- $this->configFieldSets[] = $this->_t(2) . "";
- $this->configFieldSets[] = $this->_t(2) . "configFieldSets[] = $this->_t(3) . "type=\"textarea\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(2) . "configFieldSets[] = Indent::_(3) . "type=\"textarea\"";
+ $this->configFieldSets[] = Indent::_(3)
. "name=\"dkim_private_key\"";
- $this->configFieldSets[] = $this->_t(3) . "label=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "label=\"" . $lang
. "_DKIM_PRIVATE_KEY_LABEL\"";
- $this->configFieldSets[] = $this->_t(3) . "rows=\"15\"";
- $this->configFieldSets[] = $this->_t(3) . "cols=\"5\"";
- $this->configFieldSets[] = $this->_t(3) . "description=\""
+ $this->configFieldSets[] = Indent::_(3) . "rows=\"15\"";
+ $this->configFieldSets[] = Indent::_(3) . "cols=\"5\"";
+ $this->configFieldSets[] = Indent::_(3) . "description=\""
. $lang . "_DKIM_PRIVATE_KEY_DESCRIPTION\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3)
. "class=\"input-xxlarge span12\"";
- $this->configFieldSets[] = $this->_t(3) . "showon=\"dkim:1\"";
- $this->configFieldSets[] = $this->_t(2) . "/>";
- $this->configFieldSets[] = $this->_t(2) . "";
- $this->configFieldSets[] = $this->_t(2) . "configFieldSets[] = $this->_t(3) . "type=\"textarea\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(2) . "configFieldSets[] = Indent::_(3) . "type=\"textarea\"";
+ $this->configFieldSets[] = Indent::_(3)
. "name=\"dkim_public_key\"";
- $this->configFieldSets[] = $this->_t(3) . "label=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "label=\"" . $lang
. "_DKIM_PUBLIC_KEY_LABEL\"";
- $this->configFieldSets[] = $this->_t(3) . "rows=\"5\"";
- $this->configFieldSets[] = $this->_t(3) . "cols=\"5\"";
- $this->configFieldSets[] = $this->_t(3) . "description=\""
+ $this->configFieldSets[] = Indent::_(3) . "rows=\"5\"";
+ $this->configFieldSets[] = Indent::_(3) . "cols=\"5\"";
+ $this->configFieldSets[] = Indent::_(3) . "description=\""
. $lang . "_DKIM_PUBLIC_KEY_DESCRIPTION\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3)
. "class=\"input-xxlarge span12\"";
- $this->configFieldSets[] = $this->_t(3) . "showon=\"dkim:1\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3) . "showon=\"dkim:1\"";
+ $this->configFieldSets[] = Indent::_(3)
. "onchange=\"vdm_dkim();\"";
- $this->configFieldSets[] = $this->_t(2) . "/>";
- $this->configFieldSets[] = $this->_t(2) . "";
- $this->configFieldSets[] = $this->_t(2)
+ $this->configFieldSets[] = Indent::_(2)
. "configFieldSets[] = $this->_t(3) . "type=\"text\"";
- $this->configFieldSets[] = $this->_t(3) . "name=\"dkim_key\"";
- $this->configFieldSets[] = $this->_t(3) . "label=\"" . $lang
+ $this->configFieldSets[] = Indent::_(2) . "configFieldSets[] = Indent::_(3) . "type=\"text\"";
+ $this->configFieldSets[] = Indent::_(3) . "name=\"dkim_key\"";
+ $this->configFieldSets[] = Indent::_(3) . "label=\"" . $lang
. "_DKIM_KEY_LABEL\"";
- $this->configFieldSets[] = $this->_t(3) . "size=\"40\"";
- $this->configFieldSets[] = $this->_t(3) . "maxlength=\"150\"";
- $this->configFieldSets[] = $this->_t(3) . "description=\""
+ $this->configFieldSets[] = Indent::_(3) . "size=\"40\"";
+ $this->configFieldSets[] = Indent::_(3) . "maxlength=\"150\"";
+ $this->configFieldSets[] = Indent::_(3) . "description=\""
. $lang . "_DKIM_KEY_DESCRIPTION\"";
- $this->configFieldSets[] = $this->_t(3) . "class=\"text_area\"";
- $this->configFieldSets[] = $this->_t(3) . "filter=\"STRING\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3) . "class=\"text_area\"";
+ $this->configFieldSets[] = Indent::_(3) . "filter=\"STRING\"";
+ $this->configFieldSets[] = Indent::_(3)
. "message=\"Error! Please add KEY here.\"";
- $this->configFieldSets[] = $this->_t(3) . "hint=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "hint=\"" . $lang
. "_DKIM_KEY_HINT\"";
- $this->configFieldSets[] = $this->_t(3) . "showon=\"dkim:1\"";
- $this->configFieldSets[] = $this->_t(2) . "/>";
- $this->configFieldSets[] = $this->_t(2) . "";
- $this->configFieldSets[] = $this->_t(2) . "configFieldSets[] = $this->_t(3) . "type=\"text\"";
- $this->configFieldSets[] = $this->_t(3) . "name=\"dkim_value\"";
- $this->configFieldSets[] = $this->_t(3) . "label=\"" . $lang
+ $this->configFieldSets[] = Indent::_(2) . "configFieldSets[] = Indent::_(3) . "type=\"text\"";
+ $this->configFieldSets[] = Indent::_(3) . "name=\"dkim_value\"";
+ $this->configFieldSets[] = Indent::_(3) . "label=\"" . $lang
. "_DKIM_VALUE_LABEL\"";
- $this->configFieldSets[] = $this->_t(3) . "size=\"80\"";
- $this->configFieldSets[] = $this->_t(3) . "maxlength=\"350\"";
- $this->configFieldSets[] = $this->_t(3) . "description=\""
+ $this->configFieldSets[] = Indent::_(3) . "size=\"80\"";
+ $this->configFieldSets[] = Indent::_(3) . "maxlength=\"350\"";
+ $this->configFieldSets[] = Indent::_(3) . "description=\""
. $lang . "_DKIM_VALUE_DESCRIPTION\"";
- $this->configFieldSets[] = $this->_t(3) . "class=\"text_area\"";
- $this->configFieldSets[] = $this->_t(3) . "filter=\"STRING\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3) . "class=\"text_area\"";
+ $this->configFieldSets[] = Indent::_(3) . "filter=\"STRING\"";
+ $this->configFieldSets[] = Indent::_(3)
. "message=\"Error! Please add TXT record here.\"";
- $this->configFieldSets[] = $this->_t(3) . "hint=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "hint=\"" . $lang
. "_DKIM_VALUE_HINT\"";
- $this->configFieldSets[] = $this->_t(3) . "showon=\"dkim:1\"";
- $this->configFieldSets[] = $this->_t(2) . "/>";
+ $this->configFieldSets[] = Indent::_(3) . "showon=\"dkim:1\"";
+ $this->configFieldSets[] = Indent::_(2) . "/>";
}
// close that fieldset
- $this->configFieldSets[] = $this->_t(1) . "";
+ $this->configFieldSets[] = Indent::_(1) . "";
}
}
public function setGooglechartConfigFieldsets($lang)
{
- if ($this->googlechart)
+ if (CFactory::_('Config')->get('google_chart', false))
{
- $this->configFieldSets[] = PHP_EOL . $this->_t(1) . "configFieldSets[] = $this->_t(2)
+ $this->configFieldSets[] = PHP_EOL . Indent::_(1) . "configFieldSets[] = Indent::_(2)
. "name=\"googlechart_config\"";
- $this->configFieldSets[] = $this->_t(2) . "label=\"" . $lang
+ $this->configFieldSets[] = Indent::_(2) . "label=\"" . $lang
. "_CHART_SETTINGS_LABEL\"";
- $this->configFieldSets[] = $this->_t(2) . "description=\"" . $lang
+ $this->configFieldSets[] = Indent::_(2) . "description=\"" . $lang
. "_CHART_SETTINGS_DESC\">";
- $this->configFieldSets[] = $this->_t(2);
- $this->configFieldSets[] = $this->_t(2)
+ $this->configFieldSets[] = Indent::_(2);
+ $this->configFieldSets[] = Indent::_(2)
. "configFieldSets[] = $this->_t(3) . "type=\"color\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(2) . "configFieldSets[] = Indent::_(3) . "type=\"color\"";
+ $this->configFieldSets[] = Indent::_(3)
. "name=\"admin_chartbackground\"";
- $this->configFieldSets[] = $this->_t(3) . "default=\"#F7F7FA\"";
- $this->configFieldSets[] = $this->_t(3) . "label=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "default=\"#F7F7FA\"";
+ $this->configFieldSets[] = Indent::_(3) . "label=\"" . $lang
. "_CHARTBACKGROUND_LABEL\"";
- $this->configFieldSets[] = $this->_t(3) . "description=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "description=\"" . $lang
. "_CHARTBACKGROUND_DESC\"";
- $this->configFieldSets[] = $this->_t(2) . "/>";
- $this->configFieldSets[] = $this->_t(2) . "";
- $this->configFieldSets[] = $this->_t(2) . "configFieldSets[] = $this->_t(3) . "type=\"text\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(2) . "configFieldSets[] = Indent::_(3) . "type=\"text\"";
+ $this->configFieldSets[] = Indent::_(3)
. "name=\"admin_mainwidth\"";
- $this->configFieldSets[] = $this->_t(3) . "label=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "label=\"" . $lang
. "_MAINWIDTH_LABEL\"";
- $this->configFieldSets[] = $this->_t(3) . "size=\"20\"";
- $this->configFieldSets[] = $this->_t(3) . "maxlength=\"50\"";
- $this->configFieldSets[] = $this->_t(3) . "description=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "size=\"20\"";
+ $this->configFieldSets[] = Indent::_(3) . "maxlength=\"50\"";
+ $this->configFieldSets[] = Indent::_(3) . "description=\"" . $lang
. "_MAINWIDTH_DESC\"";
- $this->configFieldSets[] = $this->_t(3) . "class=\"text_area\"";
- $this->configFieldSets[] = $this->_t(3) . "filter=\"INT\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3) . "class=\"text_area\"";
+ $this->configFieldSets[] = Indent::_(3) . "filter=\"INT\"";
+ $this->configFieldSets[] = Indent::_(3)
. "message=\"Error! Please add area width here.\"";
- $this->configFieldSets[] = $this->_t(3) . "hint=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "hint=\"" . $lang
. "_MAINWIDTH_HINT\"";
- $this->configFieldSets[] = $this->_t(2) . "/>";
- $this->configFieldSets[] = $this->_t(2) . "";
- $this->configFieldSets[] = $this->_t(2)
+ $this->configFieldSets[] = Indent::_(2)
. "configFieldSets[] = $this->_t(3) . "type=\"text\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(2) . "configFieldSets[] = Indent::_(3) . "type=\"text\"";
+ $this->configFieldSets[] = Indent::_(3)
. "name=\"admin_chartareatop\"";
- $this->configFieldSets[] = $this->_t(3) . "label=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "label=\"" . $lang
. "_CHARTAREATOP_LABEL\"";
- $this->configFieldSets[] = $this->_t(3) . "size=\"20\"";
- $this->configFieldSets[] = $this->_t(3) . "maxlength=\"50\"";
- $this->configFieldSets[] = $this->_t(3) . "description=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "size=\"20\"";
+ $this->configFieldSets[] = Indent::_(3) . "maxlength=\"50\"";
+ $this->configFieldSets[] = Indent::_(3) . "description=\"" . $lang
. "_CHARTAREATOP_DESC\"";
- $this->configFieldSets[] = $this->_t(3) . "class=\"text_area\"";
- $this->configFieldSets[] = $this->_t(3) . "filter=\"INT\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3) . "class=\"text_area\"";
+ $this->configFieldSets[] = Indent::_(3) . "filter=\"INT\"";
+ $this->configFieldSets[] = Indent::_(3)
. "message=\"Error! Please add top spacing here.\"";
- $this->configFieldSets[] = $this->_t(3) . "hint=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "hint=\"" . $lang
. "_CHARTAREATOP_HINT\"";
- $this->configFieldSets[] = $this->_t(2) . "/>";
- $this->configFieldSets[] = $this->_t(2) . "";
- $this->configFieldSets[] = $this->_t(2) . "configFieldSets[] = $this->_t(3) . "type=\"text\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(2) . "configFieldSets[] = Indent::_(3) . "type=\"text\"";
+ $this->configFieldSets[] = Indent::_(3)
. "name=\"admin_chartarealeft\"";
- $this->configFieldSets[] = $this->_t(3) . "label=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "label=\"" . $lang
. "_CHARTAREALEFT_LABEL\"";
- $this->configFieldSets[] = $this->_t(3) . "size=\"20\"";
- $this->configFieldSets[] = $this->_t(3) . "maxlength=\"50\"";
- $this->configFieldSets[] = $this->_t(3) . "description=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "size=\"20\"";
+ $this->configFieldSets[] = Indent::_(3) . "maxlength=\"50\"";
+ $this->configFieldSets[] = Indent::_(3) . "description=\"" . $lang
. "_CHARTAREALEFT_DESC\"";
- $this->configFieldSets[] = $this->_t(3) . "class=\"text_area\"";
- $this->configFieldSets[] = $this->_t(3) . "filter=\"INT\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3) . "class=\"text_area\"";
+ $this->configFieldSets[] = Indent::_(3) . "filter=\"INT\"";
+ $this->configFieldSets[] = Indent::_(3)
. "message=\"Error! Please add left spacing here.\"";
- $this->configFieldSets[] = $this->_t(3) . "hint=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "hint=\"" . $lang
. "_CHARTAREALEFT_HINT\"";
- $this->configFieldSets[] = $this->_t(2) . "/>";
- $this->configFieldSets[] = $this->_t(2) . "";
- $this->configFieldSets[] = $this->_t(2) . "configFieldSets[] = $this->_t(3) . "type=\"text\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(2) . "configFieldSets[] = Indent::_(3) . "type=\"text\"";
+ $this->configFieldSets[] = Indent::_(3)
. "name=\"admin_chartareawidth\"";
- $this->configFieldSets[] = $this->_t(3) . "label=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "label=\"" . $lang
. "_CHARTAREAWIDTH_LABEL\"";
- $this->configFieldSets[] = $this->_t(3) . "size=\"20\"";
- $this->configFieldSets[] = $this->_t(3) . "maxlength=\"50\"";
- $this->configFieldSets[] = $this->_t(3) . "description=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "size=\"20\"";
+ $this->configFieldSets[] = Indent::_(3) . "maxlength=\"50\"";
+ $this->configFieldSets[] = Indent::_(3) . "description=\"" . $lang
. "_CHARTAREAWIDTH_DESC\"";
- $this->configFieldSets[] = $this->_t(3) . "class=\"text_area\"";
- $this->configFieldSets[] = $this->_t(3) . "filter=\"INT\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3) . "class=\"text_area\"";
+ $this->configFieldSets[] = Indent::_(3) . "filter=\"INT\"";
+ $this->configFieldSets[] = Indent::_(3)
. "message=\"Error! Please add chart width here.\"";
- $this->configFieldSets[] = $this->_t(3) . "hint=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "hint=\"" . $lang
. "_CHARTAREAWIDTH_HINT\"";
- $this->configFieldSets[] = $this->_t(2) . "/>";
- $this->configFieldSets[] = $this->_t(2) . "";
- $this->configFieldSets[] = $this->_t(2)
+ $this->configFieldSets[] = Indent::_(2)
. "configFieldSets[] = $this->_t(3) . "type=\"color\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(2) . "configFieldSets[] = Indent::_(3) . "type=\"color\"";
+ $this->configFieldSets[] = Indent::_(3)
. "name=\"admin_legendtextstylefontcolor\"";
- $this->configFieldSets[] = $this->_t(3) . "default=\"#63B1F2\"";
- $this->configFieldSets[] = $this->_t(3) . "label=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "default=\"#63B1F2\"";
+ $this->configFieldSets[] = Indent::_(3) . "label=\"" . $lang
. "_LEGENDTEXTSTYLEFONTCOLOR_LABEL\"";
- $this->configFieldSets[] = $this->_t(3) . "description=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "description=\"" . $lang
. "_LEGENDTEXTSTYLEFONTCOLOR_DESC\"";
- $this->configFieldSets[] = $this->_t(2) . "/>";
- $this->configFieldSets[] = $this->_t(2) . "";
- $this->configFieldSets[] = $this->_t(2) . "configFieldSets[] = $this->_t(3) . "type=\"text\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(2) . "configFieldSets[] = Indent::_(3) . "type=\"text\"";
+ $this->configFieldSets[] = Indent::_(3)
. "name=\"admin_legendtextstylefontsize\"";
- $this->configFieldSets[] = $this->_t(3) . "label=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "label=\"" . $lang
. "_LEGENDTEXTSTYLEFONTSIZE_LABEL\"";
- $this->configFieldSets[] = $this->_t(3) . "size=\"20\"";
- $this->configFieldSets[] = $this->_t(3) . "maxlength=\"50\"";
- $this->configFieldSets[] = $this->_t(3) . "description=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "size=\"20\"";
+ $this->configFieldSets[] = Indent::_(3) . "maxlength=\"50\"";
+ $this->configFieldSets[] = Indent::_(3) . "description=\"" . $lang
. "_LEGENDTEXTSTYLEFONTSIZE_DESC\"";
- $this->configFieldSets[] = $this->_t(3) . "class=\"text_area\"";
- $this->configFieldSets[] = $this->_t(3) . "filter=\"INT\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3) . "class=\"text_area\"";
+ $this->configFieldSets[] = Indent::_(3) . "filter=\"INT\"";
+ $this->configFieldSets[] = Indent::_(3)
. "message=\"Error! Please add size of the legend here.\"";
- $this->configFieldSets[] = $this->_t(3) . "hint=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "hint=\"" . $lang
. "_LEGENDTEXTSTYLEFONTSIZE_HINT\"";
- $this->configFieldSets[] = $this->_t(2) . "/>";
- $this->configFieldSets[] = $this->_t(2) . "";
- $this->configFieldSets[] = $this->_t(2)
+ $this->configFieldSets[] = Indent::_(2)
. "configFieldSets[] = $this->_t(3) . "type=\"color\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(2) . "configFieldSets[] = Indent::_(3) . "type=\"color\"";
+ $this->configFieldSets[] = Indent::_(3)
. "name=\"admin_vaxistextstylefontcolor\"";
- $this->configFieldSets[] = $this->_t(3) . "default=\"#63B1F2\"";
- $this->configFieldSets[] = $this->_t(3) . "label=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "default=\"#63B1F2\"";
+ $this->configFieldSets[] = Indent::_(3) . "label=\"" . $lang
. "_VAXISTEXTSTYLEFONTCOLOR_LABEL\"";
- $this->configFieldSets[] = $this->_t(3) . "description=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "description=\"" . $lang
. "_VAXISTEXTSTYLEFONTCOLOR_DESC\"";
- $this->configFieldSets[] = $this->_t(2) . "/>";
- $this->configFieldSets[] = $this->_t(2) . "";
- $this->configFieldSets[] = $this->_t(2)
+ $this->configFieldSets[] = Indent::_(2)
. "configFieldSets[] = $this->_t(3) . "type=\"color\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(2) . "configFieldSets[] = Indent::_(3) . "type=\"color\"";
+ $this->configFieldSets[] = Indent::_(3)
. "name=\"admin_haxistextstylefontcolor\"";
- $this->configFieldSets[] = $this->_t(3) . "default=\"#63B1F2\"";
- $this->configFieldSets[] = $this->_t(3) . "label=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "default=\"#63B1F2\"";
+ $this->configFieldSets[] = Indent::_(3) . "label=\"" . $lang
. "_HAXISTEXTSTYLEFONTCOLOR_LABEL\"";
- $this->configFieldSets[] = $this->_t(3) . "description=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "description=\"" . $lang
. "_HAXISTEXTSTYLEFONTCOLOR_DESC\"";
- $this->configFieldSets[] = $this->_t(2) . "/>";
- $this->configFieldSets[] = $this->_t(2) . "";
- $this->configFieldSets[] = $this->_t(2) . "configFieldSets[] = $this->_t(3) . "type=\"color\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(2) . "configFieldSets[] = Indent::_(3) . "type=\"color\"";
+ $this->configFieldSets[] = Indent::_(3)
. "name=\"admin_haxistitletextstylefontcolor\"";
- $this->configFieldSets[] = $this->_t(3) . "default=\"#63B1F2\"";
- $this->configFieldSets[] = $this->_t(3) . "label=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "default=\"#63B1F2\"";
+ $this->configFieldSets[] = Indent::_(3) . "label=\"" . $lang
. "_HAXISTITLETEXTSTYLEFONTCOLOR_LABEL\"";
- $this->configFieldSets[] = $this->_t(3) . "description=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "description=\"" . $lang
. "_HAXISTITLETEXTSTYLEFONTCOLOR_DESC\"";
- $this->configFieldSets[] = $this->_t(2) . "/>";
- $this->configFieldSets[] = $this->_t(2);
- $this->configFieldSets[] = $this->_t(2)
+ $this->configFieldSets[] = Indent::_(2) . "/>";
+ $this->configFieldSets[] = Indent::_(2);
+ $this->configFieldSets[] = Indent::_(2)
. "configFieldSets[] = $this->_t(3) . "type=\"color\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(2) . "configFieldSets[] = Indent::_(3) . "type=\"color\"";
+ $this->configFieldSets[] = Indent::_(3)
. "name=\"site_chartbackground\"";
- $this->configFieldSets[] = $this->_t(3) . "default=\"#F7F7FA\"";
- $this->configFieldSets[] = $this->_t(3) . "label=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "default=\"#F7F7FA\"";
+ $this->configFieldSets[] = Indent::_(3) . "label=\"" . $lang
. "_CHARTBACKGROUND_LABEL\"";
- $this->configFieldSets[] = $this->_t(3) . "description=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "description=\"" . $lang
. "_CHARTBACKGROUND_DESC\"";
- $this->configFieldSets[] = $this->_t(2) . "/>";
- $this->configFieldSets[] = $this->_t(2) . "";
- $this->configFieldSets[] = $this->_t(2) . "configFieldSets[] = $this->_t(3) . "type=\"text\"";
- $this->configFieldSets[] = $this->_t(3) . "name=\"site_mainwidth\"";
- $this->configFieldSets[] = $this->_t(3) . "label=\"" . $lang
+ $this->configFieldSets[] = Indent::_(2) . "configFieldSets[] = Indent::_(3) . "type=\"text\"";
+ $this->configFieldSets[] = Indent::_(3) . "name=\"site_mainwidth\"";
+ $this->configFieldSets[] = Indent::_(3) . "label=\"" . $lang
. "_MAINWIDTH_LABEL\"";
- $this->configFieldSets[] = $this->_t(3) . "size=\"20\"";
- $this->configFieldSets[] = $this->_t(3) . "maxlength=\"50\"";
- $this->configFieldSets[] = $this->_t(3) . "description=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "size=\"20\"";
+ $this->configFieldSets[] = Indent::_(3) . "maxlength=\"50\"";
+ $this->configFieldSets[] = Indent::_(3) . "description=\"" . $lang
. "_MAINWIDTH_DESC\"";
- $this->configFieldSets[] = $this->_t(3) . "class=\"text_area\"";
- $this->configFieldSets[] = $this->_t(3) . "filter=\"INT\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3) . "class=\"text_area\"";
+ $this->configFieldSets[] = Indent::_(3) . "filter=\"INT\"";
+ $this->configFieldSets[] = Indent::_(3)
. "message=\"Error! Please add area width here.\"";
- $this->configFieldSets[] = $this->_t(3) . "hint=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "hint=\"" . $lang
. "_MAINWIDTH_HINT\"";
- $this->configFieldSets[] = $this->_t(2) . "/>";
- $this->configFieldSets[] = $this->_t(2) . "";
- $this->configFieldSets[] = $this->_t(2)
+ $this->configFieldSets[] = Indent::_(2)
. "configFieldSets[] = $this->_t(3) . "type=\"text\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(2) . "configFieldSets[] = Indent::_(3) . "type=\"text\"";
+ $this->configFieldSets[] = Indent::_(3)
. "name=\"site_chartareatop\"";
- $this->configFieldSets[] = $this->_t(3) . "label=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "label=\"" . $lang
. "_CHARTAREATOP_LABEL\"";
- $this->configFieldSets[] = $this->_t(3) . "size=\"20\"";
- $this->configFieldSets[] = $this->_t(3) . "maxlength=\"50\"";
- $this->configFieldSets[] = $this->_t(3) . "description=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "size=\"20\"";
+ $this->configFieldSets[] = Indent::_(3) . "maxlength=\"50\"";
+ $this->configFieldSets[] = Indent::_(3) . "description=\"" . $lang
. "_CHARTAREATOP_DESC\"";
- $this->configFieldSets[] = $this->_t(3) . "class=\"text_area\"";
- $this->configFieldSets[] = $this->_t(3) . "filter=\"INT\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3) . "class=\"text_area\"";
+ $this->configFieldSets[] = Indent::_(3) . "filter=\"INT\"";
+ $this->configFieldSets[] = Indent::_(3)
. "message=\"Error! Please add top spacing here.\"";
- $this->configFieldSets[] = $this->_t(3) . "hint=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "hint=\"" . $lang
. "_CHARTAREATOP_HINT\"";
- $this->configFieldSets[] = $this->_t(2) . "/>";
- $this->configFieldSets[] = $this->_t(2) . "";
- $this->configFieldSets[] = $this->_t(2) . "configFieldSets[] = $this->_t(3) . "type=\"text\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(2) . "configFieldSets[] = Indent::_(3) . "type=\"text\"";
+ $this->configFieldSets[] = Indent::_(3)
. "name=\"site_chartarealeft\"";
- $this->configFieldSets[] = $this->_t(3) . "label=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "label=\"" . $lang
. "_CHARTAREALEFT_LABEL\"";
- $this->configFieldSets[] = $this->_t(3) . "size=\"20\"";
- $this->configFieldSets[] = $this->_t(3) . "maxlength=\"50\"";
- $this->configFieldSets[] = $this->_t(3) . "description=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "size=\"20\"";
+ $this->configFieldSets[] = Indent::_(3) . "maxlength=\"50\"";
+ $this->configFieldSets[] = Indent::_(3) . "description=\"" . $lang
. "_CHARTAREALEFT_DESC\"";
- $this->configFieldSets[] = $this->_t(3) . "class=\"text_area\"";
- $this->configFieldSets[] = $this->_t(3) . "filter=\"INT\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3) . "class=\"text_area\"";
+ $this->configFieldSets[] = Indent::_(3) . "filter=\"INT\"";
+ $this->configFieldSets[] = Indent::_(3)
. "message=\"Error! Please add left spacing here.\"";
- $this->configFieldSets[] = $this->_t(3) . "hint=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "hint=\"" . $lang
. "_CHARTAREALEFT_HINT\"";
- $this->configFieldSets[] = $this->_t(2) . "/>";
- $this->configFieldSets[] = $this->_t(2) . "";
- $this->configFieldSets[] = $this->_t(2) . "configFieldSets[] = $this->_t(3) . "type=\"text\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(2) . "configFieldSets[] = Indent::_(3) . "type=\"text\"";
+ $this->configFieldSets[] = Indent::_(3)
. "name=\"site_chartareawidth\"";
- $this->configFieldSets[] = $this->_t(3) . "label=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "label=\"" . $lang
. "_CHARTAREAWIDTH_LABEL\"";
- $this->configFieldSets[] = $this->_t(3) . "size=\"20\"";
- $this->configFieldSets[] = $this->_t(3) . "maxlength=\"50\"";
- $this->configFieldSets[] = $this->_t(3) . "description=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "size=\"20\"";
+ $this->configFieldSets[] = Indent::_(3) . "maxlength=\"50\"";
+ $this->configFieldSets[] = Indent::_(3) . "description=\"" . $lang
. "_CHARTAREAWIDTH_DESC\"";
- $this->configFieldSets[] = $this->_t(3) . "class=\"text_area\"";
- $this->configFieldSets[] = $this->_t(3) . "filter=\"INT\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3) . "class=\"text_area\"";
+ $this->configFieldSets[] = Indent::_(3) . "filter=\"INT\"";
+ $this->configFieldSets[] = Indent::_(3)
. "message=\"Error! Please add chart width here.\"";
- $this->configFieldSets[] = $this->_t(3) . "hint=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "hint=\"" . $lang
. "_CHARTAREAWIDTH_HINT\"";
- $this->configFieldSets[] = $this->_t(2) . "/>";
- $this->configFieldSets[] = $this->_t(2) . "";
- $this->configFieldSets[] = $this->_t(2)
+ $this->configFieldSets[] = Indent::_(2)
. "configFieldSets[] = $this->_t(3) . "type=\"color\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(2) . "configFieldSets[] = Indent::_(3) . "type=\"color\"";
+ $this->configFieldSets[] = Indent::_(3)
. "name=\"site_legendtextstylefontcolor\"";
- $this->configFieldSets[] = $this->_t(3) . "default=\"#63B1F2\"";
- $this->configFieldSets[] = $this->_t(3) . "label=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "default=\"#63B1F2\"";
+ $this->configFieldSets[] = Indent::_(3) . "label=\"" . $lang
. "_LEGENDTEXTSTYLEFONTCOLOR_LABEL\"";
- $this->configFieldSets[] = $this->_t(3) . "description=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "description=\"" . $lang
. "_LEGENDTEXTSTYLEFONTCOLOR_DESC\"";
- $this->configFieldSets[] = $this->_t(2) . "/>";
- $this->configFieldSets[] = $this->_t(2) . "";
- $this->configFieldSets[] = $this->_t(2) . "configFieldSets[] = $this->_t(3) . "type=\"text\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(2) . "configFieldSets[] = Indent::_(3) . "type=\"text\"";
+ $this->configFieldSets[] = Indent::_(3)
. "name=\"site_legendtextstylefontsize\"";
- $this->configFieldSets[] = $this->_t(3) . "label=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "label=\"" . $lang
. "_LEGENDTEXTSTYLEFONTSIZE_LABEL\"";
- $this->configFieldSets[] = $this->_t(3) . "size=\"20\"";
- $this->configFieldSets[] = $this->_t(3) . "maxlength=\"50\"";
- $this->configFieldSets[] = $this->_t(3) . "description=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "size=\"20\"";
+ $this->configFieldSets[] = Indent::_(3) . "maxlength=\"50\"";
+ $this->configFieldSets[] = Indent::_(3) . "description=\"" . $lang
. "_LEGENDTEXTSTYLEFONTSIZE_DESC\"";
- $this->configFieldSets[] = $this->_t(3) . "class=\"text_area\"";
- $this->configFieldSets[] = $this->_t(3) . "filter=\"INT\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3) . "class=\"text_area\"";
+ $this->configFieldSets[] = Indent::_(3) . "filter=\"INT\"";
+ $this->configFieldSets[] = Indent::_(3)
. "message=\"Error! Please add size of the legend here.\"";
- $this->configFieldSets[] = $this->_t(3) . "hint=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "hint=\"" . $lang
. "_LEGENDTEXTSTYLEFONTSIZE_HINT\"";
- $this->configFieldSets[] = $this->_t(2) . "/>";
- $this->configFieldSets[] = $this->_t(2) . "";
- $this->configFieldSets[] = $this->_t(2)
+ $this->configFieldSets[] = Indent::_(2)
. "configFieldSets[] = $this->_t(3) . "type=\"color\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(2) . "configFieldSets[] = Indent::_(3) . "type=\"color\"";
+ $this->configFieldSets[] = Indent::_(3)
. "name=\"site_vaxistextstylefontcolor\"";
- $this->configFieldSets[] = $this->_t(3) . "default=\"#63B1F2\"";
- $this->configFieldSets[] = $this->_t(3) . "label=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "default=\"#63B1F2\"";
+ $this->configFieldSets[] = Indent::_(3) . "label=\"" . $lang
. "_VAXISTEXTSTYLEFONTCOLOR_LABEL\"";
- $this->configFieldSets[] = $this->_t(3) . "description=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "description=\"" . $lang
. "_VAXISTEXTSTYLEFONTCOLOR_DESC\"";
- $this->configFieldSets[] = $this->_t(2) . "/>";
- $this->configFieldSets[] = $this->_t(2) . "";
- $this->configFieldSets[] = $this->_t(2)
+ $this->configFieldSets[] = Indent::_(2)
. "configFieldSets[] = $this->_t(3) . "type=\"color\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(2) . "configFieldSets[] = Indent::_(3) . "type=\"color\"";
+ $this->configFieldSets[] = Indent::_(3)
. "name=\"site_haxistextstylefontcolor\"";
- $this->configFieldSets[] = $this->_t(3) . "default=\"#63B1F2\"";
- $this->configFieldSets[] = $this->_t(3) . "label=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "default=\"#63B1F2\"";
+ $this->configFieldSets[] = Indent::_(3) . "label=\"" . $lang
. "_HAXISTEXTSTYLEFONTCOLOR_LABEL\"";
- $this->configFieldSets[] = $this->_t(3) . "description=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "description=\"" . $lang
. "_HAXISTEXTSTYLEFONTCOLOR_DESC\"";
- $this->configFieldSets[] = $this->_t(2) . "/>";
- $this->configFieldSets[] = $this->_t(2) . "";
- $this->configFieldSets[] = $this->_t(2) . "configFieldSets[] = $this->_t(3) . "type=\"color\"";
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(2) . "configFieldSets[] = Indent::_(3) . "type=\"color\"";
+ $this->configFieldSets[] = Indent::_(3)
. "name=\"site_haxistitletextstylefontcolor\"";
- $this->configFieldSets[] = $this->_t(3) . "default=\"#63B1F2\"";
- $this->configFieldSets[] = $this->_t(3) . "label=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "default=\"#63B1F2\"";
+ $this->configFieldSets[] = Indent::_(3) . "label=\"" . $lang
. "_HAXISTITLETEXTSTYLEFONTCOLOR_LABEL\"";
- $this->configFieldSets[] = $this->_t(3) . "description=\"" . $lang
+ $this->configFieldSets[] = Indent::_(3) . "description=\"" . $lang
. "_HAXISTITLETEXTSTYLEFONTCOLOR_DESC\"";
- $this->configFieldSets[] = $this->_t(2) . "/>";
+ $this->configFieldSets[] = Indent::_(2) . "/>";
// add custom Encryption Settings fields
if (isset($this->configFieldSetsCustomField['Chart Settings'])
@@ -26700,124 +24748,124 @@ function vdm_dkim() {
unset($this->configFieldSetsCustomField['Chart Settings']);
}
- $this->configFieldSets[] = $this->_t(1) . "";
+ $this->configFieldSets[] = Indent::_(1) . "";
// set params defaults
$this->extensionsParams[]
= '"admin_chartbackground":"#F7F7FA","admin_mainwidth":"1000","admin_chartareatop":"20","admin_chartarealeft":"20","admin_chartareawidth":"170","admin_legendtextstylefontcolor":"10","admin_legendtextstylefontsize":"20","admin_vaxistextstylefontcolor":"#63B1F2","admin_haxistextstylefontcolor":"#63B1F2","admin_haxistitletextstylefontcolor":"#63B1F2","site_chartbackground":"#F7F7FA","site_mainwidth":"1000","site_chartareatop":"20","site_chartarealeft":"20","site_chartareawidth":"170","site_legendtextstylefontcolor":"10","site_legendtextstylefontsize":"20","site_vaxistextstylefontcolor":"#63B1F2","site_haxistextstylefontcolor":"#63B1F2","site_haxistitletextstylefontcolor":"#63B1F2"';
// set field lang
- $this->setLangContent(
- $this->lang, $lang . '_CHART_SETTINGS_LABEL', "Chart Settings"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_CHART_SETTINGS_LABEL', "Chart Settings"
);
- $this->setLangContent(
- $this->lang, $lang . '_CHART_SETTINGS_DESC',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_CHART_SETTINGS_DESC',
"The Google Chart Display Settings Are Made Here."
);
- $this->setLangContent(
- $this->lang, $lang . '_ADMIN_CHART_NOTE_LABEL', "Admin Settings"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_ADMIN_CHART_NOTE_LABEL', "Admin Settings"
);
- $this->setLangContent(
- $this->lang, $lang . '_ADMIN_CHART_NOTE_DESC',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_ADMIN_CHART_NOTE_DESC',
"The following settings are used on the back-end of the site called (admin)."
);
- $this->setLangContent(
- $this->lang, $lang . '_SITE_CHART_NOTE_LABEL', "Site Settings"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_SITE_CHART_NOTE_LABEL', "Site Settings"
);
- $this->setLangContent(
- $this->lang, $lang . '_SITE_CHART_NOTE_DESC',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_SITE_CHART_NOTE_DESC',
"The following settings are used on the front-end of the site called (site)."
);
- $this->setLangContent(
- $this->lang, $lang . '_CHARTAREALEFT_DESC',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_CHARTAREALEFT_DESC',
"Set in pixels the spacing from the left of the chart area to the beginning of the chart it self. Please don't add the px sign"
);
- $this->setLangContent(
- $this->lang, $lang . '_CHARTAREALEFT_HINT', "170"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_CHARTAREALEFT_HINT', "170"
);
- $this->setLangContent(
- $this->lang, $lang . '_CHARTAREALEFT_LABEL', "Left Spacing"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_CHARTAREALEFT_LABEL', "Left Spacing"
);
- $this->setLangContent(
- $this->lang, $lang . '_CHARTAREATOP_DESC',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_CHARTAREATOP_DESC',
"Set in pixels the spacing from the top of the chart area to the beginning of the chart it self. Please don't add the px sign"
);
- $this->setLangContent(
- $this->lang, $lang . '_CHARTAREATOP_HINT', "20"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_CHARTAREATOP_HINT', "20"
);
- $this->setLangContent(
- $this->lang, $lang . '_CHARTAREATOP_LABEL', "Top Spacing"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_CHARTAREATOP_LABEL', "Top Spacing"
);
- $this->setLangContent(
- $this->lang, $lang . '_CHARTAREAWIDTH_DESC',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_CHARTAREAWIDTH_DESC',
"Set in % the width of the chart it self inside the chart area. Please don't add the % sign"
);
- $this->setLangContent(
- $this->lang, $lang . '_CHARTAREAWIDTH_HINT', "60"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_CHARTAREAWIDTH_HINT', "60"
);
- $this->setLangContent(
- $this->lang, $lang . '_CHARTAREAWIDTH_LABEL', "Chart Width"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_CHARTAREAWIDTH_LABEL', "Chart Width"
);
- $this->setLangContent(
- $this->lang, $lang . '_CHARTBACKGROUND_DESC',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_CHARTBACKGROUND_DESC',
"Select the chart background color here."
);
- $this->setLangContent(
- $this->lang, $lang . '_CHARTBACKGROUND_LABEL',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_CHARTBACKGROUND_LABEL',
"Chart Background"
);
- $this->setLangContent(
- $this->lang, $lang . '_HAXISTEXTSTYLEFONTCOLOR_DESC',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_HAXISTEXTSTYLEFONTCOLOR_DESC',
"Select the horizontal axis font color."
);
- $this->setLangContent(
- $this->lang, $lang . '_HAXISTEXTSTYLEFONTCOLOR_LABEL',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_HAXISTEXTSTYLEFONTCOLOR_LABEL',
"hAxis Font Color"
);
- $this->setLangContent(
- $this->lang, $lang . '_HAXISTITLETEXTSTYLEFONTCOLOR_DESC',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_HAXISTITLETEXTSTYLEFONTCOLOR_DESC',
"Select the horizontal axis title's font color."
);
- $this->setLangContent(
- $this->lang, $lang . '_HAXISTITLETEXTSTYLEFONTCOLOR_LABEL',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_HAXISTITLETEXTSTYLEFONTCOLOR_LABEL',
"hAxis Title Font Color"
);
- $this->setLangContent(
- $this->lang, $lang . '_LEGENDTEXTSTYLEFONTCOLOR_DESC',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_LEGENDTEXTSTYLEFONTCOLOR_DESC',
"Select the legend font color."
);
- $this->setLangContent(
- $this->lang, $lang . '_LEGENDTEXTSTYLEFONTCOLOR_LABEL',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_LEGENDTEXTSTYLEFONTCOLOR_LABEL',
"Legend Font Color"
);
- $this->setLangContent(
- $this->lang, $lang . '_LEGENDTEXTSTYLEFONTSIZE_DESC',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_LEGENDTEXTSTYLEFONTSIZE_DESC',
"Set in pixels the font size of the legend"
);
- $this->setLangContent(
- $this->lang, $lang . '_LEGENDTEXTSTYLEFONTSIZE_HINT', "10"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_LEGENDTEXTSTYLEFONTSIZE_HINT', "10"
);
- $this->setLangContent(
- $this->lang, $lang . '_LEGENDTEXTSTYLEFONTSIZE_LABEL',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_LEGENDTEXTSTYLEFONTSIZE_LABEL',
"Legend Font Size"
);
- $this->setLangContent(
- $this->lang, $lang . '_MAINWIDTH_DESC',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_MAINWIDTH_DESC',
"Set the width of the entire chart area"
);
- $this->setLangContent(
- $this->lang, $lang . '_MAINWIDTH_HINT', "1000"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_MAINWIDTH_HINT', "1000"
);
- $this->setLangContent(
- $this->lang, $lang . '_MAINWIDTH_LABEL', "Chart Area Width"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_MAINWIDTH_LABEL', "Chart Area Width"
);
- $this->setLangContent(
- $this->lang, $lang . '_VAXISTEXTSTYLEFONTCOLOR_DESC',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_VAXISTEXTSTYLEFONTCOLOR_DESC',
"Select the vertical axis font color."
);
- $this->setLangContent(
- $this->lang, $lang . '_VAXISTEXTSTYLEFONTCOLOR_LABEL',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_VAXISTEXTSTYLEFONTCOLOR_LABEL',
"vAxis Font Color"
);
}
@@ -26831,10 +24879,10 @@ function vdm_dkim() {
// enable the loading of dynamic field sets
$dynamicAddFields = array();
// Add encryption if needed
- if ((isset($this->basicEncryption) && $this->basicEncryption)
- || (isset($this->whmcsEncryption) && $this->whmcsEncryption)
- || (isset($this->mediumEncryption) && $this->mediumEncryption)
- || $this->componentData->add_license
+ if (CFactory::_('Config')->basic_encryption
+ || CFactory::_('Config')->whmcs_encryption
+ || CFactory::_('Config')->medium_encryption
+ || CFactory::_('Component')->get('add_license')
|| (isset($this->configFieldSetsCustomField['Encryption Settings'])
&& ArrayHelper::check(
$this->configFieldSetsCustomField['Encryption Settings']
@@ -26842,74 +24890,70 @@ function vdm_dkim() {
{
$dynamicAddFields[] = "Encryption Settings";
// start building field set for encryption functions
- $this->configFieldSets[] = $this->_t(1) . "configFieldSets[] = $this->_t(2)
+ $this->configFieldSets[] = Indent::_(1) . "configFieldSets[] = Indent::_(2)
. 'name="encryption_config"';
- $this->configFieldSets[] = $this->_t(2) . 'label="' . $lang
+ $this->configFieldSets[] = Indent::_(2) . 'label="' . $lang
. '_ENCRYPTION_LABEL"';
- $this->configFieldSets[] = $this->_t(2) . 'description="' . $lang
+ $this->configFieldSets[] = Indent::_(2) . 'description="' . $lang
. '_ENCRYPTION_DESC">';
// set tab lang
- if (((isset($this->basicEncryption) && $this->basicEncryption)
- || (isset($this->mediumEncryption)
- && $this->mediumEncryption)
- || (isset($this->whmcsEncryption)
- && $this->whmcsEncryption))
- && $this->componentData->add_license
- && $this->componentData->license_type == 3)
+ if ((CFactory::_('Config')->basic_encryption
+ || CFactory::_('Config')->medium_encryption
+ || CFactory::_('Config')->whmcs_encryption)
+ && CFactory::_('Component')->get('add_license')
+ && CFactory::_('Component')->get('license_type', 0) == 3)
{
- $this->setLangContent(
- $this->lang, $lang . '_ENCRYPTION_LABEL',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_ENCRYPTION_LABEL',
"License & Encryption Settings"
);
- $this->setLangContent(
- $this->lang, $lang . '_ENCRYPTION_DESC',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_ENCRYPTION_DESC',
"The license & encryption keys are set here."
);
// add the next dynamic option
$dynamicAddFields[] = "License & Encryption Settings";
}
- elseif (((isset($this->basicEncryption) && $this->basicEncryption)
- || (isset($this->mediumEncryption)
- && $this->mediumEncryption)
- || (isset($this->whmcsEncryption)
- && $this->whmcsEncryption))
- && $this->componentData->add_license
- && $this->componentData->license_type == 2)
+ elseif ((CFactory::_('Config')->basic_encryption
+ || CFactory::_('Config')->medium_encryption
+ || CFactory::_('Config')->whmcs_encryption)
+ && CFactory::_('Component')->get('add_license')
+ && CFactory::_('Component')->get('license_type', 0) == 2)
{
- $this->setLangContent(
- $this->lang, $lang . '_ENCRYPTION_LABEL',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_ENCRYPTION_LABEL',
"Update & Encryption Settings"
);
- $this->setLangContent(
- $this->lang, $lang . '_ENCRYPTION_DESC',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_ENCRYPTION_DESC',
"The update & encryption keys are set here."
);
// add the next dynamic option
$dynamicAddFields[] = "Update & Encryption Settings";
}
- elseif ($this->componentData->add_license
- && $this->componentData->license_type == 3)
+ elseif (CFactory::_('Component')->get('add_license')
+ && CFactory::_('Component')->get('license_type', 0) == 3)
{
- $this->setLangContent(
- $this->lang, $lang . '_ENCRYPTION_LABEL', "License Settings"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_ENCRYPTION_LABEL', "License Settings"
);
- $this->setLangContent(
- $this->lang, $lang . '_ENCRYPTION_DESC',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_ENCRYPTION_DESC',
"The license key is set here."
);
// add the next dynamic option
$dynamicAddFields[] = "License Settings";
}
- elseif ($this->componentData->add_license
- && $this->componentData->license_type == 2)
+ elseif (CFactory::_('Component')->get('add_license')
+ && CFactory::_('Component')->get('license_type', 0) == 2)
{
- $this->setLangContent(
- $this->lang, $lang . '_ENCRYPTION_LABEL', "Update Settings"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_ENCRYPTION_LABEL', "Update Settings"
);
- $this->setLangContent(
- $this->lang, $lang . '_ENCRYPTION_DESC',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_ENCRYPTION_DESC',
"The update key is set here."
);
// add the next dynamic option
@@ -26917,209 +24961,209 @@ function vdm_dkim() {
}
else
{
- $this->setLangContent(
- $this->lang, $lang . '_ENCRYPTION_LABEL',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_ENCRYPTION_LABEL',
"Encryption Settings"
);
- $this->setLangContent(
- $this->lang, $lang . '_ENCRYPTION_DESC',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_ENCRYPTION_DESC',
"The encryption key for the field encryption is set here."
);
}
- if (isset($this->basicEncryption) && $this->basicEncryption)
+ if (CFactory::_('Config')->basic_encryption)
{
// set field lang
- $this->setLangContent(
- $this->lang, $lang . '_BASIC_KEY_LABEL', "Basic Key"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_BASIC_KEY_LABEL', "Basic Key"
);
- $this->setLangContent(
- $this->lang, $lang . '_BASIC_KEY_DESC',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_BASIC_KEY_DESC',
"Set the basic local key here."
);
- $this->setLangContent(
- $this->lang, $lang . '_BASIC_KEY_NOTE_LABEL',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_BASIC_KEY_NOTE_LABEL',
"Basic Encryption"
);
- $this->setLangContent(
- $this->lang, $lang . '_BASIC_KEY_NOTE_DESC',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_BASIC_KEY_NOTE_DESC',
"When using the basic encryption please use set a 32 character passphrase.
Never change this passphrase once it is set! DATA WILL GET CORRUPTED IF YOU DO!"
);
// set the field
- $this->configFieldSets[] = $this->_t(2)
+ $this->configFieldSets[] = Indent::_(2)
. 'configFieldSets[] = $this->_t(3) . 'type="text"';
- $this->configFieldSets[] = $this->_t(3) . 'label="' . $lang
+ $this->configFieldSets[] = Indent::_(3) . 'type="text"';
+ $this->configFieldSets[] = Indent::_(3) . 'label="' . $lang
. '_BASIC_KEY_LABEL"';
- $this->configFieldSets[] = $this->_t(3) . 'description="'
+ $this->configFieldSets[] = Indent::_(3) . 'description="'
. $lang . '_BASIC_KEY_DESC"';
- $this->configFieldSets[] = $this->_t(3) . 'size="60"';
- $this->configFieldSets[] = $this->_t(3) . 'default=""';
- $this->configFieldSets[] = $this->_t(2) . "/>";
+ $this->configFieldSets[] = Indent::_(3) . 'size="60"';
+ $this->configFieldSets[] = Indent::_(3) . 'default=""';
+ $this->configFieldSets[] = Indent::_(2) . "/>";
}
- if (isset($this->mediumEncryption) && $this->mediumEncryption)
+ if (CFactory::_('Config')->medium_encryption)
{
// set field lang
- $this->setLangContent(
- $this->lang, $lang . '_MEDIUM_KEY_LABEL',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_MEDIUM_KEY_LABEL',
"Medium Key (Path)"
);
- $this->setLangContent(
- $this->lang, $lang . '_MEDIUM_KEY_DESC',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_MEDIUM_KEY_DESC',
"Set the full path to where the key file must be stored. Make sure it is behind the root folder of your website, so that it is not public accessible."
);
- $this->setLangContent(
- $this->lang, $lang . '_MEDIUM_KEY_NOTE_LABEL',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_MEDIUM_KEY_NOTE_LABEL',
"Medium Encryption"
);
- $this->setLangContent(
- $this->lang, $lang . '_MEDIUM_KEY_NOTE_DESC',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_MEDIUM_KEY_NOTE_DESC',
"When using the medium encryption option, the system generates its own key and stores it in a file at the folder/path you set here.
Never change this key once it is set, or remove the key file! DATA WILL GET CORRUPTED IF YOU DO! Also make sure the full path to where the the key file should be stored, is behind the root folder of your website/system, so that it is not public accessible. Making a backup of this key file over a secure connection is recommended!"
);
// set the field
- $this->configFieldSets[] = $this->_t(2)
+ $this->configFieldSets[] = Indent::_(2)
. 'configFieldSets[] = $this->_t(3) . 'type="text"';
- $this->configFieldSets[] = $this->_t(3) . 'label="' . $lang
+ $this->configFieldSets[] = Indent::_(3) . 'type="text"';
+ $this->configFieldSets[] = Indent::_(3) . 'label="' . $lang
. '_MEDIUM_KEY_LABEL"';
- $this->configFieldSets[] = $this->_t(3) . 'description="'
+ $this->configFieldSets[] = Indent::_(3) . 'description="'
. $lang . '_MEDIUM_KEY_DESC"';
- $this->configFieldSets[] = $this->_t(3) . 'size="160"';
- $this->configFieldSets[] = $this->_t(3) . 'filter="PATH"';
- $this->configFieldSets[] = $this->_t(3)
+ $this->configFieldSets[] = Indent::_(3) . 'size="160"';
+ $this->configFieldSets[] = Indent::_(3) . 'filter="PATH"';
+ $this->configFieldSets[] = Indent::_(3)
. 'hint="/home/user/hiddenfolder123/"';
- $this->configFieldSets[] = $this->_t(3) . 'default=""';
- $this->configFieldSets[] = $this->_t(2) . "/>";
+ $this->configFieldSets[] = Indent::_(3) . 'default=""';
+ $this->configFieldSets[] = Indent::_(2) . "/>";
// set some error message if the path does not exist
- $this->setLangContent(
- $this->lang, $lang . '_MEDIUM_KEY_PATH_ERROR',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_MEDIUM_KEY_PATH_ERROR',
"Medium key path (for encryption of various fields) does not exist, or is not writable. Please check the path and update it in the global option of this component."
);
}
- if (isset($this->whmcsEncryption) && $this->whmcsEncryption
- || $this->componentData->add_license)
+ if (CFactory::_('Config')->whmcs_encryption
+ || CFactory::_('Component')->get('add_license'))
{
// set field lang label and description
- if ($this->componentData->add_license
- && $this->componentData->license_type == 3)
+ if (CFactory::_('Component')->get('add_license')
+ && CFactory::_('Component')->get('license_type', 0) == 3)
{
- $this->setLangContent(
- $this->lang, $lang . '_WHMCS_KEY_LABEL',
- $this->componentData->companyname . " License Key"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_WHMCS_KEY_LABEL',
+ CFactory::_('Component')->get('companyname', '') . " License Key"
);
- $this->setLangContent(
- $this->lang, $lang . '_WHMCS_KEY_DESC',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_WHMCS_KEY_DESC',
"Add the license key you recieved from "
- . $this->componentData->companyname . " here."
+ . CFactory::_('Component')->get('companyname', '') . " here."
);
}
- elseif ($this->componentData->add_license
- && $this->componentData->license_type == 2)
+ elseif (CFactory::_('Component')->get('add_license')
+ && CFactory::_('Component')->get('license_type', 0) == 2)
{
- $this->setLangContent(
- $this->lang, $lang . '_WHMCS_KEY_LABEL',
- $this->componentData->companyname . " Update Key"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_WHMCS_KEY_LABEL',
+ CFactory::_('Component')->get('companyname', '') . " Update Key"
);
- $this->setLangContent(
- $this->lang, $lang . '_WHMCS_KEY_DESC',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_WHMCS_KEY_DESC',
"Add the update key you recieved from "
- . $this->componentData->companyname . " here."
+ . CFactory::_('Component')->get('companyname', '') . " here."
);
}
else
{
- $this->setLangContent(
- $this->lang, $lang . '_WHMCS_KEY_LABEL',
- $this->componentData->companyname . " Key"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_WHMCS_KEY_LABEL',
+ CFactory::_('Component')->get('companyname', '') . " Key"
);
- $this->setLangContent(
- $this->lang, $lang . '_WHMCS_KEY_DESC',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_WHMCS_KEY_DESC',
"Add the key you recieved from "
- . $this->componentData->companyname . " here."
+ . CFactory::_('Component')->get('companyname', '') . " here."
);
}
// ajust the notice based on license
- if ($this->componentData->license_type == 3)
+ if (CFactory::_('Component')->get('license_type',0) == 3)
{
- $this->setLangContent(
- $this->lang, $lang . '_WHMCS_KEY_NOTE_LABEL',
- "Your " . $this->componentData->companyname
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_WHMCS_KEY_NOTE_LABEL',
+ "Your " . CFactory::_('Component')->get('companyname','')
. " License Key"
);
}
- elseif ($this->componentData->license_type == 2)
+ elseif (CFactory::_('Component')->get('license_type',0) == 2)
{
- $this->setLangContent(
- $this->lang, $lang . '_WHMCS_KEY_NOTE_LABEL',
- "Your " . $this->componentData->companyname
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_WHMCS_KEY_NOTE_LABEL',
+ "Your " . CFactory::_('Component')->get('companyname','')
. " Update Key"
);
}
else
{
- if (isset($this->whmcsEncryption) && $this->whmcsEncryption)
+ if (CFactory::_('Config')->whmcs_encryption)
{
- $this->setLangContent(
- $this->lang, $lang . '_WHMCS_KEY_NOTE_LABEL',
- "Your " . $this->componentData->companyname
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_WHMCS_KEY_NOTE_LABEL',
+ "Your " . CFactory::_('Component')->get('companyname','')
. " Field Encryption Key"
);
}
else
{
- $this->setLangContent(
- $this->lang, $lang . '_WHMCS_KEY_NOTE_LABEL',
- "Your " . $this->componentData->companyname . " Key"
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_WHMCS_KEY_NOTE_LABEL',
+ "Your " . CFactory::_('Component')->get('companyname','') . " Key"
);
}
}
// add the description based on global settings
- if (isset($this->whmcsEncryption) && $this->whmcsEncryption)
+ if (CFactory::_('Config')->whmcs_encryption)
{
- $this->setLangContent(
- $this->lang, $lang . '_WHMCS_KEY_NOTE_DESC',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_WHMCS_KEY_NOTE_DESC',
"You need to get this key from get('whmcs_buy_link','')
. "' target='_blank'>"
- . $this->componentData->companyname
+ . CFactory::_('Component')->get('companyname','')
. ".
When using the "
- . $this->componentData->companyname
+ . CFactory::_('Component')->get('companyname','')
. " field encryption you can never change this key once it is set! DATA WILL GET CORRUPTED IF YOU DO!"
);
}
else
{
- $this->setLangContent(
- $this->lang, $lang . '_WHMCS_KEY_NOTE_DESC',
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target, $lang . '_WHMCS_KEY_NOTE_DESC',
"You need to get this key from get('whmcs_buy_link','')
. "' target='_blank'>"
- . $this->componentData->companyname . "."
+ . CFactory::_('Component')->get('companyname','') . "."
);
}
// set the fields
- $this->configFieldSets[] = $this->_t(2)
+ $this->configFieldSets[] = Indent::_(2)
. 'configFieldSets[] = $this->_t(3) . 'type="text"';
- $this->configFieldSets[] = $this->_t(3) . 'label="' . $lang
+ $this->configFieldSets[] = Indent::_(3) . 'type="text"';
+ $this->configFieldSets[] = Indent::_(3) . 'label="' . $lang
. '_WHMCS_KEY_LABEL"';
- $this->configFieldSets[] = $this->_t(3) . 'description="'
+ $this->configFieldSets[] = Indent::_(3) . 'description="'
. $lang . '_WHMCS_KEY_DESC"';
- $this->configFieldSets[] = $this->_t(3) . 'size="60"';
- $this->configFieldSets[] = $this->_t(3) . 'default=""';
- $this->configFieldSets[] = $this->_t(2) . "/>";
+ $this->configFieldSets[] = Indent::_(3) . 'size="60"';
+ $this->configFieldSets[] = Indent::_(3) . 'default=""';
+ $this->configFieldSets[] = Indent::_(2) . "/>";
}
// load the dynamic field sets
foreach ($dynamicAddFields as $dynamicAddField)
@@ -27137,34 +25181,30 @@ function vdm_dkim() {
}
}
// close that fieldset
- $this->configFieldSets[] = $this->_t(1) . "";
+ $this->configFieldSets[] = Indent::_(1) . "";
}
}
- public function setAccessSectionsCategory($nameSingleCode, $nameListCode
- )
+ public function setAccessSectionsCategory($nameSingleCode, $nameListCode)
{
$component = '';
// check if view has category
- if (array_key_exists($nameSingleCode, $this->catCodeBuilder))
+ $otherViews = CFactory::_('Compiler.Builder.Category.Code')->getString("{$nameSingleCode}.views");
+ if ($otherViews !== null && $otherViews == $nameListCode)
{
- $otherViews = $this->catCodeBuilder[$nameSingleCode]['views'];
- if ($otherViews == $nameListCode)
- {
- $component .= PHP_EOL . $this->_t(1)
- . '';
- $component .= PHP_EOL . $this->_t(2)
- . ' ";
- }
+ $component .= PHP_EOL . Indent::_(1)
+ . '';
+ $component .= PHP_EOL . Indent::_(2)
+ . ' ";
}
return $component;
@@ -27174,30 +25214,30 @@ function vdm_dkim() {
{
$component = '';
// set all the core field permissions
- $component .= PHP_EOL . $this->_t(1) . '';
- $component .= PHP_EOL . $this->_t(2)
+ $component .= PHP_EOL . Indent::_(1) . '';
+ $component .= PHP_EOL . Indent::_(2)
. ' ';
- $component .= PHP_EOL . $this->_t(1) . '';
- $component .= PHP_EOL . $this->_t(2)
+ $component .= PHP_EOL . Indent::_(1) . ' ';
+ $component .= PHP_EOL . Indent::_(1) . '';
+ $component .= PHP_EOL . Indent::_(2)
. ' ';
+ $component .= PHP_EOL . Indent::_(1) . ' ';
return $component;
}
@@ -27205,104 +25245,137 @@ function vdm_dkim() {
public function setAccessSections()
{
// access size counter
- $this->accessSize = 12; // ;)
- // set the default component access values
- $this->componentHead = array();
- $this->componentGlobal = array();
- $this->permissionViews = array();
+ CFactory::_('Utilities.Counter')->accessSize = 12; // ;)
+ // Get the default fields
+ $default_fields = CFactory::_('Config')->default_fields;
+
+ // for plugin event TODO change event api signatures
+ $component_context = CFactory::_('Config')->component_context;
// Trigger Event: jcb_ce_onBeforeBuildAccessSections
- $this->triggerEvent(
+ CFactory::_('Event')->trigger(
'jcb_ce_onBeforeBuildAccessSections',
- array(&$this->componentContext, &$this)
+ array(&$component_context, &$this)
);
-
- $this->componentHead[] = '';
-
- $this->componentHead[] = $this->_t(2)
- . '';
- foreach ($actions as $action)
- {
- $componentViews[] = $this->_t(2) . $action;
- }
- $componentViews[] = $this->_t(1) . " ";
- }
- }
/// now build the section
- $component = implode(PHP_EOL, $this->componentHead);
- // sort the array to insure easy search
- ksort($this->componentGlobal, SORT_STRING);
- // add global to the compnent section
- $component .= PHP_EOL . implode(PHP_EOL, $this->componentGlobal)
- . PHP_EOL . $this->_t(1) . " ";
+ $component = CFactory::_('Compiler.Builder.Permission.Component')->build();
// add views to the component section
- $component .= PHP_EOL . implode(PHP_EOL, $componentViews);
- // be sure to reset again. (memory)
- $this->componentHead = null;
- $this->componentGlobal = null;
- $this->permissionViews = null;
+ $component .= CFactory::_('Compiler.Builder.Permission.Views')->build();
// remove the fix, is not needed
- if ($this->accessSize < 30)
+ if (CFactory::_('Utilities.Counter')->accessSize < 30)
{
// since we have less than 30 actions
// we do not need the fix for this component
$this->addAssetsTableFix = 0;
+ CFactory::_('Config')->set('add_assets_table_fix', $this->addAssetsTableFix);
}
else
{
- // get the worse case column size required (can be worse I know)
+ // get the worst case column size required (can be worse I know)
// access/action size x 20 characters x 8 groups
- $character_length = (int) MathHelper::bc(
- 'mul', $this->accessSize, 20, 0
+ $character_length = (int) MathHelper::bc(
+ 'mul', CFactory::_('Utilities.Counter')->accessSize, 20, 0
);
- $this->accessWorseCase = (int) MathHelper::bc(
+ // set worse case
+ CFactory::_('Config')->set('access_worse_case', (int) MathHelper::bc(
'mul', $character_length, 8, 0
- );
+ ));
}
// return the build
@@ -27733,458 +25769,43 @@ function vdm_dkim() {
$sortButtonKey = StringHelper::safe(
$nameView . ' ' . $customButtonName . ' Button Access'
);
- $this->setLangContent(
+ CFactory::_('Language')->set(
'bothadmin', $customButtonTitle,
$nameView . ' ' . $customButtonName . ' Button Access'
);
- $this->setLangContent(
+ CFactory::_('Language')->set(
'bothadmin', $customButtonDesc,
' Allows the users in this group to access the '
. StringHelper::safe($customButtonName, 'w')
. ' button.'
);
- $this->componentGlobal[$sortButtonKey] = $this->_t(2)
- . 'script.php ';
}
// should the sql install be added
if ($module->add_sql)
{
- $xml .= PHP_EOL . PHP_EOL . $this->_t(1) . '';
- $xml .= PHP_EOL . $this->_t(1) . '';
- $xml .= PHP_EOL . $this->_t(2) . '';
- $xml .= PHP_EOL . $this->_t(3)
+ $xml .= PHP_EOL . Indent::_(1) . '';
+ $xml .= PHP_EOL . Indent::_(2) . '';
+ $xml .= PHP_EOL . Indent::_(3)
. 'sql/mysql/install.sql ';
- $xml .= PHP_EOL . $this->_t(2) . ' ';
- $xml .= PHP_EOL . $this->_t(1) . ' ';
+ $xml .= PHP_EOL . Indent::_(2) . ' ';
+ $xml .= PHP_EOL . Indent::_(1) . ' ';
}
// should the sql uninstall be added
if ($module->add_sql_uninstall)
{
- $xml .= PHP_EOL . PHP_EOL . $this->_t(1) . '';
- $xml .= PHP_EOL . $this->_t(1) . '';
- $xml .= PHP_EOL . $this->_t(2) . '';
- $xml .= PHP_EOL . $this->_t(3)
+ $xml .= PHP_EOL . Indent::_(1) . '';
+ $xml .= PHP_EOL . Indent::_(2) . '';
+ $xml .= PHP_EOL . Indent::_(3)
. 'sql/mysql/uninstall.sql ';
- $xml .= PHP_EOL . $this->_t(2) . ' ';
- $xml .= PHP_EOL . $this->_t(1) . ' ';
+ $xml .= PHP_EOL . Indent::_(2) . ' ';
+ $xml .= PHP_EOL . Indent::_(1) . ' ';
}
// should the language xml be added
if (ArrayHelper::check($addLang))
{
- $xml .= PHP_EOL . PHP_EOL . $this->_t(1) . '';
- $xml .= PHP_EOL . $this->_t(1)
+ $xml .= PHP_EOL . Indent::_(1)
. '';
// load all the language files to xml
foreach ($addLang as $addTag)
{
- $xml .= PHP_EOL . $this->_t(2) . '' . $addTag . '/' . $addTag . '.'
. $module->file_name . '.ini ';
- $xml .= PHP_EOL . $this->_t(2) . '' . $addTag . '/' . $addTag . '.'
. $module->file_name . '.sys.ini ';
}
- $xml .= PHP_EOL . $this->_t(1) . ' ';
+ $xml .= PHP_EOL . Indent::_(1) . '';
}
// add the module files
- $xml .= PHP_EOL . PHP_EOL . $this->_t(1) . '';
- $xml .= PHP_EOL . $this->_t(1) . '';
- $xml .= PHP_EOL . $this->_t(2) . 'file_name . '">' . $module->file_name
. '.php ';
// add other files found
@@ -28539,7 +26170,7 @@ function vdm_dkim() {
// only add what is not ignored
if (!in_array($file, $ignore))
{
- $xml .= PHP_EOL . $this->_t(2) . '' . $file
+ $xml .= PHP_EOL . Indent::_(2) . '' . $file
. ' ';
}
}
@@ -28547,12 +26178,12 @@ function vdm_dkim() {
// add language folder
if (ArrayHelper::check($addLang))
{
- $xml .= PHP_EOL . $this->_t(2) . 'language ';
+ $xml .= PHP_EOL . Indent::_(2) . 'language ';
}
// add sql folder
if ($module->add_sql || $module->add_sql_uninstall)
{
- $xml .= PHP_EOL . $this->_t(2) . 'sql ';
+ $xml .= PHP_EOL . Indent::_(2) . 'sql ';
}
// add other files found
if (ArrayHelper::check($folders))
@@ -28562,39 +26193,39 @@ function vdm_dkim() {
// only add what is not ignored
if (!in_array($folder, $ignore))
{
- $xml .= PHP_EOL . $this->_t(2) . '' . $folder
+ $xml .= PHP_EOL . Indent::_(2) . '' . $folder
. ' ';
}
}
}
- $xml .= PHP_EOL . $this->_t(1) . ' ';
+ $xml .= PHP_EOL . Indent::_(1) . '';
// now add the Config Params if needed
if (ArrayHelper::check($config_fields))
{
- $xml .= PHP_EOL . PHP_EOL . $this->_t(1) . '';
// only add if part of the component field types path is required
if ($add_component_path)
{
// add path to module rules and custom fields
- $xml .= PHP_EOL . $this->_t(1) . '_t(2)
+ $xml .= PHP_EOL . Indent::_(1) . '_t(2)
+ . CFactory::_('Config')->component_code_name . '/models/rules"';
+ $xml .= PHP_EOL . Indent::_(2)
. 'addfieldpath="/administrator/components/com_'
- . $this->componentCodeName . '/models/fields"';
- $xml .= PHP_EOL . $this->_t(1) . '>';
+ . CFactory::_('Config')->component_code_name . '/models/fields"';
+ $xml .= PHP_EOL . Indent::_(1) . '>';
}
else
{
- $xml .= PHP_EOL . $this->_t(1) . '';
+ $xml .= PHP_EOL . Indent::_(1) . '';
}
// add the fields
foreach ($module->config_fields as $field_name => $fieldsets)
{
- $xml .= PHP_EOL . $this->_t(1) . '';
foreach ($fieldsets as $fieldset => $fields)
{
@@ -28647,30 +26278,30 @@ function vdm_dkim() {
|| isset($module->add_field_path[$field_name . $fieldset]))
{
- $xml .= PHP_EOL . $this->_t(1) . '';
- $xml .= PHP_EOL . $this->_t(1) . '';
}
- $xml .= PHP_EOL . $this->_t(1) . ' ';
+ $xml .= PHP_EOL . Indent::_(1) . '';
}
- $xml .= PHP_EOL . $this->_t(1) . ' ';
+ $xml .= PHP_EOL . Indent::_(1) . ' ';
}
// set update server if found
if ($module->add_update_server)
{
- $xml .= PHP_EOL . PHP_EOL . $this->_t(1) . '';
- $xml .= PHP_EOL . $this->_t(1) . '';
- $xml .= PHP_EOL . $this->_t(2)
+ $xml .= PHP_EOL . Indent::_(1) . '';
+ $xml .= PHP_EOL . Indent::_(2)
. '' . $module->update_server_url
. ' ';
- $xml .= PHP_EOL . $this->_t(1) . ' ';
+ $xml .= PHP_EOL . Indent::_(1) . ' ';
}
return $xml;
@@ -28704,13 +26335,15 @@ function vdm_dkim() {
public function getPluginMainClass(&$plugin)
{
- return
- $this->setPlaceholders(PHP_EOL . $plugin->head . PHP_EOL .
+ return CFactory::_('Placeholder')->update(
+ PHP_EOL . $plugin->head . PHP_EOL .
$plugin->comment . PHP_EOL . 'class ' .
$plugin->class_name . ' extends ' .
$plugin->extends . PHP_EOL . '{' . PHP_EOL .
$plugin->main_class_code . PHP_EOL .
- "}" . PHP_EOL, $this->fileContentStatic);
+ "}" . PHP_EOL,
+ CFactory::_('Compiler.Builder.Content.One')->allActive()
+ );
}
public function getPluginMainXML(&$plugin)
@@ -28759,25 +26392,28 @@ function vdm_dkim() {
// switch to add the language xml
$addLang = array();
// now build the language files
- if (isset($this->langContent[$plugin->key]))
+ if (CFactory::_('Language')->exist($plugin->key))
{
+ // for plugin event TODO change event api signatures
+ $langContent = CFactory::_('Language')->getTarget($plugin->key);
+ $component_context = CFactory::_('Config')->component_context;
// Trigger Event: jcb_ce_onBeforeBuildPluginLang
- $this->triggerEvent(
+ CFactory::_('Event')->trigger(
'jcb_ce_onBeforeBuildPluginLang',
- array(&$this->componentContext, &$plugin,
- &$this->langContent[$plugin->key],
+ array(&$component_context, &$plugin,
+ &$langContent,
&$plugin->lang_prefix, &$plugin->official_name)
);
// get other languages
- $values = array_unique($this->langContent[$plugin->key]);
+ $values = array_unique($langContent);
// get the other lang strings if there is any
$this->multiLangString = $this->getMultiLangStrings($values);
// start the plugins language bucket (must rest every time)
$this->languages['plugins'] = array();
- $this->languages['plugins'][$this->langTag] = array();
- $this->languages['plugins'][$this->langTag]['all']
- = $this->langContent[$plugin->key];
- unset($this->langContent[$plugin->key]);
+ $this->languages['plugins'][CFactory::_('Config')->get('lang_tag', 'en-GB')] = array();
+ $this->languages['plugins'][CFactory::_('Config')->get('lang_tag', 'en-GB')]['all']
+ = $langContent;
+ CFactory::_('Language')->setTarget($plugin->key, null);
// update insert the current lang in to DB
$this->setLangPlaceholders($values, $plugin->id, 'plugins');
// remove old unused language strings
@@ -28785,12 +26421,14 @@ function vdm_dkim() {
$total = count($values);
unset($values);
// Trigger Event: jcb_ce_onBeforeBuildPluginLangFiles
- $this->triggerEvent(
+ CFactory::_('Event')->trigger(
'jcb_ce_onBeforeBuildPluginLangFiles',
- array(&$this->componentContext, &$plugin,
+ array(&$component_context, &$plugin,
&$this->languages['plugins'],
&$this->langTag)
);
+ // for plugin event TODO change event api signatures
+ CFactory::_('Config')->lang_tag = $this->langTag;
// now we insert the values into the files
if (ArrayHelper::check($this->languages['plugins']))
{
@@ -28800,9 +26438,9 @@ function vdm_dkim() {
$tag = trim($tag);
foreach ($areas as $area => $languageStrings)
{
- $file_name = $tag . '.plg_' . strtolower($plugin->group)
+ $file_name = $tag . '.plg_' . strtolower((string) $plugin->group)
. '_'
- . strtolower($plugin->code_name) . '.ini';
+ . strtolower((string) $plugin->code_name) . '.ini';
// check if language should be added
if ($this->shouldLanguageBeAdded(
$tag, $languageStrings, $total,
@@ -28810,10 +26448,8 @@ function vdm_dkim() {
))
{
$lang = array_map(
- function ($langstring, $placeholder) {
- return $placeholder . '="' . $langstring
- . '"';
- }, array_values($languageStrings),
+ fn($langstring, $placeholder) => $placeholder . '="' . $langstring . '"',
+ array_values($languageStrings),
array_keys($languageStrings)
);
// set path
@@ -28824,23 +26460,23 @@ function vdm_dkim() {
{
Folder::create($path);
// count the folder created
- $this->folderCount++;
+ CFactory::_('Utilities.Counter')->folder++;
}
// add to language file
- $this->writeFile(
+ CFactory::_('Utilities.File')->write(
$path . $file_name,
implode(PHP_EOL, $lang)
);
- $this->writeFile(
+ CFactory::_('Utilities.File')->write(
$path . $tag . '.plg_' . strtolower(
- $plugin->group
+ (string) $plugin->group
)
. '_'
- . strtolower($plugin->code_name) . '.sys.ini',
+ . strtolower((string) $plugin->code_name) . '.sys.ini',
implode(PHP_EOL, $lang)
);
// set the line counter
- $this->lineCount = $this->lineCount + count(
+ CFactory::_('Utilities.Counter')->line += count(
(array) $lang
);
unset($lang);
@@ -28861,67 +26497,67 @@ function vdm_dkim() {
// should the scriptfile be added
if ($plugin->add_install_script)
{
- $xml .= PHP_EOL . PHP_EOL . $this->_t(1) . '';
- $xml .= PHP_EOL . $this->_t(1)
+ $xml .= PHP_EOL . Indent::_(1)
. 'script.php ';
}
// should the sql install be added
if ($plugin->add_sql)
{
- $xml .= PHP_EOL . PHP_EOL . $this->_t(1) . '';
- $xml .= PHP_EOL . $this->_t(1) . '';
- $xml .= PHP_EOL . $this->_t(2) . '';
- $xml .= PHP_EOL . $this->_t(3)
+ $xml .= PHP_EOL . Indent::_(1) . '';
+ $xml .= PHP_EOL . Indent::_(2) . '';
+ $xml .= PHP_EOL . Indent::_(3)
. 'sql/mysql/install.sql ';
- $xml .= PHP_EOL . $this->_t(2) . ' ';
- $xml .= PHP_EOL . $this->_t(1) . ' ';
+ $xml .= PHP_EOL . Indent::_(2) . ' ';
+ $xml .= PHP_EOL . Indent::_(1) . ' ';
}
// should the sql uninstall be added
if ($plugin->add_sql_uninstall)
{
- $xml .= PHP_EOL . PHP_EOL . $this->_t(1) . '';
- $xml .= PHP_EOL . $this->_t(1) . '';
- $xml .= PHP_EOL . $this->_t(2) . '';
- $xml .= PHP_EOL . $this->_t(3)
+ $xml .= PHP_EOL . Indent::_(1) . '';
+ $xml .= PHP_EOL . Indent::_(2) . '';
+ $xml .= PHP_EOL . Indent::_(3)
. 'sql/mysql/uninstall.sql ';
- $xml .= PHP_EOL . $this->_t(2) . ' ';
- $xml .= PHP_EOL . $this->_t(1) . ' ';
+ $xml .= PHP_EOL . Indent::_(2) . ' ';
+ $xml .= PHP_EOL . Indent::_(1) . ' ';
}
// should the language xml be added
if (ArrayHelper::check($addLang))
{
- $xml .= PHP_EOL . PHP_EOL . $this->_t(1) . '';
- $xml .= PHP_EOL . $this->_t(1) . '';
+ $xml .= PHP_EOL . Indent::_(1) . '';
// load all the language files to xml
foreach ($addLang as $addTag)
{
- $xml .= PHP_EOL . $this->_t(2) . '' . $addTag . '/' . $addTag . '.plg_'
- . strtolower($plugin->group) . '_' . strtolower(
- $plugin->code_name
+ . strtolower((string) $plugin->group) . '_' . strtolower(
+ (string) $plugin->code_name
) . '.ini ';
- $xml .= PHP_EOL . $this->_t(2) . '' . $addTag . '/' . $addTag . '.plg_'
- . strtolower($plugin->group) . '_' . strtolower(
- $plugin->code_name
+ . strtolower((string) $plugin->group) . '_' . strtolower(
+ (string) $plugin->code_name
) . '.sys.ini ';
}
- $xml .= PHP_EOL . $this->_t(1) . ' ';
+ $xml .= PHP_EOL . Indent::_(1) . ' ';
}
// add the plugin files
- $xml .= PHP_EOL . PHP_EOL . $this->_t(1) . '';
- $xml .= PHP_EOL . $this->_t(1) . '';
- $xml .= PHP_EOL . $this->_t(2) . 'file_name . '">' . $plugin->file_name
. '.php ';
// add other files found
@@ -28932,7 +26568,7 @@ function vdm_dkim() {
// only add what is not ignored
if (!in_array($file, $ignore))
{
- $xml .= PHP_EOL . $this->_t(2) . '' . $file
+ $xml .= PHP_EOL . Indent::_(2) . '' . $file
. ' ';
}
}
@@ -28940,12 +26576,12 @@ function vdm_dkim() {
// add language folder
if (ArrayHelper::check($addLang))
{
- $xml .= PHP_EOL . $this->_t(2) . 'language ';
+ $xml .= PHP_EOL . Indent::_(2) . 'language ';
}
// add sql folder
if ($plugin->add_sql || $plugin->add_sql_uninstall)
{
- $xml .= PHP_EOL . $this->_t(2) . 'sql ';
+ $xml .= PHP_EOL . Indent::_(2) . 'sql ';
}
// add other files found
if (ArrayHelper::check($folders))
@@ -28955,39 +26591,39 @@ function vdm_dkim() {
// only add what is not ignored
if (!in_array($folder, $ignore))
{
- $xml .= PHP_EOL . $this->_t(2) . '' . $folder
+ $xml .= PHP_EOL . Indent::_(2) . '' . $folder
. ' ';
}
}
}
- $xml .= PHP_EOL . $this->_t(1) . ' ';
+ $xml .= PHP_EOL . Indent::_(1) . '';
// now add the Config Params if needed
if (ArrayHelper::check($config_fields))
{
- $xml .= PHP_EOL . PHP_EOL . $this->_t(1) . '';
// only add if part of the component field types path is required
if ($add_component_path)
{
// add path to plugin rules and custom fields
- $xml .= PHP_EOL . $this->_t(1) . '_t(2)
+ $xml .= PHP_EOL . Indent::_(1) . '_t(2)
+ . CFactory::_('Config')->component_code_name . '/models/rules"';
+ $xml .= PHP_EOL . Indent::_(2)
. 'addfieldpath="/administrator/components/com_'
- . $this->componentCodeName . '/models/fields"';
- $xml .= PHP_EOL . $this->_t(1) . '>';
+ . CFactory::_('Config')->component_code_name . '/models/fields"';
+ $xml .= PHP_EOL . Indent::_(1) . '>';
}
else
{
- $xml .= PHP_EOL . $this->_t(1) . '';
+ $xml .= PHP_EOL . Indent::_(1) . '';
}
// add the fields
foreach ($plugin->config_fields as $field_name => $fieldsets)
{
- $xml .= PHP_EOL . $this->_t(1) . '';
foreach ($fieldsets as $fieldset => $fields)
{
@@ -29005,16 +26641,16 @@ function vdm_dkim() {
if (!isset($plugin->add_rule_path[$field_name . $fieldset]))
{
$plugin->add_rule_path[$field_name . $fieldset] =
- '/plugins/' . strtolower($plugin->group
- ) . '/' . strtolower($plugin->code_name)
+ '/plugins/' . strtolower((string) $plugin->group
+ ) . '/' . strtolower((string) $plugin->code_name)
. '/rules';
}
if (!isset($plugin->add_field_path[$field_name . $fieldset]))
{
$plugin->add_field_path[$field_name . $fieldset] =
- '/plugins/' . strtolower($plugin->group
- ) . '/' . strtolower($plugin->code_name)
+ '/plugins/' . strtolower((string) $plugin->group
+ ) . '/' . strtolower((string) $plugin->code_name)
. '/fields';
}
}
@@ -29022,30 +26658,30 @@ function vdm_dkim() {
if (isset($plugin->add_rule_path[$field_name . $fieldset])
|| isset($plugin->add_field_path[$field_name . $fieldset]))
{
- $xml .= PHP_EOL . $this->_t(1) . '';
- $xml .= PHP_EOL . $this->_t(1) . '';
}
- $xml .= PHP_EOL . $this->_t(1) . ' ';
+ $xml .= PHP_EOL . Indent::_(1) . '';
}
- $xml .= PHP_EOL . $this->_t(1) . ' ';
+ $xml .= PHP_EOL . Indent::_(1) . ' ';
}
// set update server if found
if ($plugin->add_update_server)
{
- $xml .= PHP_EOL . PHP_EOL . $this->_t(1) . '';
- $xml .= PHP_EOL . $this->_t(1) . '';
- $xml .= PHP_EOL . $this->_t(2)
+ $xml .= PHP_EOL . Indent::_(1) . '';
+ $xml .= PHP_EOL . Indent::_(2)
. '' . $plugin->update_server_url
. ' ';
- $xml .= PHP_EOL . $this->_t(1) . ' ';
+ $xml .= PHP_EOL . Indent::_(1) . ' ';
}
return $xml;
@@ -29091,10 +26727,10 @@ function vdm_dkim() {
if (StringHelper::check($power->description))
{
// check if this is escaped
- if (strpos($power->description, '/*') === false)
+ if (strpos((string) $power->description, '/*') === false)
{
// make this description escaped
- $power->description = '/**' . PHP_EOL . ' * ' . implode(PHP_EOL . ' * ', explode(PHP_EOL, $power->description)) . PHP_EOL . ' */';
+ $power->description = '/**' . PHP_EOL . ' * ' . implode(PHP_EOL . ' * ', explode(PHP_EOL, (string) $power->description)) . PHP_EOL . ' */';
}
$code[] = PHP_EOL . $power->description;
}
@@ -29119,136 +26755,7 @@ function vdm_dkim() {
}
$code[] = '}' . PHP_EOL . PHP_EOL;
- return $this->setPlaceholders(implode(PHP_EOL, $code), $this->fileContentStatic);
- }
-
- public function setPowersAutoloader($namespace, $loadSite)
- {
- if (($size = ArrayHelper::check($namespace)) > 0)
- {
- // check if we are using a plugin
- $use_plugin = isset($this->fileContentStatic[$this->hhh . 'PLUGIN_POWER_AUTOLOADER' . $this->hhh]);
- // build the methods
- $autoloadNotSiteMethod = array();
- $autoloadMethod = array();
- // add only if we are not using a plugin
- $tab_space = 2;
- if (!$use_plugin)
- {
- $autoloadNotSiteMethod[] = PHP_EOL . PHP_EOL;
- $tab_space = 0;
- }
- elseif (!$loadSite)
- {
- // we add code to prevent this plugin from triggering on the site area
- $autoloadNotSiteMethod[] = PHP_EOL . $this->_t(2) . '//'
- . $this->setLine(__LINE__) . ' do not run the autoloader in the site area';
- $autoloadNotSiteMethod[] = $this->_t(2) . 'if ($this->app->isClient(\'site\'))';
- $autoloadNotSiteMethod[] = $this->_t(2) . '{';
- $autoloadNotSiteMethod[] = $this->_t(3) . 'return;';
- $autoloadNotSiteMethod[] = $this->_t(2) . '}' . PHP_EOL;
- }
- // we start building the spl_autoload_register function call
- $autoloadMethod[] = $this->_t($tab_space) . '//'
- . $this->setLine(__LINE__) . ' register this component namespace';
- $autoloadMethod[] = $this->_t($tab_space) . 'spl_autoload_register(function ($class) {';
- $autoloadMethod[] = $this->_t($tab_space) . $this->_t(1) . '//'
- . $this->setLine(__LINE__) . ' project-specific base directories and namespace prefix';
- $autoloadMethod[] = $this->_t($tab_space) . $this->_t(1) . '$search = array(';
- // ==== IMPORTANT NOTICE =====
- // make sure the name space values are sorted from the longest string to the shortest
- // so that the search do not mistakenly match a shorter namespace before a longer one
- // that has the same short namespace for example:
- // NameSpace\SubName\Sub <- will always match first
- // NameSpace\SubName\SubSubName
- // Should the shorter namespace be listed [first] it will match both of these:
- // NameSpace\SubName\Sub\ClassName
- // ^^^^^^^^^^^^^^^^^^^^^
- // NameSpace\SubName\SubSubName\ClassName
- // ^^^^^^^^^^^^^^^^^^^^^
- uksort($namespace, function ($a, $b) {
- return strlen($b) - strlen($a);
- });
- // counter to manage the comma in the actual array
- $counter = 1;
- foreach ($namespace as $base_dir => $prefix)
- {
- // don't add the ending comma on last value
- if ($size == $counter)
- {
- $autoloadMethod[] = $this->_t($tab_space) . $this->_t(2) . "'$this->jcbPowersPath/$base_dir' => '" . implode('\\\\', $prefix) . "'";
- }
- else
- {
- $autoloadMethod[] = $this->_t($tab_space) . $this->_t(2) . "'$this->jcbPowersPath/$base_dir' => '" . implode('\\\\', $prefix) . "',";
- }
- $counter++;
- }
- $autoloadMethod[] = $this->_t($tab_space) . $this->_t(1) . ');';
- $autoloadMethod[] = $this->_t($tab_space) . $this->_t(1) . '// Start the search and load if found';
- $autoloadMethod[] = $this->_t($tab_space) . $this->_t(1) . '$found = false;';
- $autoloadMethod[] = $this->_t($tab_space) . $this->_t(1) . '$found_base_dir = "";';
- $autoloadMethod[] = $this->_t($tab_space) . $this->_t(1) . '$found_len = 0;';
- $autoloadMethod[] = $this->_t($tab_space) . $this->_t(1) . 'foreach ($search as $base_dir => $prefix)';
- $autoloadMethod[] = $this->_t($tab_space) . $this->_t(1) . '{';
- $autoloadMethod[] = $this->_t($tab_space) . $this->_t(2) . '//'
- . $this->setLine(__LINE__) . ' does the class use the namespace prefix?';
- $autoloadMethod[] = $this->_t($tab_space) . $this->_t(2) . '$len = strlen($prefix);';
- $autoloadMethod[] = $this->_t($tab_space) . $this->_t(2) . 'if (strncmp($prefix, $class, $len) === 0)';
- $autoloadMethod[] = $this->_t($tab_space) . $this->_t(2) . '{';
- $autoloadMethod[] = $this->_t($tab_space) . $this->_t(3) . '//'
- . $this->setLine(__LINE__) . ' we have a match so load the values';
- $autoloadMethod[] = $this->_t($tab_space) . $this->_t(3) . '$found = true;';
- $autoloadMethod[] = $this->_t($tab_space) . $this->_t(3) . '$found_base_dir = $base_dir;';
- $autoloadMethod[] = $this->_t($tab_space) . $this->_t(3) . '$found_len = $len;';
- $autoloadMethod[] = $this->_t($tab_space) . $this->_t(3) . '//'
- . $this->setLine(__LINE__) . ' done here';
- $autoloadMethod[] = $this->_t($tab_space) . $this->_t(3) . 'break;';
- $autoloadMethod[] = $this->_t($tab_space) . $this->_t(2) . '}';
- $autoloadMethod[] = $this->_t($tab_space) . $this->_t(1) . '}';
- $autoloadMethod[] = $this->_t($tab_space) . $this->_t(1) . '//'
- . $this->setLine(__LINE__) . ' check if we found a match';
- $autoloadMethod[] = $this->_t($tab_space) . $this->_t(1) . 'if (!$found)';
- $autoloadMethod[] = $this->_t($tab_space) . $this->_t(1) . '{';
- $autoloadMethod[] = $this->_t($tab_space) . $this->_t(2) . '//'
- . $this->setLine(__LINE__) . ' no, move to the next registered autoloader';
- $autoloadMethod[] = $this->_t($tab_space) . $this->_t(2) . 'return;';
- $autoloadMethod[] = $this->_t($tab_space) . $this->_t(1) . '}';
- $autoloadMethod[] = $this->_t($tab_space) . $this->_t(1) . '//'
- . $this->setLine(__LINE__) . ' get the relative class name';
- $autoloadMethod[] = $this->_t($tab_space) . $this->_t(1) . '$relative_class = substr($class, $found_len);';
- $autoloadMethod[] = $this->_t($tab_space) . $this->_t(1) . '//'
- . $this->setLine(__LINE__) . ' replace the namespace prefix with the base directory, replace namespace';
- $autoloadMethod[] = $this->_t($tab_space) . $this->_t(1) . '// separators with directory separators in the relative class name, append';
- $autoloadMethod[] = $this->_t($tab_space) . $this->_t(1) . '// with .php';
- $autoloadMethod[] = $this->_t($tab_space) . $this->_t(1) . "\$file = JPATH_ROOT . '/' . \$found_base_dir . '/src' . str_replace('\\\\', '/', \$relative_class) . '.php';";
- $autoloadMethod[] = $this->_t($tab_space) . $this->_t(1) . '//'
- . $this->setLine(__LINE__) . ' if the file exists, require it';
- $autoloadMethod[] = $this->_t($tab_space) . $this->_t(1) . 'if (file_exists($file))';
- $autoloadMethod[] = $this->_t($tab_space) . $this->_t(1) . '{';
- $autoloadMethod[] = $this->_t($tab_space) . $this->_t(2) . 'require $file;';
- $autoloadMethod[] = $this->_t($tab_space) . $this->_t(1) . '}';
- $autoloadMethod[] = $this->_t($tab_space) . '});';
- // create the method string
- $autoloader = implode(PHP_EOL, $autoloadNotSiteMethod) . implode(PHP_EOL, $autoloadMethod);
- // check if we are using a plugin
- if ($use_plugin)
- {
- $this->fileContentStatic[$this->hhh . 'PLUGIN_POWER_AUTOLOADER' . $this->hhh] = PHP_EOL . $autoloader;
- }
- else
- {
- // load to events placeholders
- $this->fileContentStatic[$this->hhh . 'ADMIN_POWER_HELPER' . $this->hhh] .= $autoloader;
- // load to site if needed
- if ($loadSite)
- {
- $this->fileContentStatic[$this->hhh . 'SITE_POWER_HELPER' . $this->hhh] .= $autoloader;
- }
- }
- // to add to custom files
- $this->fileContentStatic[$this->hhh . 'CUSTOM_POWER_AUTOLOADER' . $this->hhh] .= PHP_EOL . implode(PHP_EOL, $autoloadMethod);
- }
+ return CFactory::_('Placeholder')->update(implode(PHP_EOL, $code), CFactory::_('Compiler.Builder.Content.One')->allActive());
}
/**
@@ -29261,249 +26768,27 @@ function vdm_dkim() {
* @return string The fields set in xml
*
*/
- public function getExtensionFieldsetXML(&$extension, &$fields, $dbkey = 'zz'
- )
+ public function getExtensionFieldsetXML(&$extension, &$fields, $dbkey = 'zz')
{
+ // get global placeholders
+ $placeholder = CFactory::_('Component.Placeholder')->get();
// build the fieldset
- return $this->getFieldsetXML(
+ return CFactory::_('Compiler.Creator.Fieldset.Dynamic')->get(
$fields, $extension->lang_prefix, $extension->key, $extension->key,
- $this->globalPlaceholders, $dbkey
+ $placeholder, $dbkey
);
}
- public function getExtensionInstallClass(&$extension)
- {
- // yes we are adding it
- $script = PHP_EOL . '/**';
- $script .= PHP_EOL . ' * ' . $extension->official_name
- . ' script file.';
- $script .= PHP_EOL . ' *';
- $script .= PHP_EOL . ' * @package ' . $extension->class_name;
- $script .= PHP_EOL . ' */';
- $script .= PHP_EOL . 'class ' . $extension->installer_class_name;
- $script .= PHP_EOL . '{';
- // set constructor
- if (isset($extension->add_php_script_construct)
- && $extension->add_php_script_construct == 1
- && StringHelper::check(
- $extension->php_script_construct
- ))
- {
- $script .= $this->setInstallMethodScript(
- 'construct', $extension->php_script_construct
- );
- }
- // add PHP in extension install
- $addScriptMethods = array('php_preflight', 'php_postflight',
- 'php_method');
- $addScriptTypes = array('install', 'update', 'uninstall',
- 'discover_install');
- // set some buckets for sorting
- $function_install = array();
- $function_update = array();
- $function_uninstall = array();
- $has_php_preflight = false;
- $function_php_preflight = array('install' => array(),
- 'uninstall' => array(),
- 'discover_install' => array(),
- 'update' => array());
- $has_php_postflight = false;
- $function_php_postflight = array('install' => array(),
- 'uninstall' => array(),
- 'discover_install' => array(),
- 'update' => array());
- // the function sorter
- foreach ($addScriptMethods as $scriptMethod)
- {
- foreach ($addScriptTypes as $scriptType)
- {
- if (isset(
- $extension->{'add_' . $scriptMethod . '_' . $scriptType}
- )
- && $extension->{'add_' . $scriptMethod . '_' . $scriptType}
- == 1
- && StringHelper::check(
- $extension->{$scriptMethod . '_' . $scriptType}
- ))
- {
- // add to the main methods
- if ('php_method' === $scriptMethod)
- {
- ${'function_' . $scriptType}[]
- = $extension->{$scriptMethod . '_' . $scriptType};
- }
- else
- {
- ${'function_' . $scriptMethod}[$scriptType][]
- = $extension->{$scriptMethod
- . '_' . $scriptType};
- ${'has_' . $scriptMethod} = true;
- }
- }
- }
- }
- // now add the install script.
- if (ArrayHelper::check($function_install))
- {
- $script .= $this->setInstallMethodScript(
- 'install', $function_install
- );
- }
- // now add the update script.
- if (ArrayHelper::check($function_update))
- {
- $script .= $this->setInstallMethodScript(
- 'update', $function_update
- );
- }
- // now add the uninstall script.
- if (ArrayHelper::check($function_uninstall))
- {
- $script .= $this->setInstallMethodScript(
- 'uninstall', $function_uninstall
- );
- }
- // now add the preflight script.
- if ($has_php_preflight)
- {
- $script .= $this->setInstallMethodScript(
- 'preflight', $function_php_preflight
- );
- }
- // now add the postflight script.
- if ($has_php_postflight)
- {
- $script .= $this->setInstallMethodScript(
- 'postflight', $function_php_postflight
- );
- }
- $script .= PHP_EOL . '}' . PHP_EOL;
-
- return $script;
- }
-
- protected function setInstallMethodScript($function_name, &$scripts)
- {
- $script = '';
- // build function
- switch ($function_name)
- {
- case 'install':
- case 'update':
- case 'uninstall':
- // the main function types
- $script = PHP_EOL . PHP_EOL . $this->_t(1) . '/**';
- $script .= PHP_EOL . $this->_t(1) . ' * Called on '
- . $function_name;
- $script .= PHP_EOL . $this->_t(1) . ' *';
- $script .= PHP_EOL . $this->_t(1)
- . ' * @param JAdapterInstance $adapter The object responsible for running this script';
- $script .= PHP_EOL . $this->_t(1) . ' *';
- $script .= PHP_EOL . $this->_t(1)
- . ' * @return boolean True on success';
- $script .= PHP_EOL . $this->_t(1) . ' */';
- $script .= PHP_EOL . $this->_t(1) . 'public function '
- . $function_name . '(JAdapterInstance $adapter)';
- $script .= PHP_EOL . $this->_t(1) . '{';
- $script .= PHP_EOL . implode(PHP_EOL . PHP_EOL, $scripts);
- // return true
- if ('uninstall' !== $function_name)
- {
- $script .= PHP_EOL . $this->_t(2) . 'return true;';
- }
- break;
- case 'preflight':
- case 'postflight':
- // the pre/post function types
- $script = PHP_EOL . PHP_EOL . $this->_t(1) . '/**';
- $script .= PHP_EOL . $this->_t(1)
- . ' * Called before any type of action';
- $script .= PHP_EOL . $this->_t(1) . ' *';
- $script .= PHP_EOL . $this->_t(1)
- . ' * @param string $route Which action is happening (install|uninstall|discover_install|update)';
- $script .= PHP_EOL . $this->_t(1)
- . ' * @param JAdapterInstance $adapter The object responsible for running this script';
- $script .= PHP_EOL . $this->_t(1) . ' *';
- $script .= PHP_EOL . $this->_t(1)
- . ' * @return boolean True on success';
- $script .= PHP_EOL . $this->_t(1) . ' */';
- $script .= PHP_EOL . $this->_t(1) . 'public function '
- . $function_name . '($route, JAdapterInstance $adapter)';
- $script .= PHP_EOL . $this->_t(1) . '{';
- $script .= PHP_EOL . $this->_t(2) . '//' . $this->setLine(
- __LINE__
- ) . ' get application';
- $script .= PHP_EOL . $this->_t(2)
- . '$app = JFactory::getApplication();' . PHP_EOL;
- // add the default version check (TODO) must make this dynamic
- if ('preflight' === $function_name)
- {
- $script .= PHP_EOL . $this->_t(2) . '//' . $this->setLine(
- __LINE__
- ) . ' the default for both install and update';
- $script .= PHP_EOL . $this->_t(2)
- . '$jversion = new JVersion();';
- $script .= PHP_EOL . $this->_t(2)
- . "if (!\$jversion->isCompatible('3.8.0'))";
- $script .= PHP_EOL . $this->_t(2) . '{';
- $script .= PHP_EOL . $this->_t(3)
- . "\$app->enqueueMessage('Please upgrade to at least Joomla! 3.8.0 before continuing!', 'error');";
- $script .= PHP_EOL . $this->_t(3) . 'return false;';
- $script .= PHP_EOL . $this->_t(2) . '}' . PHP_EOL;
- }
- // now add the scripts
- foreach ($scripts as $route => $_script)
- {
- if (ArrayHelper::check($_script))
- {
- // set the if and script
- $script .= PHP_EOL . $this->_t(2) . "if ('" . $route
- . "' === \$route)";
- $script .= PHP_EOL . $this->_t(2) . '{';
- $script .= PHP_EOL . implode(
- PHP_EOL . PHP_EOL, $_script
- );
- $script .= PHP_EOL . $this->_t(2) . '}' . PHP_EOL;
- }
- }
- // return true
- $script .= PHP_EOL . $this->_t(2) . 'return true;';
- break;
- case 'construct':
- // the __construct script
- $script = PHP_EOL . PHP_EOL . $this->_t(1) . '/**';
- $script .= PHP_EOL . $this->_t(1) . ' * Constructor';
- $script .= PHP_EOL . $this->_t(1) . ' *';
- $script .= PHP_EOL . $this->_t(1)
- . ' * @param JAdapterInstance $adapter The object responsible for running this script';
- $script .= PHP_EOL . $this->_t(1) . ' */';
- $script .= PHP_EOL . $this->_t(1)
- . 'public function __construct(JAdapterInstance $adapter)';
- $script .= PHP_EOL . $this->_t(1) . '{';
- $script .= PHP_EOL . $scripts;
- break;
- default:
- // oops error
- return '';
- }
- // close the function
- $script .= PHP_EOL . $this->_t(1) . '}';
-
- return $script;
- }
-
/**
* check if a translation should be added
*
* @return bool
*
*/
- public function shouldLanguageBeAdded(&$tag, &$languageStrings, &$total,
- &$file_name
- )
+ public function shouldLanguageBeAdded(&$tag, &$languageStrings, &$total, &$file_name)
{
- // only log messages for none $this->langTag translations
- if ($this->langTag !== $tag)
+ // only log messages for none CFactory::_('Config')->get('lang_tag', 'en-GB') translations
+ if (CFactory::_('Config')->get('lang_tag', 'en-GB') !== $tag)
{
$langStringNr = count($languageStrings);
$langStringSum = MathHelper::bc(
@@ -29516,7 +26801,7 @@ function vdm_dkim() {
. $tag . ' translated)'
: '(strings ' . $tag . ' translated)';
// force load if debug lines are added
- if (!$this->debugLinenr)
+ if (!CFactory::_('Config')->get('debug_line_nr', false))
{
// check if we should install this translation
if ($percentage < $this->percentageLanguageAdd)
@@ -29524,7 +26809,7 @@ function vdm_dkim() {
// dont add
$this->langNot[$file_name] = ''
. $total . '(total '
- . $this->langTag . ' strings) only '
+ . CFactory::_('Config')->get('lang_tag', 'en-GB') . ' strings) only '
. $langStringNr . '' . $stringNAme
. ' = ' . $percentage;
@@ -29534,7 +26819,7 @@ function vdm_dkim() {
// show if it was added as well
$this->langSet[$file_name] = ''
. $total . '(total '
- . $this->langTag . ' strings) and '
+ . CFactory::_('Config')->get('lang_tag', 'en-GB') . ' strings) and '
. $langStringNr . '' . $stringNAme . ' = '
. $percentage;
}
diff --git a/admin/helpers/compiler/f_Infusion.php b/admin/helpers/compiler/f_Infusion.php
index 88d2b1996..11088496d 100644
--- a/admin/helpers/compiler/f_Infusion.php
+++ b/admin/helpers/compiler/f_Infusion.php
@@ -19,23 +19,44 @@ use VDM\Joomla\Utilities\StringHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\ObjectHelper;
use VDM\Joomla\Utilities\FileHelper;
+use VDM\Joomla\Componentbuilder\Compiler\Factory as CFactory;
+use VDM\Joomla\Componentbuilder\Compiler\Utilities\Placefix;
+use VDM\Joomla\Componentbuilder\Compiler\Utilities\Indent;
+use VDM\Joomla\Componentbuilder\Compiler\Utilities\Line;
+use VDM\Joomla\Componentbuilder\Compiler\Utilities\Minify;
/**
* Infusion class
+ * @deprecated 3.3
*/
class Infusion extends Interpretation
{
+
public $langFiles = array();
+
+ /**
+ * Switch to remove site folder
+ *
+ * @var bool
+ * @deprecated 3.3 Use CFactory::_('Config')->remove_site_folder;
+ */
public $removeSiteFolder = false;
+
+ /**
+ * Switch to remove site edit folder
+ *
+ * @var bool
+ * @deprecated 3.3 Use CFactory::_('Config')->remove_site_edit_folder;
+ */
public $removeSiteEditFolder = true;
/**
* Constructor
*/
- public function __construct($config = array())
+ public function __construct()
{
// first we run the perent constructor
- if (parent::__construct($config))
+ if (parent::__construct())
{
// infuse the data into the structure
return $this->buildFileContent();
@@ -44,24 +65,6 @@ class Infusion extends Interpretation
return false;
}
- /**
- * Set the line number in comments
- *
- * @param int $nr The line number
- *
- * @return void
- *
- */
- private function setLine($nr)
- {
- if ($this->debugLinenr)
- {
- return ' [Infusion ' . $nr . ']';
- }
-
- return '';
- }
-
/**
* Build the content for the structure
*
@@ -71,315 +74,250 @@ class Infusion extends Interpretation
*/
protected function buildFileContent()
{
- if (isset($this->componentData->admin_views)
- && ArrayHelper::check(
- $this->componentData->admin_views
- ))
+ if (CFactory::_('Component')->isArray('admin_views'))
{
+ // for plugin event TODO change event api signatures
+ $placeholders = CFactory::_('Placeholder')->active;
+ $fileContentStatic = CFactory::_('Compiler.Builder.Content.One')->allActive();
+ $fileContentDynamic = CFactory::_('Compiler.Builder.Content.Multi')->allActive();
+ $component_context = CFactory::_('Config')->component_context;
// Trigger Event: jcb_ce_onBeforeBuildFilesContent
- $this->triggerEvent(
+ CFactory::_('Event')->trigger(
'jcb_ce_onBeforeBuildFilesContent',
- array(&$this->componentContext, &$this->componentData,
- &$this->fileContentStatic, &$this->fileContentDynamic,
- &$this->placeholders, &$this->hhh)
+ array(&$component_context, &$this->componentData,
+ &$fileContentStatic, &$fileContentDynamic,
+ &$placeholders, &$this->hhh)
);
+ unset($fileContentStatic);
+ unset($fileContentDynamic);
+ unset($placeholders);
// COMPONENT
- $this->fileContentStatic[$this->hhh . 'COMPONENT' . $this->hhh]
- = $this->placeholders[$this->hhh . 'COMPONENT' . $this->hhh];
+ CFactory::_('Compiler.Builder.Content.One')->set('COMPONENT', CFactory::_('Placeholder')->get('COMPONENT'));
// Component
- $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh]
- = $this->placeholders[$this->hhh . 'Component' . $this->hhh];
+ CFactory::_('Compiler.Builder.Content.One')->set('Component', CFactory::_('Placeholder')->get('Component'));
// component
- $this->fileContentStatic[$this->hhh . 'component' . $this->hhh]
- = $this->placeholders[$this->hhh . 'component' . $this->hhh];
+ CFactory::_('Compiler.Builder.Content.One')->set('component', CFactory::_('Placeholder')->get('component'));
// COMPANYNAME
- $this->fileContentStatic[$this->hhh . 'COMPANYNAME' . $this->hhh]
- = trim(
- JFilterOutput::cleanText($this->componentData->companyname)
- );
+ $companyname = CFactory::_('Component')->get('companyname');
+ CFactory::_('Compiler.Builder.Content.One')->set('COMPANYNAME', trim(
+ (string) JFilterOutput::cleanText($companyname)
+ ));
// CREATIONDATE
- $this->fileContentStatic[$this->hhh . 'CREATIONDATE' . $this->hhh]
- = JFactory::getDate($this->componentData->created)->format(
+ CFactory::_('Compiler.Builder.Content.One')->set('CREATIONDATE',
+ JFactory::getDate(CFactory::_('Component')->get('created'))->format(
'jS F, Y'
- );
- $this->fileContentStatic[$this->hhh . 'CREATIONDATE' . $this->hhh
- . 'GLOBAL']
- = $this->fileContentStatic[$this->hhh . 'CREATIONDATE'
- . $this->hhh];
+ ));
+ CFactory::_('Compiler.Builder.Content.One')->set('GLOBALCREATIONDATE',
+ CFactory::_('Compiler.Builder.Content.One')->get('CREATIONDATE'));
// BUILDDATE
- $this->fileContentStatic[$this->hhh . 'BUILDDATE' . $this->hhh]
- = JFactory::getDate()->format('jS F, Y');
- $this->fileContentStatic[$this->hhh . 'BUILDDATE' . $this->hhh
- . 'GLOBAL']
- = $this->fileContentStatic[$this->hhh . 'BUILDDATE'
- . $this->hhh];
+ CFactory::_('Compiler.Builder.Content.One')->set('BUILDDATE', JFactory::getDate(
+ CFactory::_('Config')->get('build_date', 'now'))->format('jS F, Y'));
+ CFactory::_('Compiler.Builder.Content.One')->set('GLOBALBUILDDATE',
+ CFactory::_('Compiler.Builder.Content.One')->get('BUILDDATE'));
// AUTHOR
- $this->fileContentStatic[$this->hhh . 'AUTHOR' . $this->hhh] = trim(
- JFilterOutput::cleanText($this->componentData->author)
- );
+ $author = CFactory::_('Component')->get('author');
+ CFactory::_('Compiler.Builder.Content.One')->set('AUTHOR', trim(
+ (string) JFilterOutput::cleanText($author)
+ ));
// AUTHOREMAIL
- $this->fileContentStatic[$this->hhh . 'AUTHOREMAIL' . $this->hhh]
- = trim($this->componentData->email);
+ CFactory::_('Compiler.Builder.Content.One')->set('AUTHOREMAIL', trim((string) CFactory::_('Component')->get('email', '')));
// AUTHORWEBSITE
- $this->fileContentStatic[$this->hhh . 'AUTHORWEBSITE' . $this->hhh]
- = trim($this->componentData->website);
+ CFactory::_('Compiler.Builder.Content.One')->set('AUTHORWEBSITE', trim((string) CFactory::_('Component')->get('website', '')));
// COPYRIGHT
- $this->fileContentStatic[$this->hhh . 'COPYRIGHT' . $this->hhh]
- = trim($this->componentData->copyright);
+ CFactory::_('Compiler.Builder.Content.One')->set('COPYRIGHT', trim((string) CFactory::_('Component')->get('copyright', '')));
// LICENSE
- $this->fileContentStatic[$this->hhh . 'LICENSE' . $this->hhh]
- = trim($this->componentData->license);
+ CFactory::_('Compiler.Builder.Content.One')->set('LICENSE', trim((string) CFactory::_('Component')->get('license', '')));
// VERSION
- $this->fileContentStatic[$this->hhh . 'VERSION' . $this->hhh]
- = trim($this->componentData->component_version);
+ CFactory::_('Compiler.Builder.Content.One')->set('VERSION', trim((string) CFactory::_('Component')->get('component_version', '')));
// set the actual global version
- $this->fileContentStatic[$this->hhh . 'ACTUALVERSION' . $this->hhh]
- = $this->fileContentStatic[$this->hhh . 'VERSION' . $this->hhh];
+ CFactory::_('Compiler.Builder.Content.One')->set('ACTUALVERSION', CFactory::_('Compiler.Builder.Content.One')->get('VERSION'));
// do some Tweaks to the version based on selected options
- if (strpos(
- $this->fileContentStatic[$this->hhh . 'VERSION'
- . $this->hhh], '.'
- ) !== false)
+ if (strpos((string) CFactory::_('Compiler.Builder.Content.One')->get('VERSION'), '.') !== false)
{
$versionArray = explode(
- '.', $this->fileContentStatic[$this->hhh . 'VERSION'
- . $this->hhh]
+ '.', (string) CFactory::_('Compiler.Builder.Content.One')->get('VERSION')
);
}
// load only first two values
if (isset($versionArray)
&& ArrayHelper::check(
$versionArray
- )
- && $this->componentData->mvc_versiondate == 2)
+ ) && CFactory::_('Component')->get('mvc_versiondate', 0) == 2)
{
- $this->fileContentStatic[$this->hhh . 'VERSION' . $this->hhh]
- = $versionArray[0] . '.' . $versionArray[1] . '.x';
+ CFactory::_('Compiler.Builder.Content.One')->set('VERSION', $versionArray[0] . '.' . $versionArray[1] . '.x');
}
// load only the first value
elseif (isset($versionArray)
&& ArrayHelper::check(
$versionArray
- )
- && $this->componentData->mvc_versiondate == 3)
+ ) && CFactory::_('Component')->get('mvc_versiondate', 0) == 3)
{
- $this->fileContentStatic[$this->hhh . 'VERSION' . $this->hhh]
- = $versionArray[0] . '.x.x';
+ CFactory::_('Compiler.Builder.Content.One')->set('VERSION', $versionArray[0] . '.x.x');
}
unset($versionArray);
// set the global version in case
- $this->fileContentStatic[$this->hhh . 'VERSION' . $this->hhh
- . 'GLOBAL']
- = $this->fileContentStatic[$this->hhh . 'VERSION' . $this->hhh];
+ CFactory::_('Compiler.Builder.Content.One')->set('GLOBALVERSION', CFactory::_('Compiler.Builder.Content.One')->get('VERSION'));
// set the joomla target xml version
- $this->fileContentStatic[$this->hhh . 'XMLVERSION' . $this->hhh]
- = $this->joomlaVersions[$this->joomlaVersion]['xml_version'];
+ CFactory::_('Compiler.Builder.Content.One')->set('XMLVERSION', CFactory::_('Config')->joomla_versions[CFactory::_('Config')->joomla_version]['xml_version']);
// Component_name
- $this->fileContentStatic[$this->hhh . 'Component_name' . $this->hhh]
- = JFilterOutput::cleanText($this->componentData->name);
+ $name = CFactory::_('Component')->get('name');
+ CFactory::_('Compiler.Builder.Content.One')->set('Component_name', JFilterOutput::cleanText($name));
// SHORT_DISCRIPTION
- $this->fileContentStatic[$this->hhh . 'SHORT_DESCRIPTION'
- . $this->hhh]
- = trim(
- JFilterOutput::cleanText(
- $this->componentData->short_description
+ $short_description = CFactory::_('Component')->get('short_description');
+ CFactory::_('Compiler.Builder.Content.One')->set('SHORT_DESCRIPTION', trim(
+ (string) JFilterOutput::cleanText(
+ $short_description
)
- );
+ ));
// DESCRIPTION
- $this->fileContentStatic[$this->hhh . 'DESCRIPTION' . $this->hhh]
- = trim($this->componentData->description);
+ CFactory::_('Compiler.Builder.Content.One')->set('DESCRIPTION', trim((string) CFactory::_('Component')->get('description')));
// COMP_IMAGE_TYPE
- $this->fileContentStatic[$this->hhh . 'COMP_IMAGE_TYPE'
- . $this->hhh]
- = $this->setComponentImageType($this->componentData->image);
+ CFactory::_('Compiler.Builder.Content.One')->set('COMP_IMAGE_TYPE', $this->setComponentImageType(CFactory::_('Component')->get('image')));
// ACCESS_SECTIONS
- $this->fileContentStatic[$this->hhh . 'ACCESS_SECTIONS'
- . $this->hhh]
- = $this->setAccessSections();
+ CFactory::_('Compiler.Builder.Content.One')->set('ACCESS_SECTIONS', $this->setAccessSections());
// CONFIG_FIELDSETS
- $keepLang = $this->lang;
- $this->lang = 'admin';
+ $keepLang = CFactory::_('Config')->lang_target;
+ CFactory::_('Config')->lang_target = 'admin';
// start loading the category tree scripts
- $this->fileContentStatic[$this->hhh . 'CATEGORY_CLASS_TREES'
- . $this->hhh]
- = '';
+ CFactory::_('Compiler.Builder.Content.One')->set('CATEGORY_CLASS_TREES', '');
// run the field sets for first time
$this->setConfigFieldsets(1);
- $this->lang = $keepLang;
+ CFactory::_('Config')->lang_target = $keepLang;
// ADMINJS
- $this->fileContentStatic[$this->hhh . 'ADMINJS' . $this->hhh]
- = $this->setPlaceholders(
- $this->customScriptBuilder['component_js'], $this->placeholders
- );
+ CFactory::_('Compiler.Builder.Content.One')->set('ADMINJS',
+ CFactory::_('Placeholder')->update_(
+ CFactory::_('Customcode.Dispenser')->hub['component_js']
+ ));
// SITEJS
- $this->fileContentStatic[$this->hhh . 'SITEJS' . $this->hhh]
- = $this->setPlaceholders(
- $this->customScriptBuilder['component_js'], $this->placeholders
- );
+ CFactory::_('Compiler.Builder.Content.One')->set('SITEJS',
+ CFactory::_('Placeholder')->update_(
+ CFactory::_('Customcode.Dispenser')->hub['component_js']
+ ));
// ADMINCSS
- $this->fileContentStatic[$this->hhh . 'ADMINCSS' . $this->hhh]
- = $this->setPlaceholders(
- $this->customScriptBuilder['component_css_admin'],
- $this->placeholders
- );
+ CFactory::_('Compiler.Builder.Content.One')->set('ADMINCSS',
+ CFactory::_('Placeholder')->update_(
+ CFactory::_('Customcode.Dispenser')->hub['component_css_admin']
+ ));
// SITECSS
- $this->fileContentStatic[$this->hhh . 'SITECSS' . $this->hhh]
- = $this->setPlaceholders(
- $this->customScriptBuilder['component_css_site'],
- $this->placeholders
- );
+ CFactory::_('Compiler.Builder.Content.One')->set('SITECSS',
+ CFactory::_('Placeholder')->update_(
+ CFactory::_('Customcode.Dispenser')->hub['component_css_site']
+ ));
// CUSTOM_HELPER_SCRIPT
- $this->fileContentStatic[$this->hhh . 'CUSTOM_HELPER_SCRIPT'
- . $this->hhh]
- = $this->setPlaceholders(
- $this->customScriptBuilder['component_php_helper_admin'],
- $this->placeholders
- );
+ CFactory::_('Compiler.Builder.Content.One')->set('CUSTOM_HELPER_SCRIPT',
+ CFactory::_('Placeholder')->update_(
+ CFactory::_('Customcode.Dispenser')->hub['component_php_helper_admin']
+ ));
// BOTH_CUSTOM_HELPER_SCRIPT
- $this->fileContentStatic[$this->hhh . 'BOTH_CUSTOM_HELPER_SCRIPT'
- . $this->hhh]
- = $this->setPlaceholders(
- $this->customScriptBuilder['component_php_helper_both'],
- $this->placeholders
- );
+ CFactory::_('Compiler.Builder.Content.One')->set('BOTH_CUSTOM_HELPER_SCRIPT',
+ CFactory::_('Placeholder')->update_(
+ CFactory::_('Customcode.Dispenser')->hub['component_php_helper_both']
+ ));
// ADMIN_GLOBAL_EVENT_HELPER
- if (!isset($this->fileContentStatic[$this->hhh . 'ADMIN_GLOBAL_EVENT'
- . $this->hhh]))
+ if (!CFactory::_('Compiler.Builder.Content.One')->exists('ADMIN_GLOBAL_EVENT'))
{
- $this->fileContentStatic[$this->hhh . 'ADMIN_GLOBAL_EVENT'
- . $this->hhh] = '';
+ CFactory::_('Compiler.Builder.Content.One')->set('ADMIN_GLOBAL_EVENT', '');
}
- if (!isset($this->fileContentStatic[$this->hhh
- . 'ADMIN_GLOBAL_EVENT_HELPER' . $this->hhh]))
+ if (!CFactory::_('Compiler.Builder.Content.One')->exists('ADMIN_GLOBAL_EVENT_HELPER'))
{
- $this->fileContentStatic[$this->hhh
- . 'ADMIN_GLOBAL_EVENT_HELPER' . $this->hhh] = '';
+ CFactory::_('Compiler.Builder.Content.One')->set('ADMIN_GLOBAL_EVENT_HELPER', '');
}
// now load the data for the global event if needed
- if ($this->componentData->add_admin_event == 1)
+ if (CFactory::_('Component')->get('add_admin_event', 0) == 1)
{
// ADMIN_GLOBAL_EVENT
- $this->fileContentStatic[$this->hhh . 'ADMIN_GLOBAL_EVENT'
- . $this->hhh]
- .= PHP_EOL . PHP_EOL . '// Trigger the Global Admin Event';
- $this->fileContentStatic[$this->hhh . 'ADMIN_GLOBAL_EVENT'
- . $this->hhh]
- .= PHP_EOL . $this->fileContentStatic[$this->hhh
- . 'Component' . $this->hhh]
- . 'Helper::globalEvent($document);';
+ CFactory::_('Compiler.Builder.Content.One')->add('ADMIN_GLOBAL_EVENT', PHP_EOL . PHP_EOL . '// Trigger the Global Admin Event');
+ CFactory::_('Compiler.Builder.Content.One')->add('ADMIN_GLOBAL_EVENT',
+ PHP_EOL . CFactory::_('Compiler.Builder.Content.One')->get('Component')
+ . 'Helper::globalEvent($document);');
// ADMIN_GLOBAL_EVENT_HELPER
- $this->fileContentStatic[$this->hhh
- . 'ADMIN_GLOBAL_EVENT_HELPER' . $this->hhh]
- .= PHP_EOL . PHP_EOL . $this->_t(1) . '/**';
- $this->fileContentStatic[$this->hhh
- . 'ADMIN_GLOBAL_EVENT_HELPER' . $this->hhh]
- .= PHP_EOL . $this->_t(1)
- . '* The Global Admin Event Method.';
- $this->fileContentStatic[$this->hhh
- . 'ADMIN_GLOBAL_EVENT_HELPER' . $this->hhh]
- .= PHP_EOL . $this->_t(1) . '**/';
- $this->fileContentStatic[$this->hhh
- . 'ADMIN_GLOBAL_EVENT_HELPER' . $this->hhh]
- .= PHP_EOL . $this->_t(1)
- . 'public static function globalEvent($document)';
- $this->fileContentStatic[$this->hhh
- . 'ADMIN_GLOBAL_EVENT_HELPER' . $this->hhh]
- .= PHP_EOL . $this->_t(1) . '{';
- $this->fileContentStatic[$this->hhh
- . 'ADMIN_GLOBAL_EVENT_HELPER' . $this->hhh]
- .= PHP_EOL . $this->setPlaceholders(
- $this->customScriptBuilder['component_php_admin_event'],
- $this->placeholders
- );
- $this->fileContentStatic[$this->hhh
- . 'ADMIN_GLOBAL_EVENT_HELPER' . $this->hhh]
- .= PHP_EOL . $this->_t(1) . '}';
+ CFactory::_('Compiler.Builder.Content.One')->add('ADMIN_GLOBAL_EVENT_HELPER', PHP_EOL . PHP_EOL . Indent::_(1) . '/**');
+ CFactory::_('Compiler.Builder.Content.One')->add('ADMIN_GLOBAL_EVENT_HELPER',
+ PHP_EOL . Indent::_(1)
+ . '* The Global Admin Event Method.');
+ CFactory::_('Compiler.Builder.Content.One')->add('ADMIN_GLOBAL_EVENT_HELPER', PHP_EOL . Indent::_(1) . '**/');
+ CFactory::_('Compiler.Builder.Content.One')->add('ADMIN_GLOBAL_EVENT_HELPER',
+ PHP_EOL . Indent::_(1)
+ . 'public static function globalEvent($document)');
+ CFactory::_('Compiler.Builder.Content.One')->add('ADMIN_GLOBAL_EVENT_HELPER', PHP_EOL . Indent::_(1) . '{');
+ CFactory::_('Compiler.Builder.Content.One')->add('ADMIN_GLOBAL_EVENT_HELPER',
+ PHP_EOL . CFactory::_('Placeholder')->update_(
+ CFactory::_('Customcode.Dispenser')->hub['component_php_admin_event']
+ ));
+ CFactory::_('Compiler.Builder.Content.One')->add('ADMIN_GLOBAL_EVENT_HELPER', PHP_EOL . Indent::_(1) . '}');
}
// now load the readme file if needed
- if ($this->componentData->addreadme == 1)
+ if (CFactory::_('Component')->get('addreadme', 0) == 1)
{
- $this->fileContentStatic[$this->hhh . 'EXSTRA_ADMIN_FILES'
- . $this->hhh]
- .= PHP_EOL . $this->_t(3)
- . "README.txt ";
+ CFactory::_('Compiler.Builder.Content.One')->add('EXSTRA_ADMIN_FILES',
+ PHP_EOL . Indent::_(3)
+ . "README.txt ");
}
// HELPER_CREATEUSER
- $this->fileContentStatic[$this->hhh . 'HELPER_CREATEUSER'
- . $this->hhh]
- = $this->setCreateUserHelperMethod(
- $this->componentData->creatuserhelper
- );
+ CFactory::_('Compiler.Builder.Content.One')->add('HELPER_CREATEUSER',
+ $this->setCreateUserHelperMethod(
+ CFactory::_('Component')->get('creatuserhelper')
+ ));
// HELP
- $this->fileContentStatic[$this->hhh . 'HELP' . $this->hhh]
- = $this->noHelp();
+ CFactory::_('Compiler.Builder.Content.One')->set('HELP', $this->noHelp());
// HELP_SITE
- $this->fileContentStatic[$this->hhh . 'HELP_SITE' . $this->hhh]
- = $this->noHelp();
+ CFactory::_('Compiler.Builder.Content.One')->set('HELP_SITE', $this->noHelp());
// build route parse switch
- $this->fileContentStatic[$this->hhh . 'ROUTER_PARSE_SWITCH'
- . $this->hhh]
- = '';
+ CFactory::_('Compiler.Builder.Content.One')->set('ROUTER_PARSE_SWITCH', '');
// build route views
- $this->fileContentStatic[$this->hhh . 'ROUTER_BUILD_VIEWS'
- . $this->hhh]
- = '';
+ CFactory::_('Compiler.Builder.Content.One')->set('ROUTER_BUILD_VIEWS', '');
// add the helper emailer if set
- $this->fileContentStatic[$this->hhh . 'HELPER_EMAIL' . $this->hhh]
- = $this->addEmailHelper();
+ CFactory::_('Compiler.Builder.Content.One')->set('HELPER_EMAIL', $this->addEmailHelper());
// load the global placeholders
- if (ArrayHelper::check($this->globalPlaceholders))
+ foreach (CFactory::_('Component.Placeholder')->get() as $globalPlaceholder =>
+ $gloabalValue
+ )
{
- foreach (
- $this->globalPlaceholders as $globalPlaceholder =>
- $gloabalValue
- )
- {
- $this->fileContentStatic[$globalPlaceholder]
- = $gloabalValue;
- }
+ CFactory::_('Compiler.Builder.Content.One')->set($globalPlaceholder, $gloabalValue);
}
+
// reset view array
$viewarray = array();
$site_edit_view_array = array();
// start dynamic build
- foreach ($this->componentData->admin_views as $view)
+ foreach (CFactory::_('Component')->get('admin_views') as $view)
{
// set the target
- $this->target = 'admin';
- $this->lang = 'admin';
+ CFactory::_('Config')->build_target = 'admin';
+ CFactory::_('Config')->lang_target = 'admin';
// set local names
$nameSingleCode = $view['settings']->name_single_code;
@@ -395,11 +333,11 @@ class Infusion extends Interpretation
)
&& $view['edit_create_site_view'] > 0)
{
- $site_edit_view_array[] = $this->_t(4) . "'"
+ $site_edit_view_array[] = Indent::_(4) . "'"
. $nameSingleCode . "'";
- $this->lang = 'both';
+ CFactory::_('Config')->lang_target = 'both';
// insure site view does not get removed
- $this->removeSiteEditFolder = false;
+ CFactory::_('Config')->remove_site_edit_folder = false;
}
// check if help is being loaded
$this->checkHelp($nameSingleCode);
@@ -409,7 +347,7 @@ class Infusion extends Interpretation
);
// set view array
- $viewarray[] = $this->_t(4) . "'"
+ $viewarray[] = Indent::_(4) . "'"
. $nameSingleCode . "' => '"
. $nameListCode . "'";
// set the view names
@@ -418,336 +356,279 @@ class Infusion extends Interpretation
{
// set license per view if needed
$this->setLockLicensePer(
- $nameSingleCode, $this->target
+ $nameSingleCode, CFactory::_('Config')->build_target
);
$this->setLockLicensePer(
- $nameListCode, $this->target
+ $nameListCode, CFactory::_('Config')->build_target
);
+ // for plugin event TODO change event api signatures
+ $placeholders = CFactory::_('Placeholder')->active;
+ $fileContentStatic = CFactory::_('Compiler.Builder.Content.One')->allActive();
+ $fileContentDynamic = CFactory::_('Compiler.Builder.Content.Multi')->allActive();
// Trigger Event: jcb_ce_onBeforeBuildAdminEditViewContent
- $this->triggerEvent(
+ CFactory::_('Event')->trigger(
'jcb_ce_onBeforeBuildAdminEditViewContent',
- array(&$this->componentContext, &$view,
+ array(&$component_context, &$view,
&$nameSingleCode,
&$nameListCode,
- &$this->fileContentStatic,
- &$this->fileContentDynamic[$nameSingleCode],
- &$this->placeholders, &$this->hhh)
+ &$fileContentStatic,
+ &$fileContentDynamic[$nameSingleCode],
+ &$placeholders, &$this->hhh)
);
+ unset($fileContentStatic);
+ unset($fileContentDynamic);
+ unset($placeholders);
// FIELDSETS <<>>
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'FIELDSETS' . $this->hhh]
- = $this->setFieldSet(
- $view, $this->componentCodeName,
- $nameSingleCode,
- $nameListCode
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|FIELDSETS',
+ CFactory::_('Compiler.Creator.Fieldset')->get(
+ $view,
+ CFactory::_('Config')->component_code_name,
+ $nameSingleCode,
+ $nameListCode
+ )
);
// ACCESSCONTROL <<>>
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'ACCESSCONTROL' . $this->hhh]
- = $this->setFieldSetAccessControl(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|ACCESSCONTROL', $this->setFieldSetAccessControl(
$nameSingleCode
- );
+ ));
// LINKEDVIEWITEMS <<>>
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'LINKEDVIEWITEMS' . $this->hhh]
- = '';
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|LINKEDVIEWITEMS', '');
// ADDTOOLBAR <<>>
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'ADDTOOLBAR' . $this->hhh]
- = $this->setAddToolBar($view);
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|ADDTOOLBAR', $this->setAddToolBar($view));
// set the script for this view
$this->buildTheViewScript($view);
// VIEW_SCRIPT
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'VIEW_SCRIPT' . $this->hhh]
- = $this->setViewScript(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|VIEW_SCRIPT', $this->setViewScript(
$nameSingleCode, 'fileScript'
- );
+ ));
// EDITBODYSCRIPT
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'EDITBODYSCRIPT' . $this->hhh]
- = $this->setViewScript(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|EDITBODYSCRIPT', $this->setViewScript(
$nameSingleCode, 'footerScript'
- );
+ ));
// AJAXTOKE <<>>
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'AJAXTOKE' . $this->hhh]
- = $this->setAjaxToke(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|AJAXTOKE', $this->setAjaxToke(
$nameSingleCode
- );
+ ));
// DOCUMENT_CUSTOM_PHP <<>>
- if ($phpDocument = $this->getCustomScriptBuilder(
+ if ($phpDocument = CFactory::_('Customcode.Dispenser')->get(
'php_document', $nameSingleCode,
PHP_EOL, null, true,
false
))
{
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'DOCUMENT_CUSTOM_PHP' . $this->hhh]
- = str_replace(
- '$document->', '$this->document->', $phpDocument
- );
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|DOCUMENT_CUSTOM_PHP', str_replace(
+ '$document->', '$this->document->', (string) $phpDocument
+ ));
// clear some memory
unset($phpDocument);
}
else
{
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'DOCUMENT_CUSTOM_PHP' . $this->hhh]
- = '';
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|DOCUMENT_CUSTOM_PHP', '');
}
// LINKEDVIEWTABLESCRIPTS <<>>
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'LINKEDVIEWTABLESCRIPTS' . $this->hhh]
- = '';
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|LINKEDVIEWTABLESCRIPTS', '');
// VALIDATEFIX <<>>
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'VALIDATIONFIX' . $this->hhh]
- = $this->setValidationFix(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|VALIDATIONFIX', $this->setValidationFix(
$nameSingleCode,
- $this->fileContentStatic[$this->hhh . 'Component'
- . $this->hhh]
- );
+ CFactory::_('Compiler.Builder.Content.One')->get('Component')
+ ));
// EDITBODY <<>>
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'EDITBODY' . $this->hhh]
- = $this->setEditBody($view);
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|EDITBODY', $this->setEditBody($view));
// EDITBODYFADEIN <<>>
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'EDITBODYFADEIN' . $this->hhh]
- = $this->setFadeInEfect($view);
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|EDITBODYFADEIN', $this->setFadeInEfect($view));
// JTABLECONSTRUCTOR <<>>
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'JTABLECONSTRUCTOR' . $this->hhh]
- = $this->setJtableConstructor(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|JTABLECONSTRUCTOR', $this->setJtableConstructor(
$nameSingleCode
- );
+ ));
// JTABLEALIASCATEGORY <<>>
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'JTABLEALIASCATEGORY' . $this->hhh]
- = $this->setJtableAliasCategory(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|JTABLEALIASCATEGORY', $this->setJtableAliasCategory(
$nameSingleCode
- );
+ ));
// METHOD_GET_ITEM <<>>
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'METHOD_GET_ITEM' . $this->hhh]
- = $this->setMethodGetItem(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|METHOD_GET_ITEM', $this->setMethodGetItem(
$nameSingleCode
- );
+ ));
// LINKEDVIEWGLOBAL <<>>
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'LINKEDVIEWGLOBAL' . $this->hhh]
- = '';
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|LINKEDVIEWGLOBAL', '');
// LINKEDVIEWMETHODS <<>>
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'LINKEDVIEWMETHODS' . $this->hhh]
- = '';
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|LINKEDVIEWMETHODS', '');
// JMODELADMIN_BEFORE_DELETE <<>>
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'JMODELADMIN_BEFORE_DELETE' . $this->hhh]
- = $this->getCustomScriptBuilder(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|JMODELADMIN_BEFORE_DELETE', CFactory::_('Customcode.Dispenser')->get(
'php_before_delete',
$nameSingleCode, PHP_EOL
- );
+ ));
// JMODELADMIN_AFTER_DELETE <<>>
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'JMODELADMIN_AFTER_DELETE' . $this->hhh]
- = $this->getCustomScriptBuilder(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|JMODELADMIN_AFTER_DELETE', CFactory::_('Customcode.Dispenser')->get(
'php_after_delete', $nameSingleCode,
PHP_EOL . PHP_EOL
- );
+ ));
// JMODELADMIN_BEFORE_DELETE <<>>
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'JMODELADMIN_BEFORE_PUBLISH' . $this->hhh]
- = $this->getCustomScriptBuilder(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|JMODELADMIN_BEFORE_PUBLISH', CFactory::_('Customcode.Dispenser')->get(
'php_before_publish',
$nameSingleCode, PHP_EOL
- );
+ ));
// JMODELADMIN_AFTER_DELETE <<>>
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'JMODELADMIN_AFTER_PUBLISH' . $this->hhh]
- = $this->getCustomScriptBuilder(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|JMODELADMIN_AFTER_PUBLISH', CFactory::_('Customcode.Dispenser')->get(
'php_after_publish',
$nameSingleCode, PHP_EOL . PHP_EOL
- );
+ ));
// CHECKBOX_SAVE <<>>
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'CHECKBOX_SAVE' . $this->hhh]
- = $this->setCheckboxSave(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|CHECKBOX_SAVE', $this->setCheckboxSave(
$nameSingleCode
- );
+ ));
// METHOD_ITEM_SAVE <<>>
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'METHOD_ITEM_SAVE' . $this->hhh]
- = $this->setMethodItemSave(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|METHOD_ITEM_SAVE', $this->setMethodItemSave(
$nameSingleCode
- );
+ ));
// POSTSAVEHOOK <<>>
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'POSTSAVEHOOK' . $this->hhh]
- = $this->getCustomScriptBuilder(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|POSTSAVEHOOK', CFactory::_('Customcode.Dispenser')->get(
'php_postsavehook', $nameSingleCode,
PHP_EOL, null,
- true, PHP_EOL . $this->_t(2) . "return;",
- PHP_EOL . PHP_EOL . $this->_t(2) . "return;"
- );
+ true, PHP_EOL . Indent::_(2) . "return;",
+ PHP_EOL . PHP_EOL . Indent::_(2) . "return;"
+ ));
// VIEWCSS <<>>
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'VIEWCSS' . $this->hhh]
- = $this->getCustomScriptBuilder(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|VIEWCSS', CFactory::_('Customcode.Dispenser')->get(
'css_view', $nameSingleCode, '',
null, true
- );
+ ));
// add css to front end
if (isset($view['edit_create_site_view'])
- && is_numeric(
- $view['edit_create_site_view']
- )
+ && is_numeric($view['edit_create_site_view'])
&& $view['edit_create_site_view'] > 0)
{
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'SITE_VIEWCSS' . $this->hhh]
- = $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'VIEWCSS' . $this->hhh];
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|SITE_VIEWCSS', CFactory::_('Compiler.Builder.Content.Multi')->get($nameSingleCode . '|VIEWCSS', ''));
// check if we should add a create menu
if ($view['edit_create_site_view'] == 2)
{
// SITE_MENU_XML <<>>
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'SITE_MENU_XML' . $this->hhh]
- = $this->setAdminViewMenu(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|SITE_MENU_XML', $this->setAdminViewMenu(
$nameSingleCode, $view
- );
+ ));
}
// SITE_ADMIN_VIEW_CONTROLLER_HEADER <<>> add the header details for the controller
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'SITE_ADMIN_VIEW_CONTROLLER_HEADER' . $this->hhh]
- = $this->setFileHeader(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|SITE_ADMIN_VIEW_CONTROLLER_HEADER', $this->setFileHeader(
'site.admin.view.controller',
$nameSingleCode
- );
+ ));
// SITE_ADMIN_VIEW_MODEL_HEADER <<>> add the header details for the model
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'SITE_ADMIN_VIEW_MODEL_HEADER' . $this->hhh]
- = $this->setFileHeader(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|SITE_ADMIN_VIEW_MODEL_HEADER', $this->setFileHeader(
'site.admin.view.model',
$nameSingleCode
- );
+ ));
// SITE_ADMIN_VIEW_HTML_HEADER <<>> add the header details for the view
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'SITE_ADMIN_VIEW_HTML_HEADER' . $this->hhh]
- = $this->setFileHeader(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|SITE_ADMIN_VIEW_HTML_HEADER', $this->setFileHeader(
'site.admin.view.html',
$nameSingleCode
- );
+ ));
// SITE_ADMIN_VIEW_HEADER <<>> add the header details for the view
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'SITE_ADMIN_VIEW_HEADER' . $this->hhh]
- = $this->setFileHeader(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|SITE_ADMIN_VIEW_HEADER', $this->setFileHeader(
'site.admin.view',
$nameSingleCode
- );
+ ));
}
// TABLAYOUTFIELDSARRAY <<>> add the tab layout fields array to the model
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'TABLAYOUTFIELDSARRAY' . $this->hhh]
- = $this->getTabLayoutFieldsArray(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|TABLAYOUTFIELDSARRAY', $this->getTabLayoutFieldsArray(
$nameSingleCode
- );
+ ));
// ADMIN_VIEW_CONTROLLER_HEADER <<>> add the header details for the controller
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'ADMIN_VIEW_CONTROLLER_HEADER' . $this->hhh]
- = $this->setFileHeader(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|ADMIN_VIEW_CONTROLLER_HEADER', $this->setFileHeader(
'admin.view.controller',
$nameSingleCode
- );
+ ));
// ADMIN_VIEW_MODEL_HEADER <<>> add the header details for the model
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'ADMIN_VIEW_MODEL_HEADER' . $this->hhh]
- = $this->setFileHeader(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|ADMIN_VIEW_MODEL_HEADER', $this->setFileHeader(
'admin.view.model', $nameSingleCode
- );
+ ));
// ADMIN_VIEW_HTML_HEADER <<>> add the header details for the view
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'ADMIN_VIEW_HTML_HEADER' . $this->hhh]
- = $this->setFileHeader(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|ADMIN_VIEW_HTML_HEADER', $this->setFileHeader(
'admin.view.html', $nameSingleCode
- );
+ ));
// ADMIN_VIEW_HEADER <<>> add the header details for the view
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'ADMIN_VIEW_HEADER' . $this->hhh]
- = $this->setFileHeader(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|ADMIN_VIEW_HEADER', $this->setFileHeader(
'admin.view', $nameSingleCode
- );
+ ));
+ // for plugin event TODO change event api signatures
+ $placeholders = CFactory::_('Placeholder')->active;
+ $fileContentStatic = CFactory::_('Compiler.Builder.Content.One')->allActive();
+ $fileContentDynamic = CFactory::_('Compiler.Builder.Content.Multi')->allActive();
// Trigger Event: jcb_ce_onAfterBuildAdminEditViewContent
- $this->triggerEvent(
+ CFactory::_('Event')->trigger(
'jcb_ce_onAfterBuildAdminEditViewContent',
- array(&$this->componentContext, &$view,
+ array(&$component_context, &$view,
&$nameSingleCode,
&$nameListCode,
- &$this->fileContentStatic,
- &$this->fileContentDynamic[$nameSingleCode],
- &$this->placeholders, &$this->hhh)
+ &$fileContentStatic,
+ &$fileContentDynamic[$nameSingleCode],
+ &$placeholders, &$this->hhh)
);
+ unset($fileContentStatic);
+ unset($fileContentDynamic);
+ unset($placeholders);
}
// set the views names
if (isset($view['settings']->name_list)
&& $view['settings']->name_list != 'null')
{
- $this->lang = 'admin';
+ CFactory::_('Config')->lang_target = 'admin';
// ICOMOON <<>>
- $this->fileContentDynamic[$nameListCode][$this->hhh
- . 'ICOMOON' . $this->hhh]
- = $view['icomoon'];
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameListCode . '|ICOMOON', $view['icomoon']);
+ // for plugin event TODO change event api signatures
+ $placeholders = CFactory::_('Placeholder')->active;
+ $fileContentStatic = CFactory::_('Compiler.Builder.Content.One')->allActive();
+ $fileContentDynamic = CFactory::_('Compiler.Builder.Content.Multi')->allActive();
// Trigger Event: jcb_ce_onBeforeBuildAdminListViewContent
- $this->triggerEvent(
+ CFactory::_('Event')->trigger(
'jcb_ce_onBeforeBuildAdminListViewContent',
- array(&$this->componentContext, &$view,
+ array(&$component_context, &$view,
&$nameSingleCode,
&$nameListCode,
- &$this->fileContentStatic,
- &$this->fileContentDynamic[$nameListCode],
- &$this->placeholders, &$this->hhh)
+ &$fileContentStatic,
+ &$fileContentDynamic[$nameListCode],
+ &$placeholders, &$this->hhh)
);
+ unset($fileContentStatic);
+ unset($fileContentDynamic);
+ unset($placeholders);
// set the export/import option
if (isset($view['port']) && $view['port']
|| 1 == $view['settings']->add_custom_import)
{
- $this->eximportView[$nameListCode]
- = true;
+ $this->eximportView[$nameListCode] = true;
if (1 == $view['settings']->add_custom_import)
{
// this view has custom import scripting
@@ -769,267 +650,190 @@ class Infusion extends Interpretation
if (isset($view['checkin']) && $view['checkin'] == 1)
{
// AUTOCHECKIN <<>>
- $this->fileContentDynamic[$nameListCode][$this->hhh
- . 'AUTOCHECKIN' . $this->hhh]
- = $this->setAutoCheckin(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameListCode . '|AUTOCHECKIN', $this->setAutoCheckin(
$nameSingleCode,
- $this->componentCodeName
- );
+ CFactory::_('Config')->component_code_name
+ ));
// CHECKINCALL <<>>
- $this->fileContentDynamic[$nameListCode][$this->hhh
- . 'CHECKINCALL' . $this->hhh]
- = $this->setCheckinCall();
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameListCode . '|CHECKINCALL', $this->setCheckinCall());
}
else
{
// AUTOCHECKIN <<>>
- $this->fileContentDynamic[$nameListCode][$this->hhh
- . 'AUTOCHECKIN' . $this->hhh]
- = '';
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameListCode . '|AUTOCHECKIN', '');
// CHECKINCALL <<>>
- $this->fileContentDynamic[$nameListCode][$this->hhh
- . 'CHECKINCALL' . $this->hhh]
- = '';
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameListCode . '|CHECKINCALL', '');
}
// admin list file contnet
- $this->fileContentDynamic[$nameListCode][$this->hhh
- . 'ADMIN_JAVASCRIPT_FILE' . $this->hhh]
- = $this->setViewScript(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameListCode . '|ADMIN_JAVASCRIPT_FILE', $this->setViewScript(
$nameListCode, 'list_fileScript'
- );
+ ));
// ADMIN_CUSTOM_BUTTONS_LIST
- $this->fileContentDynamic[$nameListCode][$this->hhh
- . 'ADMIN_CUSTOM_BUTTONS_LIST' . $this->hhh]
- = $this->setCustomButtons($view, 3, $this->_t(1));
- $this->fileContentDynamic[$nameListCode][$this->hhh
- . 'ADMIN_CUSTOM_FUNCTION_ONLY_BUTTONS_LIST' . $this->hhh]
- = $this->setFunctionOnlyButtons(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameListCode . '|ADMIN_CUSTOM_BUTTONS_LIST', $this->setCustomButtons($view, 3, Indent::_(1)));
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameListCode . '|ADMIN_CUSTOM_FUNCTION_ONLY_BUTTONS_LIST', $this->setFunctionOnlyButtons(
$nameListCode
- );
+ ));
// GET_ITEMS_METHOD_STRING_FIX <<>>
- $this->fileContentDynamic[$nameListCode][$this->hhh
- . 'GET_ITEMS_METHOD_STRING_FIX' . $this->hhh]
- = $this->setGetItemsMethodStringFix(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameListCode . '|GET_ITEMS_METHOD_STRING_FIX', $this->setGetItemsMethodStringFix(
$nameSingleCode,
$nameListCode,
- $this->fileContentStatic[$this->hhh . 'Component'
- . $this->hhh]
- );
+ CFactory::_('Compiler.Builder.Content.One')->get('Component')
+ ));
// GET_ITEMS_METHOD_AFTER_ALL <<>>
- $this->fileContentDynamic[$nameListCode][$this->hhh
- . 'GET_ITEMS_METHOD_AFTER_ALL' . $this->hhh]
- = $this->getCustomScriptBuilder(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameListCode . '|GET_ITEMS_METHOD_AFTER_ALL', CFactory::_('Customcode.Dispenser')->get(
'php_getitems_after_all',
$nameSingleCode, PHP_EOL
- );
+ ));
// SELECTIONTRANSLATIONFIX <<>>
- $this->fileContentDynamic[$nameListCode][$this->hhh
- . 'SELECTIONTRANSLATIONFIX' . $this->hhh]
- = $this->setSelectionTranslationFix(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameListCode . '|SELECTIONTRANSLATIONFIX', $this->setSelectionTranslationFix(
$nameListCode,
- $this->fileContentStatic[$this->hhh . 'Component'
- . $this->hhh]
- );
+ CFactory::_('Compiler.Builder.Content.One')->get('Component')
+ ));
// SELECTIONTRANSLATIONFIXFUNC <<>>
- $this->fileContentDynamic[$nameListCode][$this->hhh
- . 'SELECTIONTRANSLATIONFIXFUNC' . $this->hhh]
- = $this->setSelectionTranslationFixFunc(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameListCode . '|SELECTIONTRANSLATIONFIXFUNC', $this->setSelectionTranslationFixFunc(
$nameListCode,
- $this->fileContentStatic[$this->hhh . 'Component'
- . $this->hhh]
- );
+ CFactory::_('Compiler.Builder.Content.One')->get('Component')
+ ));
// FILTER_FIELDS <<>>
- $this->fileContentDynamic[$nameListCode][$this->hhh
- . 'FILTER_FIELDS' . $this->hhh]
- = $this->setFilterFieldsArray(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameListCode . '|FILTER_FIELDS', $this->setFilterFieldsArray(
$nameSingleCode,
$nameListCode
- );
+ ));
// STOREDID <<>>
- $this->fileContentDynamic[$nameListCode][$this->hhh
- . 'STOREDID' . $this->hhh]
- = $this->setStoredId(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameListCode . '|STOREDID', $this->setStoredId(
$nameSingleCode, $nameListCode
- );
+ ));
// POPULATESTATE <<>>
- $this->fileContentDynamic[$nameListCode][$this->hhh
- . 'POPULATESTATE' . $this->hhh]
- = $this->setPopulateState(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameListCode . '|POPULATESTATE', $this->setPopulateState(
$nameSingleCode, $nameListCode
- );
+ ));
// SORTFIELDS <<>>
- $this->fileContentDynamic[$nameListCode][$this->hhh
- . 'SORTFIELDS' . $this->hhh]
- = $this->setSortFields(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameListCode . '|SORTFIELDS', $this->setSortFields(
$nameListCode
- );
+ ));
// CATEGORY_VIEWS
- if (!isset(
- $this->fileContentStatic[$this->hhh
- . 'ROUTER_CATEGORY_VIEWS' . $this->hhh]
- ))
- {
- $this->fileContentStatic[$this->hhh
- . 'ROUTER_CATEGORY_VIEWS' . $this->hhh]
- = '';
- }
- $this->fileContentStatic[$this->hhh
- . 'ROUTER_CATEGORY_VIEWS' . $this->hhh]
- .= $this->setRouterCategoryViews(
+ CFactory::_('Compiler.Builder.Content.One')->add('ROUTER_CATEGORY_VIEWS',
+ $this->setRouterCategoryViews(
$nameSingleCode,
$nameListCode
- );
+ ));
// FILTERFIELDDISPLAYHELPER <<>>
- $this->fileContentDynamic[$nameListCode][$this->hhh
- . 'FILTERFIELDDISPLAYHELPER' . $this->hhh]
- = $this->setFilterFieldSidebarDisplayHelper(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameListCode . '|FILTERFIELDDISPLAYHELPER', $this->setFilterFieldSidebarDisplayHelper(
$nameSingleCode,
$nameListCode
- );
+ ));
// BATCHDISPLAYHELPER <<>>
- $this->fileContentDynamic[$nameListCode][$this->hhh
- . 'BATCHDISPLAYHELPER' . $this->hhh]
- = $this->setBatchDisplayHelper(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameListCode . '|BATCHDISPLAYHELPER', $this->setBatchDisplayHelper(
$nameSingleCode,
$nameListCode
- );
+ ));
// FILTERFUNCTIONS <<>>
- $this->fileContentDynamic[$nameListCode][$this->hhh
- . 'FILTERFUNCTIONS' . $this->hhh]
- = $this->setFilterFieldHelper(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameListCode . '|FILTERFUNCTIONS', $this->setFilterFieldHelper(
$nameSingleCode,
$nameListCode
- );
+ ));
// FIELDFILTERSETS <<>>
- $this->fileContentDynamic['filter_'
- . $nameListCode][$this->hhh
- . 'FIELDFILTERSETS' . $this->hhh]
- = $this->setFieldFilterSet(
+ CFactory::_('Compiler.Builder.Content.Multi')->set('filter_' . $nameListCode . '|FIELDFILTERSETS',
+ $this->setFieldFilterSet(
$nameSingleCode,
$nameListCode
- );
+ ));
// FIELDLISTSETS <<>>
- $this->fileContentDynamic['filter_'
- . $nameListCode][$this->hhh
- . 'FIELDLISTSETS' . $this->hhh]
- = $this->setFieldFilterListSet(
+ CFactory::_('Compiler.Builder.Content.Multi')->set('filter_' . $nameListCode . '|FIELDLISTSETS',
+ $this->setFieldFilterListSet(
$nameSingleCode,
$nameListCode
- );
+ ));
// LISTQUERY <<>>
- $this->fileContentDynamic[$nameListCode][$this->hhh
- . 'LISTQUERY' . $this->hhh]
- = $this->setListQuery(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameListCode . '|LISTQUERY', $this->setListQuery(
$nameSingleCode,
$nameListCode
- );
+ ));
// MODELEXPORTMETHOD <<>>
- $this->fileContentDynamic[$nameListCode][$this->hhh
- . 'MODELEXPORTMETHOD' . $this->hhh]
- = $this->setGetItemsModelMethod(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameListCode . '|MODELEXPORTMETHOD', $this->setGetItemsModelMethod(
$nameSingleCode,
$nameListCode
- );
+ ));
// MODELEXIMPORTMETHOD <<>>
- $this->fileContentDynamic[$nameListCode][$this->hhh
- . 'CONTROLLEREXIMPORTMETHOD' . $this->hhh]
- = $this->setControllerEximportMethod(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameListCode . '|CONTROLLEREXIMPORTMETHOD', $this->setControllerEximportMethod(
$nameSingleCode,
$nameListCode
- );
+ ));
// EXPORTBUTTON <<>>
- $this->fileContentDynamic[$nameListCode][$this->hhh
- . 'EXPORTBUTTON' . $this->hhh]
- = $this->setExportButton(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameListCode . '|EXPORTBUTTON', $this->setExportButton(
$nameSingleCode,
$nameListCode
- );
+ ));
// IMPORTBUTTON <<>>
- $this->fileContentDynamic[$nameListCode][$this->hhh
- . 'IMPORTBUTTON' . $this->hhh]
- = $this->setImportButton(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameListCode . '|IMPORTBUTTON', $this->setImportButton(
$nameSingleCode,
$nameListCode
- );
+ ));
// VIEWS_DEFAULT_BODY <<>>
- $this->fileContentDynamic[$nameListCode][$this->hhh
- . 'VIEWS_DEFAULT_BODY' . $this->hhh]
- = $this->setDefaultViewsBody(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameListCode . '|VIEWS_DEFAULT_BODY', $this->setDefaultViewsBody(
$nameSingleCode,
$nameListCode
- );
+ ));
// LISTHEAD <<>>
- $this->fileContentDynamic[$nameListCode][$this->hhh
- . 'LISTHEAD' . $this->hhh]
- = $this->setListHead(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameListCode . '|LISTHEAD', $this->setListHead(
$nameSingleCode,
$nameListCode
- );
+ ));
// LISTBODY <<>>
- $this->fileContentDynamic[$nameListCode][$this->hhh
- . 'LISTBODY' . $this->hhh]
- = $this->setListBody(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameListCode . '|LISTBODY', $this->setListBody(
$nameSingleCode,
$nameListCode
- );
+ ));
// LISTCOLNR <<>>
- $this->fileContentDynamic[$nameListCode][$this->hhh
- . 'LISTCOLNR' . $this->hhh]
- = $this->setListColnr(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameListCode . '|LISTCOLNR', $this->setListColnr(
$nameListCode
- );
+ ));
// JVIEWLISTCANDO <<>>
- $this->fileContentDynamic[$nameListCode][$this->hhh
- . 'JVIEWLISTCANDO' . $this->hhh]
- = $this->setJviewListCanDo(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameListCode . '|JVIEWLISTCANDO', $this->setJviewListCanDo(
$nameSingleCode,
$nameListCode
- );
+ ));
// VIEWSCSS <<>>
- $this->fileContentDynamic[$nameListCode][$this->hhh
- . 'VIEWSCSS' . $this->hhh]
- = $this->getCustomScriptBuilder(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameListCode . '|VIEWSCSS', CFactory::_('Customcode.Dispenser')->get(
'css_views', $nameSingleCode, '',
null, true
- );
+ ));
// ADMIN_DIPLAY_METHOD <<>>
- $this->fileContentDynamic[$nameListCode][$this->hhh
- . 'ADMIN_DIPLAY_METHOD' . $this->hhh]
- = $this->setAdminViewDisplayMethod(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameListCode . '|ADMIN_DIPLAY_METHOD', $this->setAdminViewDisplayMethod(
$nameListCode
- );
+ ));
// VIEWS_FOOTER_SCRIPT <<>>
- $scriptNote = PHP_EOL . '//' . $this->setLine(__LINE__)
+ $scriptNote = PHP_EOL . '//' . Line::_(__Line__, __Class__)
. ' ' . $nameListCode
. ' footer script';
- if (($footerScript = $this->getCustomScriptBuilder(
+ if (($footerScript = CFactory::_('Customcode.Dispenser')->get(
'views_footer', $nameSingleCode, '',
$scriptNote, true,
false, PHP_EOL
@@ -1037,207 +841,154 @@ class Infusion extends Interpretation
&& StringHelper::check($footerScript))
{
// only minfy if no php is added to the footer script
- if ($this->minify
- && strpos($footerScript, 'get('minify', 0)
+ && strpos((string) $footerScript, 'add($footerScript);
- $footerScript = $minifier->minify();
- // clear some memory
- unset($minifier);
+ // minify the script
+ $footerScript = Minify::js($footerScript);
}
- $this->fileContentDynamic[$nameListCode][$this->hhh
- . 'VIEWS_FOOTER_SCRIPT' . $this->hhh]
- = PHP_EOL . '";
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameListCode . '|VIEWS_FOOTER_SCRIPT', PHP_EOL . '");
// clear some memory
unset($footerScript);
}
else
{
- $this->fileContentDynamic[$nameListCode][$this->hhh
- . 'VIEWS_FOOTER_SCRIPT' . $this->hhh]
- = '';
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameListCode . '|VIEWS_FOOTER_SCRIPT', '');
}
// ADMIN_VIEWS_CONTROLLER_HEADER <<>> add the header details for the controller
- $this->fileContentDynamic[$nameListCode][$this->hhh
- . 'ADMIN_VIEWS_CONTROLLER_HEADER' . $this->hhh]
- = $this->setFileHeader(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameListCode . '|ADMIN_VIEWS_CONTROLLER_HEADER', $this->setFileHeader(
'admin.views.controller',
$nameListCode
- );
+ ));
// ADMIN_VIEWS_MODEL_HEADER <<>> add the header details for the model
- $this->fileContentDynamic[$nameListCode][$this->hhh
- . 'ADMIN_VIEWS_MODEL_HEADER' . $this->hhh]
- = $this->setFileHeader(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameListCode . '|ADMIN_VIEWS_MODEL_HEADER', $this->setFileHeader(
'admin.views.model', $nameListCode
- );
+ ));
// ADMIN_VIEWS_HTML_HEADER <<>> add the header details for the views
- $this->fileContentDynamic[$nameListCode][$this->hhh
- . 'ADMIN_VIEWS_HTML_HEADER' . $this->hhh]
- = $this->setFileHeader(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameListCode . '|ADMIN_VIEWS_HTML_HEADER', $this->setFileHeader(
'admin.views.html', $nameListCode
- );
+ ));
// ADMIN_VIEWS_HEADER <<>> add the header details for the views
- $this->fileContentDynamic[$nameListCode][$this->hhh
- . 'ADMIN_VIEWS_HEADER' . $this->hhh]
- = $this->setFileHeader(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameListCode . '|ADMIN_VIEWS_HEADER', $this->setFileHeader(
'admin.views', $nameListCode
- );
+ ));
+ // for plugin event TODO change event api signatures
+ $placeholders = CFactory::_('Placeholder')->active;
+ $fileContentStatic = CFactory::_('Compiler.Builder.Content.One')->allActive();
+ $fileContentDynamic = CFactory::_('Compiler.Builder.Content.Multi')->allActive();
// Trigger Event: jcb_ce_onAfterBuildAdminListViewContent
- $this->triggerEvent(
+ CFactory::_('Event')->trigger(
'jcb_ce_onAfterBuildAdminListViewContent',
- array(&$this->componentContext, &$view,
+ array(&$component_context, &$view,
&$nameSingleCode,
&$nameListCode,
- &$this->fileContentStatic,
- &$this->fileContentDynamic[$nameListCode],
- &$this->placeholders, &$this->hhh)
+ &$fileContentStatic,
+ &$fileContentDynamic[$nameListCode],
+ &$placeholders, &$this->hhh)
);
+ unset($fileContentStatic);
+ unset($fileContentDynamic);
+ unset($placeholders);
}
// set u fields used in batch
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'UNIQUEFIELDS' . $this->hhh]
- = $this->setUniqueFields(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|UNIQUEFIELDS', $this->setUniqueFields(
$nameSingleCode
- );
+ ));
// TITLEALIASFIX <<>>
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'TITLEALIASFIX' . $this->hhh]
- = $this->setAliasTitleFix(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|TITLEALIASFIX', $this->setAliasTitleFix(
$nameSingleCode
- );
+ ));
// GENERATENEWTITLE <<>>
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'GENERATENEWTITLE' . $this->hhh]
- = $this->setGenerateNewTitle(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|GENERATENEWTITLE', $this->setGenerateNewTitle(
$nameSingleCode
- );
+ ));
// GENERATENEWALIAS <<>>
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'GENERATENEWALIAS' . $this->hhh]
- = $this->setGenerateNewAlias(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|GENERATENEWALIAS', $this->setGenerateNewAlias(
$nameSingleCode
- );
+ ));
// MODEL_BATCH_COPY <<>>
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'MODEL_BATCH_COPY' . $this->hhh]
- = $this->setBatchCopy($nameSingleCode);
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|MODEL_BATCH_COPY', $this->setBatchCopy($nameSingleCode));
// MODEL_BATCH_MOVE <<>>
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'MODEL_BATCH_MOVE' . $this->hhh]
- = $this->setBatchMove($nameSingleCode);
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|MODEL_BATCH_MOVE', $this->setBatchMove($nameSingleCode));
// BATCH_ONCLICK_CANCEL_SCRIPT <<>>
- $this->fileContentDynamic[$nameListCode][$this->hhh
- . 'BATCH_ONCLICK_CANCEL_SCRIPT' . $this->hhh]
- = ''; // TODO <-- must still be build
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameListCode . '|BATCH_ONCLICK_CANCEL_SCRIPT', ''); // TODO <-- must still be build
// JCONTROLLERFORM_ALLOWADD <<>>
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'JCONTROLLERFORM_ALLOWADD' . $this->hhh]
- = $this->setJcontrollerAllowAdd(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|JCONTROLLERFORM_ALLOWADD', $this->setJcontrollerAllowAdd(
$nameSingleCode,
$nameListCode
- );
+ ));
// JCONTROLLERFORM_BEFORECANCEL <<>>
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'JCONTROLLERFORM_BEFORECANCEL' . $this->hhh]
- = $this->getCustomScriptBuilder(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|JCONTROLLERFORM_BEFORECANCEL', CFactory::_('Customcode.Dispenser')->get(
'php_before_cancel', $nameSingleCode,
- PHP_EOL, null, null,
+ PHP_EOL, null, false,
''
- );
+ ));
// JCONTROLLERFORM_AFTERCANCEL <<>>
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'JCONTROLLERFORM_AFTERCANCEL' . $this->hhh]
- = $this->getCustomScriptBuilder(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|JCONTROLLERFORM_AFTERCANCEL', CFactory::_('Customcode.Dispenser')->get(
'php_after_cancel', $nameSingleCode,
- PHP_EOL, null, null,
+ PHP_EOL, null, false,
''
- );
+ ));
// JCONTROLLERFORM_ALLOWEDIT <<>>
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'JCONTROLLERFORM_ALLOWEDIT' . $this->hhh]
- = $this->setJcontrollerAllowEdit(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|JCONTROLLERFORM_ALLOWEDIT', $this->setJcontrollerAllowEdit(
$nameSingleCode,
$nameListCode
- );
+ ));
// JMODELADMIN_GETFORM <<>>
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'JMODELADMIN_GETFORM' . $this->hhh]
- = $this->setJmodelAdminGetForm(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|JMODELADMIN_GETFORM', $this->setJmodelAdminGetForm(
$nameSingleCode,
$nameListCode
- );
+ ));
// JMODELADMIN_ALLOWEDIT <<>>
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'JMODELADMIN_ALLOWEDIT' . $this->hhh]
- = $this->setJmodelAdminAllowEdit(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|JMODELADMIN_ALLOWEDIT', $this->setJmodelAdminAllowEdit(
$nameSingleCode,
$nameListCode
- );
+ ));
// JMODELADMIN_CANDELETE <<>>
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'JMODELADMIN_CANDELETE' . $this->hhh]
- = $this->setJmodelAdminCanDelete(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|JMODELADMIN_CANDELETE', $this->setJmodelAdminCanDelete(
$nameSingleCode,
$nameListCode
- );
+ ));
// JMODELADMIN_CANEDITSTATE <<>>
- $this->fileContentDynamic[$nameSingleCode][$this->hhh
- . 'JMODELADMIN_CANEDITSTATE' . $this->hhh]
- = $this->setJmodelAdminCanEditState(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|JMODELADMIN_CANEDITSTATE', $this->setJmodelAdminCanEditState(
$nameSingleCode,
$nameListCode
- );
+ ));
// set custom admin view Toolbare buttons
// CUSTOM_ADMIN_DYNAMIC_BUTTONS <<>>
- $this->fileContentDynamic[$nameListCode][$this->hhh
- . 'CUSTOM_ADMIN_DYNAMIC_BUTTONS' . $this->hhh]
- = $this->setCustomAdminDynamicButton(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameListCode . '|CUSTOM_ADMIN_DYNAMIC_BUTTONS', $this->setCustomAdminDynamicButton(
$nameListCode
- );
+ ));
// CUSTOM_ADMIN_DYNAMIC_BUTTONS_CONTROLLER <<>>
- $this->fileContentDynamic[$nameListCode][$this->hhh
- . 'CUSTOM_ADMIN_DYNAMIC_BUTTONS_CONTROLLER' . $this->hhh]
- = $this->setCustomAdminDynamicButtonController(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameListCode . '|CUSTOM_ADMIN_DYNAMIC_BUTTONS_CONTROLLER', $this->setCustomAdminDynamicButtonController(
$nameListCode
- );
+ ));
// set helper router
- if (!isset(
- $this->fileContentStatic[$this->hhh . 'ROUTEHELPER'
- . $this->hhh]
- ))
- {
- $this->fileContentStatic[$this->hhh . 'ROUTEHELPER'
- . $this->hhh]
- = '';
- }
- $this->fileContentStatic[$this->hhh . 'ROUTEHELPER'
- . $this->hhh]
- .= $this->setRouterHelp(
+ CFactory::_('Compiler.Builder.Content.One')->add('ROUTEHELPER',
+ $this->setRouterHelp(
$nameSingleCode,
$nameListCode
- );
+ ));
if (isset($view['edit_create_site_view'])
&& is_numeric(
@@ -1246,352 +997,276 @@ class Infusion extends Interpretation
&& $view['edit_create_site_view'] > 0)
{
// add needed router stuff for front edit views
- $this->fileContentStatic[$this->hhh . 'ROUTER_PARSE_SWITCH'
- . $this->hhh]
- .= $this->routerParseSwitch(
+ CFactory::_('Compiler.Builder.Content.One')->add('ROUTER_PARSE_SWITCH',
+ $this->routerParseSwitch(
$nameSingleCode, null, false
- );
- $this->fileContentStatic[$this->hhh . 'ROUTER_BUILD_VIEWS'
- . $this->hhh]
- .= $this->routerBuildViews(
+ ));
+ CFactory::_('Compiler.Builder.Content.One')->add('ROUTER_BUILD_VIEWS',
+ $this->routerBuildViews(
$nameSingleCode
- );
+ ));
}
// ACCESS_SECTIONS
- if (!isset(
- $this->fileContentStatic[$this->hhh . 'ACCESS_SECTIONS'
- . $this->hhh]
- ))
- {
- $this->fileContentStatic[$this->hhh . 'ACCESS_SECTIONS'
- . $this->hhh]
- = '';
- }
- $this->fileContentStatic[$this->hhh . 'ACCESS_SECTIONS'
- . $this->hhh]
- .= $this->setAccessSectionsCategory(
+ CFactory::_('Compiler.Builder.Content.One')->add('ACCESS_SECTIONS',
+ $this->setAccessSectionsCategory(
$nameSingleCode,
$nameListCode
- );
+ ));
// set the Joomla Fields ACCESS section if needed
if (isset($view['joomla_fields'])
&& $view['joomla_fields'] == 1)
{
- $this->fileContentStatic[$this->hhh . 'ACCESS_SECTIONS'
- . $this->hhh]
- .= $this->setAccessSectionsJoomlaFields();
+ CFactory::_('Compiler.Builder.Content.One')->add('ACCESS_SECTIONS', $this->setAccessSectionsJoomlaFields());
}
+ // for plugin event TODO change event api signatures
+ $placeholders = CFactory::_('Placeholder')->active;
+ $fileContentStatic = CFactory::_('Compiler.Builder.Content.One')->allActive();
+ $fileContentDynamic = CFactory::_('Compiler.Builder.Content.Multi')->allActive();
// Trigger Event: jcb_ce_onAfterBuildAdminViewContent
- $this->triggerEvent(
+ CFactory::_('Event')->trigger(
'jcb_ce_onAfterBuildAdminViewContent',
- array(&$this->componentContext, &$view,
+ array(&$component_context, &$view,
&$nameSingleCode,
&$nameListCode,
- &$this->fileContentStatic,
- &$this->fileContentDynamic, &$this->placeholders,
+ &$fileContentStatic,
+ &$fileContentDynamic, &$placeholders,
&$this->hhh)
);
+ unset($fileContentStatic);
+ unset($fileContentDynamic);
+ unset($placeholders);
}
+ // all fields stored in database
+ CFactory::_('Compiler.Builder.Content.One')->set('ALL_COMPONENT_FIELDS', CFactory::_('Compiler.Builder.Component.Fields')->varExport(null, 1));
+
// setup the layouts
$this->setCustomViewLayouts();
// setup custom_admin_views and all needed stuff for the site
- if (isset($this->componentData->custom_admin_views)
- && ArrayHelper::check(
- $this->componentData->custom_admin_views
- ))
+ if (CFactory::_('Component')->isArray('custom_admin_views'))
{
- $this->target = 'custom_admin';
- $this->lang = 'admin';
+ CFactory::_('Config')->build_target = 'custom_admin';
+ CFactory::_('Config')->lang_target = 'admin';
// start dynamic build
- foreach ($this->componentData->custom_admin_views as $view)
+ foreach (CFactory::_('Component')->get('custom_admin_views') as $view)
{
// for single views
- $this->fileContentDynamic[$view['settings']->code][$this->hhh
- . 'SView' . $this->hhh]
- = $view['settings']->Code;
- $this->fileContentDynamic[$view['settings']->code][$this->hhh
- . 'sview' . $this->hhh]
- = $view['settings']->code;
- $this->fileContentDynamic[$view['settings']->code][$this->hhh
- . 'SVIEW' . $this->hhh]
- = $view['settings']->CODE;
+ CFactory::_('Compiler.Builder.Content.Multi')->set($view['settings']->code . '|SView', $view['settings']->Code);
+ CFactory::_('Compiler.Builder.Content.Multi')->set($view['settings']->code . '|sview', $view['settings']->code);
+ CFactory::_('Compiler.Builder.Content.Multi')->set($view['settings']->code . '|SVIEW', $view['settings']->CODE);
// for list views
- $this->fileContentDynamic[$view['settings']->code][$this->hhh
- . 'SViews' . $this->hhh]
- = $view['settings']->Code;
- $this->fileContentDynamic[$view['settings']->code][$this->hhh
- . 'sviews' . $this->hhh]
- = $view['settings']->code;
- $this->fileContentDynamic[$view['settings']->code][$this->hhh
- . 'SVIEWS' . $this->hhh]
- = $view['settings']->CODE;
+ CFactory::_('Compiler.Builder.Content.Multi')->set($view['settings']->code . '|SViews', $view['settings']->Code);
+ CFactory::_('Compiler.Builder.Content.Multi')->set($view['settings']->code . '|sviews', $view['settings']->code);
+ CFactory::_('Compiler.Builder.Content.Multi')->set($view['settings']->code . '|SVIEWS', $view['settings']->CODE);
// add to lang array
- $this->setLangContent(
- $this->lang,
- $this->langPrefix . '_' . $view['settings']->CODE,
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target,
+ CFactory::_('Config')->lang_prefix . '_' . $view['settings']->CODE,
$view['settings']->name
);
- $this->setLangContent(
- $this->lang,
- $this->langPrefix . '_' . $view['settings']->CODE
+ CFactory::_('Language')->set(
+ CFactory::_('Config')->lang_target,
+ CFactory::_('Config')->lang_prefix . '_' . $view['settings']->CODE
. '_DESC', $view['settings']->description
);
// ICOMOON <<>>
- $this->fileContentDynamic[$view['settings']->code][$this->hhh
- . 'ICOMOON' . $this->hhh]
- = $view['icomoon'];
+ CFactory::_('Compiler.Builder.Content.Multi')->set($view['settings']->code . '|ICOMOON', $view['icomoon']);
// set placeholders
- $this->placeholders[$this->hhh . 'SView' . $this->hhh]
- = $view['settings']->Code;
- $this->placeholders[$this->hhh . 'sview' . $this->hhh]
- = $view['settings']->code;
- $this->placeholders[$this->hhh . 'SVIEW' . $this->hhh]
- = $view['settings']->CODE;
- $this->placeholders[$this->bbb . 'SView' . $this->ddd]
- = $view['settings']->Code;
- $this->placeholders[$this->bbb . 'sview' . $this->ddd]
- = $view['settings']->code;
- $this->placeholders[$this->bbb . 'SVIEW' . $this->ddd]
- = $view['settings']->CODE;
- $this->placeholders[$this->hhh . 'SViews' . $this->hhh]
- = $view['settings']->Code;
- $this->placeholders[$this->hhh . 'sviews' . $this->hhh]
- = $view['settings']->code;
- $this->placeholders[$this->hhh . 'SVIEWS' . $this->hhh]
- = $view['settings']->CODE;
- $this->placeholders[$this->bbb . 'SViews' . $this->ddd]
- = $view['settings']->Code;
- $this->placeholders[$this->bbb . 'sviews' . $this->ddd]
- = $view['settings']->code;
- $this->placeholders[$this->bbb . 'SVIEWS' . $this->ddd]
- = $view['settings']->CODE;
+ CFactory::_('Placeholder')->set('SView', $view['settings']->Code);
+ CFactory::_('Placeholder')->set('sview', $view['settings']->code);
+ CFactory::_('Placeholder')->set('SVIEW', $view['settings']->CODE);
+ CFactory::_('Placeholder')->set('SViews', $view['settings']->Code);
+ CFactory::_('Placeholder')->set('sviews', $view['settings']->code);
+ CFactory::_('Placeholder')->set('SVIEWS', $view['settings']->CODE);
+
+ // for plugin event TODO change event api signatures
+ $placeholders = CFactory::_('Placeholder')->active;
+ $fileContentStatic = CFactory::_('Compiler.Builder.Content.One')->allActive();
+ $fileContentDynamic = CFactory::_('Compiler.Builder.Content.Multi')->allActive();
// Trigger Event: jcb_ce_onBeforeBuildCustomAdminViewContent
- $this->triggerEvent(
+ CFactory::_('Event')->trigger(
'jcb_ce_onBeforeBuildCustomAdminViewContent',
- array(&$this->componentContext, &$view,
+ array(&$component_context, &$view,
&$view['settings']->code,
- &$this->fileContentStatic,
- &$this->fileContentDynamic[$view['settings']->code],
- &$this->placeholders, &$this->hhh)
+ &$fileContentStatic,
+ &$fileContentDynamic[$view['settings']->code],
+ &$placeholders, &$this->hhh)
);
+ unset($fileContentStatic);
+ unset($fileContentDynamic);
+ unset($placeholders);
// set license per view if needed
$this->setLockLicensePer(
- $view['settings']->code, $this->target
+ $view['settings']->code, CFactory::_('Config')->build_target
);
// check if this custom admin view is the default view
- if ($this->dynamicDashboardType === 'custom_admin_views'
- && $this->dynamicDashboard === $view['settings']->code)
+ if (CFactory::_('Registry')->get('build.dashboard.type', '') === 'custom_admin_views'
+ && CFactory::_('Registry')->get('build.dashboard', '') === $view['settings']->code)
{
// HIDEMAINMENU <<>>
- $this->fileContentDynamic[$view['settings']->code][$this->hhh
- . 'HIDEMAINMENU' . $this->hhh]
- = '';
+ CFactory::_('Compiler.Builder.Content.Multi')->set($view['settings']->code . '|HIDEMAINMENU', '');
}
else
{
// HIDEMAINMENU <<>>
- $this->fileContentDynamic[$view['settings']->code][$this->hhh
- . 'HIDEMAINMENU' . $this->hhh]
- = PHP_EOL . $this->_t(2) . '//' . $this->setLine(
- __LINE__
+ CFactory::_('Compiler.Builder.Content.Multi')->set($view['settings']->code . '|HIDEMAINMENU', PHP_EOL . Indent::_(2) . '//' . Line::_(
+ __LINE__,__CLASS__
) . " hide the main menu"
- . PHP_EOL . $this->_t(2)
- . "\$this->app->input->set('hidemainmenu', true);";
+ . PHP_EOL . Indent::_(2)
+ . "\$this->app->input->set('hidemainmenu', true);");
}
if ($view['settings']->main_get->gettype == 1)
{
// CUSTOM_ADMIN_BEFORE_GET_ITEM <<>>
- $this->fileContentDynamic[$view['settings']->code][$this->hhh
- . 'CUSTOM_ADMIN_BEFORE_GET_ITEM' . $this->hhh]
- = $this->getCustomScriptBuilder(
- $this->target . '_php_before_getitem',
+ CFactory::_('Compiler.Builder.Content.Multi')->set($view['settings']->code . '|CUSTOM_ADMIN_BEFORE_GET_ITEM', CFactory::_('Customcode.Dispenser')->get(
+ CFactory::_('Config')->build_target . '_php_before_getitem',
$view['settings']->code, '', null, true
- );
+ ));
// CUSTOM_ADMIN_GET_ITEM <<>>
- $this->fileContentDynamic[$view['settings']->code][$this->hhh
- . 'CUSTOM_ADMIN_GET_ITEM' . $this->hhh]
- = $this->setCustomViewGetItem(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($view['settings']->code . '|CUSTOM_ADMIN_GET_ITEM', $this->setCustomViewGetItem(
$view['settings']->main_get,
- $view['settings']->code, $this->_t(2)
- );
+ $view['settings']->code, Indent::_(2)
+ ));
// CUSTOM_ADMIN_AFTER_GET_ITEM <<>>
- $this->fileContentDynamic[$view['settings']->code][$this->hhh
- . 'CUSTOM_ADMIN_AFTER_GET_ITEM' . $this->hhh]
- = $this->getCustomScriptBuilder(
- $this->target . '_php_after_getitem',
+ CFactory::_('Compiler.Builder.Content.Multi')->set($view['settings']->code . '|CUSTOM_ADMIN_AFTER_GET_ITEM', CFactory::_('Customcode.Dispenser')->get(
+ CFactory::_('Config')->build_target . '_php_after_getitem',
$view['settings']->code, '', null, true
- );
+ ));
}
elseif ($view['settings']->main_get->gettype == 2)
{
// CUSTOM_ADMIN_GET_LIST_QUERY <<>>
- $this->fileContentDynamic[$view['settings']->code][$this->hhh
- . 'CUSTOM_ADMIN_GET_LIST_QUERY' . $this->hhh]
- = $this->setCustomViewListQuery(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($view['settings']->code . '|CUSTOM_ADMIN_GET_LIST_QUERY', $this->setCustomViewListQuery(
$view['settings']->main_get, $view['settings']->code
- );
+ ));
// CUSTOM_ADMIN_CUSTOM_BEFORE_LIST_QUERY <<>>
- $this->fileContentDynamic[$view['settings']->code][$this->hhh
- . 'CUSTOM_ADMIN_CUSTOM_BEFORE_LIST_QUERY' . $this->hhh]
- = $this->getCustomScriptBuilder(
- $this->target . '_php_getlistquery',
+ CFactory::_('Compiler.Builder.Content.Multi')->set($view['settings']->code . '|CUSTOM_ADMIN_CUSTOM_BEFORE_LIST_QUERY', CFactory::_('Customcode.Dispenser')->get(
+ CFactory::_('Config')->build_target . '_php_getlistquery',
$view['settings']->code, PHP_EOL, null, true
- );
+ ));
// CUSTOM_ADMIN_BEFORE_GET_ITEMS <<>>
- $this->fileContentDynamic[$view['settings']->code][$this->hhh
- . 'CUSTOM_ADMIN_BEFORE_GET_ITEMS' . $this->hhh]
- = $this->getCustomScriptBuilder(
- $this->target . '_php_before_getitems',
+ CFactory::_('Compiler.Builder.Content.Multi')->set($view['settings']->code . '|CUSTOM_ADMIN_BEFORE_GET_ITEMS', CFactory::_('Customcode.Dispenser')->get(
+ CFactory::_('Config')->build_target . '_php_before_getitems',
$view['settings']->code, PHP_EOL, null, true
- );
+ ));
// CUSTOM_ADMIN_GET_ITEMS <<>>
- $this->fileContentDynamic[$view['settings']->code][$this->hhh
- . 'CUSTOM_ADMIN_GET_ITEMS' . $this->hhh]
- = $this->setCustomViewGetItems(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($view['settings']->code . '|CUSTOM_ADMIN_GET_ITEMS', $this->setCustomViewGetItems(
$view['settings']->main_get, $view['settings']->code
- );
+ ));
// CUSTOM_ADMIN_AFTER_GET_ITEMS <<>>
- $this->fileContentDynamic[$view['settings']->code][$this->hhh
- . 'CUSTOM_ADMIN_AFTER_GET_ITEMS' . $this->hhh]
- = $this->getCustomScriptBuilder(
- $this->target . '_php_after_getitems',
+ CFactory::_('Compiler.Builder.Content.Multi')->set($view['settings']->code . '|CUSTOM_ADMIN_AFTER_GET_ITEMS', CFactory::_('Customcode.Dispenser')->get(
+ CFactory::_('Config')->build_target . '_php_after_getitems',
$view['settings']->code, PHP_EOL, null, true
- );
+ ));
}
// CUSTOM_ADMIN_CUSTOM_METHODS <<>>
- $this->fileContentDynamic[$view['settings']->code][$this->hhh
- . 'CUSTOM_ADMIN_CUSTOM_METHODS' . $this->hhh]
- = $this->setCustomViewCustomItemMethods(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($view['settings']->code . '|CUSTOM_ADMIN_CUSTOM_METHODS', $this->setCustomViewCustomItemMethods(
$view['settings']->main_get, $view['settings']->code
- );
- $this->fileContentDynamic[$view['settings']->code][$this->hhh
- . 'CUSTOM_ADMIN_CUSTOM_METHODS' . $this->hhh]
- .= $this->setCustomViewCustomMethods(
- $view, $view['settings']->code
+ ));
+ CFactory::_('Compiler.Builder.Content.Multi')->add($view['settings']->code . '|CUSTOM_ADMIN_CUSTOM_METHODS',
+ $this->setCustomViewCustomMethods(
+ $view, $view['settings']->code
+ ). false
);
// CUSTOM_ADMIN_DIPLAY_METHOD <<>>
- $this->fileContentDynamic[$view['settings']->code][$this->hhh
- . 'CUSTOM_ADMIN_DIPLAY_METHOD' . $this->hhh]
- = $this->setCustomViewDisplayMethod($view);
+ CFactory::_('Compiler.Builder.Content.Multi')->set($view['settings']->code . '|CUSTOM_ADMIN_DIPLAY_METHOD', $this->setCustomViewDisplayMethod($view));
// set document details
$this->setPrepareDocument($view);
// CUSTOM_ADMIN_EXTRA_DIPLAY_METHODS <<>>
- $this->fileContentDynamic[$view['settings']->code][$this->hhh
- . 'CUSTOM_ADMIN_EXTRA_DIPLAY_METHODS' . $this->hhh]
- = $this->setCustomViewExtraDisplayMethods($view);
+ CFactory::_('Compiler.Builder.Content.Multi')->set($view['settings']->code . '|CUSTOM_ADMIN_EXTRA_DIPLAY_METHODS', $this->setCustomViewExtraDisplayMethods($view));
// CUSTOM_ADMIN_CODE_BODY <<>>
- $this->fileContentDynamic[$view['settings']->code][$this->hhh
- . 'CUSTOM_ADMIN_CODE_BODY' . $this->hhh]
- = $this->setCustomViewCodeBody($view);
+ CFactory::_('Compiler.Builder.Content.Multi')->set($view['settings']->code . '|CUSTOM_ADMIN_CODE_BODY', $this->setCustomViewCodeBody($view));
// CUSTOM_ADMIN_BODY <<>>
- $this->fileContentDynamic[$view['settings']->code][$this->hhh
- . 'CUSTOM_ADMIN_BODY' . $this->hhh]
- = $this->setCustomViewBody($view);
+ CFactory::_('Compiler.Builder.Content.Multi')->set($view['settings']->code . '|CUSTOM_ADMIN_BODY', $this->setCustomViewBody($view));
// CUSTOM_ADMIN_SUBMITBUTTON_SCRIPT <<>>
- $this->fileContentDynamic[$view['settings']->code][$this->hhh
- . 'CUSTOM_ADMIN_SUBMITBUTTON_SCRIPT' . $this->hhh]
- = $this->setCustomViewSubmitButtonScript($view);
+ CFactory::_('Compiler.Builder.Content.Multi')->set($view['settings']->code . '|CUSTOM_ADMIN_SUBMITBUTTON_SCRIPT', $this->setCustomViewSubmitButtonScript($view));
// setup the templates
$this->setCustomViewTemplateBody($view);
// set the site form if needed
- $this->fileContentDynamic[$view['settings']->code][$this->hhh
- . 'CUSTOM_ADMIN_TOP_FORM' . $this->hhh]
- = $this->setCustomViewForm(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($view['settings']->code . '|CUSTOM_ADMIN_TOP_FORM', $this->setCustomViewForm(
$view['settings']->code,
$view['settings']->main_get->gettype, 1
- );
- $this->fileContentDynamic[$view['settings']->code][$this->hhh
- . 'CUSTOM_ADMIN_BOTTOM_FORM' . $this->hhh]
- = $this->setCustomViewForm(
+ ));
+ CFactory::_('Compiler.Builder.Content.Multi')->set($view['settings']->code . '|CUSTOM_ADMIN_BOTTOM_FORM', $this->setCustomViewForm(
$view['settings']->code,
$view['settings']->main_get->gettype, 2
- );
+ ));
// set headers based on the main get type
if ($view['settings']->main_get->gettype == 1)
{
// CUSTOM_ADMIN_VIEW_CONTROLLER_HEADER <<>> add the header details for the controller
- $this->fileContentDynamic[$view['settings']->code][$this->hhh
- . 'CUSTOM_ADMIN_VIEW_CONTROLLER_HEADER' . $this->hhh]
- = $this->setFileHeader(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($view['settings']->code . '|CUSTOM_ADMIN_VIEW_CONTROLLER_HEADER', $this->setFileHeader(
'custom.admin.view.controller',
$view['settings']->code
- );
+ ));
// CUSTOM_ADMIN_VIEW_MODEL_HEADER <<>> add the header details for the model
- $this->fileContentDynamic[$view['settings']->code][$this->hhh
- . 'CUSTOM_ADMIN_VIEW_MODEL_HEADER' . $this->hhh]
- = $this->setFileHeader(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($view['settings']->code . '|CUSTOM_ADMIN_VIEW_MODEL_HEADER', $this->setFileHeader(
'custom.admin.view.model', $view['settings']->code
- );
+ ));
// CUSTOM_ADMIN_VIEW_HTML_HEADER <<>> add the header details for the view
- $this->fileContentDynamic[$view['settings']->code][$this->hhh
- . 'CUSTOM_ADMIN_VIEW_HTML_HEADER' . $this->hhh]
- = $this->setFileHeader(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($view['settings']->code . '|CUSTOM_ADMIN_VIEW_HTML_HEADER', $this->setFileHeader(
'custom.admin.view.html', $view['settings']->code
- );
+ ));
// CUSTOM_ADMIN_VIEW_HEADER <<>> add the header details for the view
- $this->fileContentDynamic[$view['settings']->code][$this->hhh
- . 'CUSTOM_ADMIN_VIEW_HEADER' . $this->hhh]
- = $this->setFileHeader(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($view['settings']->code . '|CUSTOM_ADMIN_VIEW_HEADER', $this->setFileHeader(
'custom.admin.view', $view['settings']->code
- );
+ ));
}
elseif ($view['settings']->main_get->gettype == 2)
{
// CUSTOM_ADMIN_VIEWS_CONTROLLER_HEADER <<>> add the header details for the controller
- $this->fileContentDynamic[$view['settings']->code][$this->hhh
- . 'CUSTOM_ADMIN_VIEWS_CONTROLLER_HEADER' . $this->hhh]
- = $this->setFileHeader(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($view['settings']->code . '|CUSTOM_ADMIN_VIEWS_CONTROLLER_HEADER', $this->setFileHeader(
'custom.admin.views.controller',
$view['settings']->code
- );
+ ));
// CUSTOM_ADMIN_VIEWS_MODEL_HEADER <<>> add the header details for the model
- $this->fileContentDynamic[$view['settings']->code][$this->hhh
- . 'CUSTOM_ADMIN_VIEWS_MODEL_HEADER' . $this->hhh]
- = $this->setFileHeader(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($view['settings']->code . '|CUSTOM_ADMIN_VIEWS_MODEL_HEADER', $this->setFileHeader(
'custom.admin.views.model', $view['settings']->code
- );
+ ));
// CUSTOM_ADMIN_VIEWS_HTML_HEADER <<>> add the header details for the view
- $this->fileContentDynamic[$view['settings']->code][$this->hhh
- . 'CUSTOM_ADMIN_VIEWS_HTML_HEADER' . $this->hhh]
- = $this->setFileHeader(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($view['settings']->code . '|CUSTOM_ADMIN_VIEWS_HTML_HEADER', $this->setFileHeader(
'custom.admin.views.html', $view['settings']->code
- );
+ ));
// CUSTOM_ADMIN_VIEWS_HEADER <<>> add the header details for the view
- $this->fileContentDynamic[$view['settings']->code][$this->hhh
- . 'CUSTOM_ADMIN_VIEWS_HEADER' . $this->hhh]
- = $this->setFileHeader(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($view['settings']->code . '|CUSTOM_ADMIN_VIEWS_HEADER', $this->setFileHeader(
'custom.admin.views', $view['settings']->code
- );
+ ));
}
+ // for plugin event TODO change event api signatures
+ $placeholders = CFactory::_('Placeholder')->active;
+ $fileContentStatic = CFactory::_('Compiler.Builder.Content.One')->allActive();
+ $fileContentDynamic = CFactory::_('Compiler.Builder.Content.Multi')->allActive();
// Trigger Event: jcb_ce_onAfterBuildCustomAdminViewContent
- $this->triggerEvent(
+ CFactory::_('Event')->trigger(
'jcb_ce_onAfterBuildCustomAdminViewContent',
- array(&$this->componentContext, &$view,
+ array(&$component_context, &$view,
&$view['settings']->code,
- &$this->fileContentStatic,
- &$this->fileContentDynamic[$view['settings']->code],
- &$this->placeholders, &$this->hhh)
+ &$fileContentStatic,
+ &$fileContentDynamic[$view['settings']->code],
+ &$placeholders, &$this->hhh)
);
+ unset($fileContentStatic);
+ unset($fileContentDynamic);
+ unset($placeholders);
}
// setup the layouts
@@ -1599,227 +1274,168 @@ class Infusion extends Interpretation
}
// ADMIN_HELPER_CLASS_HEADER
- $this->fileContentStatic[$this->hhh . 'ADMIN_HELPER_CLASS_HEADER'
- . $this->hhh]
- = $this->setFileHeader(
+ CFactory::_('Compiler.Builder.Content.One')->set('ADMIN_HELPER_CLASS_HEADER',
+ $this->setFileHeader(
'admin.helper', 'admin'
- );
+ ));
// ADMIN_COMPONENT_HEADER
- $this->fileContentStatic[$this->hhh . 'ADMIN_COMPONENT_HEADER'
- . $this->hhh]
- = $this->setFileHeader(
+ CFactory::_('Compiler.Builder.Content.One')->set('ADMIN_COMPONENT_HEADER',
+ $this->setFileHeader(
'admin.component', 'admin'
- );
+ ));
// SITE_HELPER_CLASS_HEADER
- $this->fileContentStatic[$this->hhh . 'SITE_HELPER_CLASS_HEADER'
- . $this->hhh]
- = $this->setFileHeader(
+ CFactory::_('Compiler.Builder.Content.One')->set('SITE_HELPER_CLASS_HEADER',
+ $this->setFileHeader(
'site.helper', 'site'
- );
+ ));
// SITE_COMPONENT_HEADER
- $this->fileContentStatic[$this->hhh . 'SITE_COMPONENT_HEADER'
- . $this->hhh]
- = $this->setFileHeader(
+ CFactory::_('Compiler.Builder.Content.One')->set('SITE_COMPONENT_HEADER',
+ $this->setFileHeader(
'site.component', 'site'
- );
+ ));
// HELPER_EXEL
- $this->fileContentStatic[$this->hhh . 'HELPER_EXEL'
- . $this->hhh]
- = $this->setHelperExelMethods();
+ CFactory::_('Compiler.Builder.Content.One')->set('HELPER_EXEL', $this->setHelperExelMethods());
// VIEWARRAY
- $this->fileContentStatic[$this->hhh . 'VIEWARRAY' . $this->hhh]
- = PHP_EOL . implode("," . PHP_EOL, $viewarray);
+ CFactory::_('Compiler.Builder.Content.One')->set('VIEWARRAY', PHP_EOL . implode("," . PHP_EOL, $viewarray));
// CUSTOM_ADMIN_EDIT_VIEW_ARRAY
- $this->fileContentStatic[$this->hhh . 'SITE_EDIT_VIEW_ARRAY'
- . $this->hhh]
- = PHP_EOL . implode("," . PHP_EOL, $site_edit_view_array);
+ CFactory::_('Compiler.Builder.Content.One')->set('SITE_EDIT_VIEW_ARRAY', PHP_EOL . implode("," . PHP_EOL, $site_edit_view_array));
// MAINMENUS
- $this->fileContentStatic[$this->hhh . 'MAINMENUS' . $this->hhh]
- = $this->setMainMenus();
+ CFactory::_('Compiler.Builder.Content.One')->set('MAINMENUS', $this->setMainMenus());
// SUBMENU
- $this->fileContentStatic[$this->hhh . 'SUBMENU' . $this->hhh]
- = $this->setSubMenus();
+ CFactory::_('Compiler.Builder.Content.One')->set('SUBMENU', $this->setSubMenus());
// GET_CRYPT_KEY
- $this->fileContentStatic[$this->hhh . 'GET_CRYPT_KEY' . $this->hhh]
- = $this->setGetCryptKey();
+ CFactory::_('Compiler.Builder.Content.One')->set('GET_CRYPT_KEY', $this->setGetCryptKey());
// set the license locker
$this->setLockLicense();
// CONTRIBUTORS
- $this->fileContentStatic[$this->hhh . 'CONTRIBUTORS' . $this->hhh]
- = $this->theContributors;
+ CFactory::_('Compiler.Builder.Content.One')->set('CONTRIBUTORS', $this->theContributors);
// INSTALL
- $this->fileContentStatic[$this->hhh . 'INSTALL' . $this->hhh]
- = $this->setInstall();
+ CFactory::_('Compiler.Builder.Content.One')->set('INSTALL', $this->setInstall());
// UNINSTALL
- $this->fileContentStatic[$this->hhh . 'UNINSTALL' . $this->hhh]
- = $this->setUninstall();
+ CFactory::_('Compiler.Builder.Content.One')->set('UNINSTALL', $this->setUninstall());
// UPDATE_VERSION_MYSQL
$this->setVersionController();
// only set these if default dashboard it used
- if (!StringHelper::check($this->dynamicDashboard))
+ if (!CFactory::_('Registry')->get('build.dashboard'))
{
// DASHBOARDVIEW
- $this->fileContentStatic[$this->hhh . 'DASHBOARDVIEW'
- . $this->hhh]
- = $this->componentCodeName;
+ CFactory::_('Compiler.Builder.Content.One')->set('DASHBOARDVIEW', CFactory::_('Config')->component_code_name);
// DASHBOARDICONS
- $this->fileContentDynamic[$this->componentCodeName][$this->hhh
- . 'DASHBOARDICONS' . $this->hhh]
- = $this->setDashboardIcons();
+ CFactory::_('Compiler.Builder.Content.Multi')->set(CFactory::_('Config')->component_code_name . '|DASHBOARDICONS', $this->setDashboardIcons());
// DASHBOARDICONACCESS
- $this->fileContentDynamic[$this->componentCodeName][$this->hhh
- . 'DASHBOARDICONACCESS' . $this->hhh]
- = $this->setDashboardIconAccess();
+ CFactory::_('Compiler.Builder.Content.Multi')->set(CFactory::_('Config')->component_code_name . '|DASHBOARDICONACCESS', $this->setDashboardIconAccess());
// DASH_MODEL_METHODS
- $this->fileContentDynamic[$this->componentCodeName][$this->hhh
- . 'DASH_MODEL_METHODS' . $this->hhh]
- = $this->setDashboardModelMethods();
+ CFactory::_('Compiler.Builder.Content.Multi')->set(CFactory::_('Config')->component_code_name . '|DASH_MODEL_METHODS', $this->setDashboardModelMethods());
// DASH_GET_CUSTOM_DATA
- $this->fileContentDynamic[$this->componentCodeName][$this->hhh
- . 'DASH_GET_CUSTOM_DATA' . $this->hhh]
- = $this->setDashboardGetCustomData();
+ CFactory::_('Compiler.Builder.Content.Multi')->set(CFactory::_('Config')->component_code_name . '|DASH_GET_CUSTOM_DATA', $this->setDashboardGetCustomData());
// DASH_DISPLAY_DATA
- $this->fileContentDynamic[$this->componentCodeName][$this->hhh
- . 'DASH_DISPLAY_DATA' . $this->hhh]
- = $this->setDashboardDisplayData();
+ CFactory::_('Compiler.Builder.Content.Multi')->set(CFactory::_('Config')->component_code_name . '|DASH_DISPLAY_DATA', $this->setDashboardDisplayData());
// DASH_VIEW_HEADER
- $this->fileContentDynamic[$this->componentCodeName][$this->hhh
- . 'DASH_VIEW_HEADER' . $this->hhh]
- = $this->setFileHeader('dashboard.view', 'dashboard');
+ CFactory::_('Compiler.Builder.Content.Multi')->set(CFactory::_('Config')->component_code_name . '|DASH_VIEW_HEADER', $this->setFileHeader('dashboard.view', 'dashboard'));
// DASH_VIEW_HTML_HEADER
- $this->fileContentDynamic[$this->componentCodeName][$this->hhh
- . 'DASH_VIEW_HTML_HEADER' . $this->hhh]
- = $this->setFileHeader('dashboard.view.html', 'dashboard');
+ CFactory::_('Compiler.Builder.Content.Multi')->set(CFactory::_('Config')->component_code_name . '|DASH_VIEW_HTML_HEADER', $this->setFileHeader('dashboard.view.html', 'dashboard'));
// DASH_MODEL_HEADER
- $this->fileContentDynamic[$this->componentCodeName][$this->hhh
- . 'DASH_MODEL_HEADER' . $this->hhh]
- = $this->setFileHeader('dashboard.model', 'dashboard');
+ CFactory::_('Compiler.Builder.Content.Multi')->set(CFactory::_('Config')->component_code_name . '|DASH_MODEL_HEADER', $this->setFileHeader('dashboard.model', 'dashboard'));
// DASH_CONTROLLER_HEADER
- $this->fileContentDynamic[$this->componentCodeName][$this->hhh
- . 'DASH_CONTROLLER_HEADER' . $this->hhh]
- = $this->setFileHeader('dashboard.controller', 'dashboard');
+ CFactory::_('Compiler.Builder.Content.Multi')->set(CFactory::_('Config')->component_code_name . '|DASH_CONTROLLER_HEADER', $this->setFileHeader('dashboard.controller', 'dashboard'));
}
else
{
// DASHBOARDVIEW
- $this->fileContentStatic[$this->hhh . 'DASHBOARDVIEW'
- . $this->hhh]
- = $this->dynamicDashboard;
+ CFactory::_('Compiler.Builder.Content.One')->set('DASHBOARDVIEW', CFactory::_('Registry')->get('build.dashboard'));
}
// add import
- if (isset($this->addEximport) && $this->addEximport)
+ if (CFactory::_('Config')->get('add_eximport', false))
{
// setup import files
$target = array('admin' => 'import');
- $this->buildDynamique($target, 'import');
+ CFactory::_('Utilities.Structure')->build($target, 'import');
// IMPORT_EXT_METHOD <<>>
- $this->fileContentDynamic['import'][$this->hhh
- . 'IMPORT_EXT_METHOD' . $this->hhh]
- = PHP_EOL . PHP_EOL . $this->setPlaceholders(
- ComponentbuilderHelper::getDynamicScripts('ext'),
- $this->placeholders
- );
+ CFactory::_('Compiler.Builder.Content.Multi')->set('import' . '|IMPORT_EXT_METHOD', PHP_EOL . PHP_EOL . CFactory::_('Placeholder')->update_(
+ ComponentbuilderHelper::getDynamicScripts('ext')
+ ));
// IMPORT_SETDATA_METHOD <<>>
- $this->fileContentDynamic['import'][$this->hhh
- . 'IMPORT_SETDATA_METHOD' . $this->hhh]
- = PHP_EOL . PHP_EOL . $this->setPlaceholders(
- ComponentbuilderHelper::getDynamicScripts('setdata'),
- $this->placeholders
- );
+ CFactory::_('Compiler.Builder.Content.Multi')->set('import' . '|IMPORT_SETDATA_METHOD', PHP_EOL . PHP_EOL . CFactory::_('Placeholder')->update_(
+ ComponentbuilderHelper::getDynamicScripts('setdata')
+ ));
// IMPORT_SAVE_METHOD <<>>
- $this->fileContentDynamic['import'][$this->hhh
- . 'IMPORT_SAVE_METHOD' . $this->hhh]
- = PHP_EOL . PHP_EOL . $this->setPlaceholders(
- ComponentbuilderHelper::getDynamicScripts('save'),
- $this->placeholders
- );
+ CFactory::_('Compiler.Builder.Content.Multi')->set('import' . '|IMPORT_SAVE_METHOD', PHP_EOL . PHP_EOL . CFactory::_('Placeholder')->update_(
+ ComponentbuilderHelper::getDynamicScripts('save')
+ ));
+ // IMPORT_CONTROLLER_HEADER <<>> add the header details for the controller
+ CFactory::_('Compiler.Builder.Content.Multi')->set('import' . '|IMPORT_CONTROLLER_HEADER', $this->setFileHeader(
+ 'import.controller', 'import'
+ ));
+ // IMPORT_MODEL_HEADER <<>> add the header details for the model
+ CFactory::_('Compiler.Builder.Content.Multi')->set('import' . '|IMPORT_MODEL_HEADER', $this->setFileHeader(
+ 'import.model', 'import'
+ ));
}
// ensure that the ajax model and controller is set if needed
- if (isset($this->addAjax) && $this->addAjax)
+ if (CFactory::_('Config')->get('add_ajax', false))
{
// setup Ajax files
$target = array('admin' => 'ajax');
- $this->buildDynamique($target, 'ajax');
+ CFactory::_('Utilities.Structure')->build($target, 'ajax');
// set the controller
- $this->fileContentDynamic['ajax'][$this->hhh
- . 'REGISTER_AJAX_TASK' . $this->hhh]
- = $this->setRegisterAjaxTask('admin');
- $this->fileContentDynamic['ajax'][$this->hhh
- . 'AJAX_INPUT_RETURN' . $this->hhh]
- = $this->setAjaxInputReturn('admin');
+ CFactory::_('Compiler.Builder.Content.Multi')->set('ajax' . '|REGISTER_AJAX_TASK', $this->setRegisterAjaxTask('admin'));
+ CFactory::_('Compiler.Builder.Content.Multi')->set('ajax' . '|AJAX_INPUT_RETURN', $this->setAjaxInputReturn('admin'));
// set the model header
- $this->fileContentDynamic['ajax'][$this->hhh
- . 'AJAX_ADMIN_MODEL_HEADER' . $this->hhh]
- = $this->setFileHeader('ajax.admin.model', 'ajax');
+ CFactory::_('Compiler.Builder.Content.Multi')->set('ajax' . '|AJAX_ADMIN_MODEL_HEADER', $this->setFileHeader('ajax.admin.model', 'ajax'));
// set the module
- $this->fileContentDynamic['ajax'][$this->hhh
- . 'AJAX_MODEL_METHODS' . $this->hhh]
- = $this->setAjaxModelMethods('admin');
+ CFactory::_('Compiler.Builder.Content.Multi')->set('ajax' . '|AJAX_MODEL_METHODS', $this->setAjaxModelMethods('admin'));
}
// ensure that the site ajax model and controller is set if needed
- if (isset($this->addSiteAjax) && $this->addSiteAjax)
+ if (CFactory::_('Config')->get('add_site_ajax', false))
{
// setup Ajax files
$target = array('site' => 'ajax');
- $this->buildDynamique($target, 'ajax');
+ CFactory::_('Utilities.Structure')->build($target, 'ajax');
// set the controller
- $this->fileContentDynamic['ajax'][$this->hhh
- . 'REGISTER_SITE_AJAX_TASK' . $this->hhh]
- = $this->setRegisterAjaxTask('site');
- $this->fileContentDynamic['ajax'][$this->hhh
- . 'AJAX_SITE_INPUT_RETURN' . $this->hhh]
- = $this->setAjaxInputReturn('site');
+ CFactory::_('Compiler.Builder.Content.Multi')->set('ajax' . '|REGISTER_SITE_AJAX_TASK', $this->setRegisterAjaxTask('site'));
+ CFactory::_('Compiler.Builder.Content.Multi')->set('ajax' . '|AJAX_SITE_INPUT_RETURN', $this->setAjaxInputReturn('site'));
// set the model header
- $this->fileContentDynamic['ajax'][$this->hhh
- . 'AJAX_SITE_MODEL_HEADER' . $this->hhh]
- = $this->setFileHeader('ajax.site.model', 'ajax');
+ CFactory::_('Compiler.Builder.Content.Multi')->set('ajax' . '|AJAX_SITE_MODEL_HEADER', $this->setFileHeader('ajax.site.model', 'ajax'));
// set the module
- $this->fileContentDynamic['ajax'][$this->hhh
- . 'AJAX_SITE_MODEL_METHODS' . $this->hhh]
- = $this->setAjaxModelMethods('site');
+ CFactory::_('Compiler.Builder.Content.Multi')->set('ajax' . '|AJAX_SITE_MODEL_METHODS', $this->setAjaxModelMethods('site'));
}
// build the validation rules
- if (isset($this->validationRules)
- && ArrayHelper::check($this->validationRules))
+ if (($validationRules = CFactory::_('Registry')->_('validation.rules')) !== null)
{
- foreach ($this->validationRules as $rule => $_php)
+ foreach ($validationRules as $rule => $_php)
{
// setup rule file
$target = array('admin' => 'a_rule_zi');
- $this->buildDynamique($target, 'rule', $rule);
+ CFactory::_('Utilities.Structure')->build($target, 'rule', $rule);
// set the JFormRule Name
- $this->fileContentDynamic['a_rule_zi_' . $rule][$this->hhh
- . 'Name' . $this->hhh]
- = ucfirst($rule);
+ CFactory::_('Compiler.Builder.Content.Multi')->set('a_rule_zi_' . $rule . '|Name', ucfirst((string) $rule));
// set the JFormRule PHP
- $this->fileContentDynamic['a_rule_zi_' . $rule][$this->hhh
- . 'VALIDATION_RULE_METHODS' . $this->hhh]
- = PHP_EOL . $_php;
+ CFactory::_('Compiler.Builder.Content.Multi')->set('a_rule_zi_' . $rule . '|VALIDATION_RULE_METHODS', PHP_EOL . $_php);
}
}
@@ -1842,235 +1458,174 @@ class Infusion extends Interpretation
}
// CONFIG_FIELDSETS
- $keepLang = $this->lang;
- $this->lang = 'admin';
+ $keepLang = CFactory::_('Config')->lang_target;
+ CFactory::_('Config')->lang_target = 'admin';
// run field sets for second time
$this->setConfigFieldsets(2);
- $this->lang = $keepLang;
+ CFactory::_('Config')->lang_target = $keepLang;
// setup front-views and all needed stuff for the site
- if (isset($this->componentData->site_views)
- && ArrayHelper::check(
- $this->componentData->site_views
- ))
+ if (CFactory::_('Component')->isArray('site_views'))
{
- $this->target = 'site';
+ CFactory::_('Config')->build_target = 'site';
// start dynamic build
- foreach ($this->componentData->site_views as $view)
+ foreach (CFactory::_('Component')->get('site_views') as $view)
{
// for list views
- $this->fileContentDynamic[$view['settings']->code][$this->hhh
- . 'SViews' . $this->hhh]
- = $view['settings']->Code;
- $this->fileContentDynamic[$view['settings']->code][$this->hhh
- . 'sviews' . $this->hhh]
- = $view['settings']->code;
+ CFactory::_('Compiler.Builder.Content.Multi')->set($view['settings']->code . '|SViews', $view['settings']->Code);
+ CFactory::_('Compiler.Builder.Content.Multi')->set($view['settings']->code . '|sviews', $view['settings']->code);
// for single views
- $this->fileContentDynamic[$view['settings']->code][$this->hhh
- . 'SView' . $this->hhh]
- = $view['settings']->Code;
- $this->fileContentDynamic[$view['settings']->code][$this->hhh
- . 'sview' . $this->hhh]
- = $view['settings']->code;
+ CFactory::_('Compiler.Builder.Content.Multi')->set($view['settings']->code . '|SView', $view['settings']->Code);
+ CFactory::_('Compiler.Builder.Content.Multi')->set($view['settings']->code . '|sview', $view['settings']->code);
- // set placeholder
- $this->placeholders[$this->hhh . 'SView' . $this->hhh]
- = $view['settings']->Code;
- $this->placeholders[$this->hhh . 'sview' . $this->hhh]
- = $view['settings']->code;
- $this->placeholders[$this->hhh . 'SVIEW' . $this->hhh]
- = $view['settings']->CODE;
- $this->placeholders[$this->bbb . 'SView' . $this->ddd]
- = $view['settings']->Code;
- $this->placeholders[$this->bbb . 'sview' . $this->ddd]
- = $view['settings']->code;
- $this->placeholders[$this->bbb . 'SVIEW' . $this->ddd]
- = $view['settings']->CODE;
- $this->placeholders[$this->hhh . 'SViews' . $this->hhh]
- = $view['settings']->Code;
- $this->placeholders[$this->hhh . 'sviews' . $this->hhh]
- = $view['settings']->code;
- $this->placeholders[$this->hhh . 'SVIEWS' . $this->hhh]
- = $view['settings']->CODE;
- $this->placeholders[$this->bbb . 'SViews' . $this->ddd]
- = $view['settings']->Code;
- $this->placeholders[$this->bbb . 'sviews' . $this->ddd]
- = $view['settings']->code;
- $this->placeholders[$this->bbb . 'SVIEWS' . $this->ddd]
- = $view['settings']->CODE;
+ // set placeholders
+ CFactory::_('Placeholder')->set('SView', $view['settings']->Code);
+ CFactory::_('Placeholder')->set('sview', $view['settings']->code);
+ CFactory::_('Placeholder')->set('SVIEW', $view['settings']->CODE);
+ CFactory::_('Placeholder')->set('SViews', $view['settings']->Code);
+ CFactory::_('Placeholder')->set('sviews', $view['settings']->code);
+ CFactory::_('Placeholder')->set('SVIEWS', $view['settings']->CODE);
+
+ // for plugin event TODO change event api signatures
+ $placeholders = CFactory::_('Placeholder')->active;
+ $fileContentStatic = CFactory::_('Compiler.Builder.Content.One')->allActive();
+ $fileContentDynamic = CFactory::_('Compiler.Builder.Content.Multi')->allActive();
// Trigger Event: jcb_ce_onBeforeBuildSiteViewContent
- $this->triggerEvent(
+ CFactory::_('Event')->trigger(
'jcb_ce_onBeforeBuildSiteViewContent',
- array(&$this->componentContext, &$view,
+ array(&$component_context, &$view,
&$view['settings']->code,
- &$this->fileContentStatic,
- &$this->fileContentDynamic[$view['settings']->code],
- &$this->placeholders, &$this->hhh)
+ &$fileContentStatic,
+ &$fileContentDynamic[$view['settings']->code],
+ &$placeholders, &$this->hhh)
);
+ unset($fileContentStatic);
+ unset($fileContentDynamic);
+ unset($placeholders);
// set license per view if needed
$this->setLockLicensePer(
- $view['settings']->code, $this->target
+ $view['settings']->code, CFactory::_('Config')->build_target
);
// set the site default view
if (isset($view['default_view'])
&& $view['default_view'] == 1)
{
- $this->fileContentStatic[$this->hhh
- . 'SITE_DEFAULT_VIEW' . $this->hhh]
- = $view['settings']->code;
+ CFactory::_('Compiler.Builder.Content.One')->set('SITE_DEFAULT_VIEW', $view['settings']->code);
}
// add site menu
if (isset($view['menu']) && $view['menu'] == 1)
{
// SITE_MENU_XML <<>>
- $this->fileContentDynamic[$view['settings']->code][$this->hhh
- . 'SITE_MENU_XML' . $this->hhh]
- = $this->setCustomViewMenu($view);
+ CFactory::_('Compiler.Builder.Content.Multi')->set($view['settings']->code . '|SITE_MENU_XML', $this->setCustomViewMenu($view));
}
// insure the needed route helper is loaded
- $this->fileContentStatic[$this->hhh . 'ROUTEHELPER'
- . $this->hhh]
- .= $this->setRouterHelp(
+ CFactory::_('Compiler.Builder.Content.One')->add('ROUTEHELPER',
+ $this->setRouterHelp(
$view['settings']->code, $view['settings']->code, true
- );
+ ));
// build route details
- $this->fileContentStatic[$this->hhh . 'ROUTER_PARSE_SWITCH'
- . $this->hhh]
- .= $this->routerParseSwitch(
+ CFactory::_('Compiler.Builder.Content.One')->add('ROUTER_PARSE_SWITCH',
+ $this->routerParseSwitch(
$view['settings']->code, $view
- );
- $this->fileContentStatic[$this->hhh . 'ROUTER_BUILD_VIEWS'
- . $this->hhh]
- .= $this->routerBuildViews($view['settings']->code);
+ ));
+ CFactory::_('Compiler.Builder.Content.One')->add('ROUTER_BUILD_VIEWS', $this->routerBuildViews($view['settings']->code));
if ($view['settings']->main_get->gettype == 1)
{
// set user permission access check USER_PERMISSION_CHECK_ACCESS <<>>
- $this->fileContentDynamic[$view['settings']->code][$this->hhh
- . 'USER_PERMISSION_CHECK_ACCESS' . $this->hhh]
- = $this->setUserPermissionCheckAccess($view, 1);
+ CFactory::_('Compiler.Builder.Content.Multi')->set($view['settings']->code . '|USER_PERMISSION_CHECK_ACCESS', $this->setUserPermissionCheckAccess($view, 1));
// SITE_BEFORE_GET_ITEM <<>>
- $this->fileContentDynamic[$view['settings']->code][$this->hhh
- . 'SITE_BEFORE_GET_ITEM' . $this->hhh]
- = $this->getCustomScriptBuilder(
- $this->target . '_php_before_getitem',
+ CFactory::_('Compiler.Builder.Content.Multi')->set($view['settings']->code . '|SITE_BEFORE_GET_ITEM', CFactory::_('Customcode.Dispenser')->get(
+ CFactory::_('Config')->build_target . '_php_before_getitem',
$view['settings']->code, '', null, true
- );
+ ));
// SITE_GET_ITEM <<>>
- $this->fileContentDynamic[$view['settings']->code][$this->hhh
- . 'SITE_GET_ITEM' . $this->hhh]
- = $this->setCustomViewGetItem(
+ CFactory::_('Compiler.Builder.Content.Multi')->set($view['settings']->code . '|SITE_GET_ITEM', $this->setCustomViewGetItem(
$view['settings']->main_get,
- $view['settings']->code, $this->_t(2)
- );
+ $view['settings']->code, Indent::_(2)
+ ));
// SITE_AFTER_GET_ITEM <<>>
- $this->fileContentDynamic[$view['settings']->code][$this->hhh
- . 'SITE_AFTER_GET_ITEM' . $this->hhh]
- = $this->getCustomScriptBuilder(
- $this->target . '_php_after_getitem',
+ CFactory::_('Compiler.Builder.Content.Multi')->set($view['settings']->code . '|SITE_AFTER_GET_ITEM', CFactory::_('Customcode.Dispenser')->get(
+ CFactory::_('Config')->build_target . '_php_after_getitem',
$view['settings']->code, '', null, true
- );
+ ));
}
elseif ($view['settings']->main_get->gettype == 2)
{
// set user permission access check USER_PERMISSION_CHECK_ACCESS <<