diff --git a/admin/helpers/compiler/c_Fields.php b/admin/helpers/compiler/c_Fields.php
index 45e01d1bf..875da7395 100644
--- a/admin/helpers/compiler/c_Fields.php
+++ b/admin/helpers/compiler/c_Fields.php
@@ -34,352 +34,351 @@ class Fields extends Structure
{
/**
* Metadate Switch
- *
+ *
* @var array
*/
-
public $metadataBuilder = array();
/**
* View access Switch
- *
+ *
* @var array
*/
public $accessBuilder = array();
-
+
/**
* edit view tabs counter
- *
+ *
* @var array
*/
public $tabCounter = array();
-
+
/**
* layout builder
- *
+ *
* @var array
*/
public $layoutBuilder = array();
-
+
/**
* used to fix the zero order
- *
+ *
* @var array
*/
private $zeroOrderFix = array();
-
+
/**
* Site field data
- *
+ *
* @var array
*/
public $siteFieldData = array();
-
+
/**
* Category other name bucket
- *
+ *
* @var array
*/
public $catOtherName = array();
-
+
/**
* list of fields that are not being escaped
- *
+ *
* @var array
*/
public $doNotEscape = array();
-
+
/**
* tags builder
- *
+ *
* @var array
*/
public $tagsBuilder = array();
-
+
/**
* query builder
- *
+ *
* @var array
*/
public $queryBuilder = array();
-
+
/**
* unique keys for database field
- *
+ *
* @var array
*/
public $dbUniqueKeys = array();
-
+
/**
* keys for database field
- *
+ *
* @var array
*/
public $dbKeys = array();
-
+
/**
* history builder
- *
+ *
* @var array
*/
public $historyBuilder = array();
-
+
/**
* alias builder
- *
+ *
* @var array
*/
public $aliasBuilder = array();
-
+
/**
* title builder
- *
+ *
* @var array
*/
public $titleBuilder = array();
-
+
/**
* list builder
- *
+ *
* @var array
*/
public $listBuilder = array();
-
+
/**
* custom Builder List
- *
+ *
* @var array
*/
public $customBuilderList = array();
-
+
/**
* Hidden Fields Builder
- *
+ *
* @var array
*/
public $hiddenFieldsBuilder = array();
-
+
/**
* INT Field Builder
- *
+ *
* @var array
*/
public $intFieldsBuilder = array();
-
+
/**
* Dynamic Fields Builder
- *
+ *
* @var array
*/
public $dynamicfieldsBuilder = array();
-
+
/**
* Main text Builder
- *
+ *
* @var array
*/
public $maintextBuilder = array();
-
+
/**
* Custom Builder
- *
+ *
* @var array
*/
public $customBuilder = array();
-
+
/**
* Custom Field Links Builder
- *
+ *
* @var array
*/
public $customFieldLinksBuilder = array();
-
+
/**
* Set Script for User Switch
- *
+ *
* @var array
*/
public $setScriptUserSwitch = array();
-
+
/**
* Set Script for Media Switch
- *
+ *
* @var array
*/
public $setScriptMediaSwitch = array();
-
+
/**
* Category builder
- *
+ *
* @var array
*/
public $categoryBuilder = array();
-
+
/**
* Category Code builder
- *
+ *
* @var array
*/
public $catCodeBuilder = array();
-
+
/**
* Check Box builder
- *
+ *
* @var array
*/
public $checkboxBuilder = array();
-
+
/**
* Json String Builder
- *
+ *
* @var array
*/
public $jsonStringBuilder = array();
-
+
/**
* Json String Builder for return values to array
- *
+ *
* @var array
*/
public $jsonItemBuilderArray = array();
-
+
/**
* Json Item Builder
- *
+ *
* @var array
*/
public $jsonItemBuilder = array();
-
+
/**
* Base 64 Builder
- *
+ *
* @var array
*/
public $base64Builder = array();
-
+
/**
* Basic Encryption Builder
- *
+ *
* @var array
*/
public $basicEncryptionBuilder = array();
-
+
/**
* Advnaced Encryption Builder
- *
+ *
* @var array
*/
public $advancedEncryptionBuilder = array();
-
+
/**
* Get Items Method List String Fix Builder
- *
+ *
* @var array
*/
public $getItemsMethodListStringFixBuilder = array();
-
+
/**
* Get Items Method Eximport String Fix Builder
- *
+ *
* @var array
*/
public $getItemsMethodEximportStringFixBuilder = array();
-
+
/**
* Selection Translation Fix Builder
- *
+ *
* @var array
*/
- public $selectionTranslationFixBuilder = array();
-
+ public $selectionTranslationFixBuilder = array();
+
/**
* Sort Builder
- *
+ *
* @var array
*/
public $sortBuilder = array();
-
+
/**
* Search Builder
- *
+ *
* @var array
*/
public $searchBuilder = array();
-
+
/**
* Filter Builder
- *
+ *
* @var array
*/
public $filterBuilder = array();
-
+
/**
* Set Group Control
- *
+ *
* @var array
*/
public $setGroupControl = array();
-
+
/**
* Set Field Names
- *
+ *
* @var array
*/
- public $fieldsNames = array();
-
+ public $fieldsNames = array();
+
/**
* Set unique Names
- *
+ *
* @var array
*/
public $uniqueNames = array();
-
+
/**
* Default Fields
- *
+ *
* @var array
*/
public $defaultFields = array('created', 'created_by', 'modified', 'modified_by', 'published', 'ordering', 'access', 'version', 'hits', 'id');
-
+
/**
* Default Fields set to publishing
- *
+ *
* @var array
*/
public $newPublishingFields = array();
-
+
/**
* Default Fields set to publishing
- *
+ *
* @var array
*/
public $movedPublishingFields = array();
-
+
/**
* Set the line number in comments
- *
+ *
* @param int $nr The line number
- *
+ *
* @return void
- *
+ *
*/
private function setLine($nr)
{
if ($this->debugLinenr)
{
- return ' [Fields '.$nr.']';
+ return ' [Fields '.$nr.']';
}
return '';
}
/**
* set the Field set of a view
- *
+ *
* @param array $view The view data
* @param string $component The component name
*
* @return string The fields set in xml
- *
+ *
*/
public function setFieldSet($view, $component)
{
@@ -395,7 +394,7 @@ class Fields extends Structure
$this->placeholders['###View###'] = ucfirst($viewName);
$this->placeholders['[[[view]]]'] = $this->placeholders['###view###'];
$this->placeholders['[[[VIEW]]]'] = $this->placeholders['###VIEW###'];
- $this->placeholders['[[[View]]]'] = $this->placeholders['###View###'];
+ $this->placeholders['[[[View]]]'] = $this->placeholders['###View###'];
$this->placeholders['###views###'] = $listViewName;
$this->placeholders['###VIEWS###'] = strtoupper($listViewName);
$this->placeholders['###Views###'] = ucfirst($listViewName);
@@ -413,10 +412,11 @@ class Fields extends Structure
$this->accessBuilder[$viewName] = $viewName;
}
// set the read only
- $readOnly = "";
+ $readOnlyXML = array();
if ($view['settings']->type == 2)
{
- $readOnly = "\t\t\t" . 'readonly="true"' . PHP_EOL."\t\t\t" . 'disabled="true"';
+ $readOnlyXML['readonly'] = true;
+ $readOnlyXML['disabled'] = true;
}
// main lang prefix
$langView = $this->langPrefix . '_' . $this->placeholders['###VIEW###'];
@@ -460,7 +460,7 @@ class Fields extends Structure
$this->langContent[$this->lang][$langView . '_VERSION_LABEL'] = "Revision";
$this->langContent[$this->lang][$langView . '_VERSION_DESC'] = "A count of the number of times this " . $view['settings']->name_single . " has been revised.";
$this->langContent[$this->lang][$langView . '_SAVE_WARNING'] = "Alias already existed so a number was added at the end. You can re-edit the " . $view['settings']->name_single . " to customise the alias.";
-
+
// check if the same field is added multiple times
foreach ($view['settings']->fields as $field)
{
@@ -468,220 +468,277 @@ class Fields extends Structure
$this->setUniqueNameKeeper($field, $view['settings']->type, $name, $viewName);
}
// start adding dynamc fields
- $dynamcfields = '';
+ $dynamicFieldsXML = array();
$spacerCounter = 'a';
// set the custom table key
$dbkey = 'g';
// TODO we should add the global and local view switch if field for front end
foreach ($view['settings']->fields as $field)
{
- $dynamcfields .= $this->setDynamicField($field, $view, $view['settings']->type, $langView, $viewName, $listViewName, $spacerCounter, $this->placeholders, $dbkey, true);
+ $dynamicFieldsXML[] = $this->setDynamicField($field, $view, $view['settings']->type, $langView, $viewName, $listViewName, $spacerCounter, $this->placeholders, $dbkey, true);
}
- // set the defautl fields
- $fieldSet = array();
- $fieldSet[] = '";
// check if metadata is added to this view
if (isset($this->metadataBuilder[$viewName]) && ComponentbuilderHelper::checkString($this->metadataBuilder[$viewName]))
{
- $fieldSet[] = PHP_EOL."\t";
- $fieldSet[] = "\t';
- $fieldSet[] = "\t\t" . '