Added the import method to custom import tab, and improved the import custom concept.

This commit is contained in:
Llewellyn van der Merwe 2016-05-05 00:14:20 +01:00
parent 0fd9d9d169
commit 32e3f6b86e
370 changed files with 1766 additions and 1684 deletions

View File

@ -1,4 +1,4 @@
# Component Builder (2.1.6) # Component Builder (2.1.7)
This is a [Joomla 3.x] (http://www.joomla.org/) component. This is a [Joomla 3.x] (http://www.joomla.org/) component.
@ -33,31 +33,31 @@ Would you require more help VDM.io has a number of support plans available [visi
+ *Name*: [Component Builder] (https://www.vdm.io/joomla-component-builder) + *Name*: [Component Builder] (https://www.vdm.io/joomla-component-builder)
+ *First Build*: 30th April, 2015 + *First Build*: 30th April, 2015
+ *Last Build*: 4th May, 2016 + *Last Build*: 4th May, 2016
+ *Version*: 2.1.6 + *Version*: 2.1.7
+ *Copyright*: Copyright (C) 2015. All Rights Reserved + *Copyright*: Copyright (C) 2015. All Rights Reserved
+ *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
## Build Time ## Build Time
**227 Hours** or **28 Eight Hour Days** (actual time the author saved - **228 Hours** or **29 Eight Hour Days** (actual time the author saved -
due to [Automated Component Builder] (https://www.vdm.io/joomla-component-builder)) due to [Automated Component Builder] (https://www.vdm.io/joomla-component-builder))
> (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**, > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**,
> never making one mistake or taking any coffee break.) > never making one mistake or taking any coffee break.)
+ *Line count*: **81589** + *Line count*: **81816**
+ *File count*: **499** + *File count*: **500**
+ *Folder count*: **98** + *Folder count*: **98**
**150 Hours** or **19 Eight Hour Days** (the actual time the author spent) **151 Hours** or **18 Eight Hour Days** (the actual time the author spent)
> (with the following break down: > (with the following break down:
> **debugging @57hours** = codingtime / 4; > **debugging @57hours** = codingtime / 4;
> **planning @32hours** = codingtime / 7; > **planning @33hours** = codingtime / 7;
> **mapping @23hours** = codingtime / 10; > **mapping @23hours** = codingtime / 10;
> **office @38hours** = codingtime / 6;) > **office @38hours** = codingtime / 6;)
**377 Hours** or **47 Eight Hour Days** **379 Hours** or **47 Eight Hour Days**
(a total of the realistic time frame for this project) (a total of the realistic time frame for this project)
> (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**, > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**,

View File

@ -9,7 +9,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -9,7 +9,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -9,7 +9,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -9,7 +9,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -9,7 +9,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -9,7 +9,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -9,7 +9,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -9,7 +9,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -9,7 +9,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -9,7 +9,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -9,7 +9,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -9,7 +9,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -9,7 +9,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -9,7 +9,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -9,7 +9,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -9,7 +9,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -9,7 +9,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -9,7 +9,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -9,7 +9,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -9,7 +9,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -9,7 +9,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -9,7 +9,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -9,7 +9,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -9,7 +9,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -55,7 +55,7 @@ class ###Component###ModelImport extends JModelLegacy
* Import Settings * Import Settings
*/ */
protected $getType = NULL; protected $getType = NULL;
protected $dataType = NULL; protected $dataType = NULL;
/** /**
* Method to auto-populate the model state. * Method to auto-populate the model state.

View File

@ -55,7 +55,7 @@ class ###Component###Model###View### extends JModelLegacy
* Import Settings * Import Settings
*/ */
protected $getType = NULL; protected $getType = NULL;
protected $dataType = NULL; protected $dataType = NULL;
/** /**
* Method to auto-populate the model state. * Method to auto-populate the model state.
@ -81,117 +81,7 @@ class ###Component###Model###View### extends JModelLegacy
$this->safeFileOptions = array(); $this->safeFileOptions = array();
parent::populateState(); parent::populateState();
} }
###IMPORT_METHOD_CUSTOM###
/**
* Import an spreadsheet from either folder, url or upload.
*
* @return boolean result of import
*
*/
public function import()
{
$this->setState('action', 'import');
$app = JFactory::getApplication();
$session = JFactory::getSession();
$package = null;
$continue = false;
// get import type
$this->getType = $app->input->getString('gettype', NULL);
// get import type
$this->dataType = $session->get('dataType_VDM_IMPORTINTO', NULL);
if ($package === null)
{
switch ($this->getType)
{
case 'folder':
// Remember the 'Import from Directory' path.
$app->getUserStateFromRequest($this->_context . '.import_directory', 'import_directory');
$package = $this->_getPackageFromFolder();
break;
case 'upload':
$package = $this->_getPackageFromUpload();
break;
case 'url':
$package = $this->_getPackageFromUrl();
break;
case 'continue':
$continue = true;
$package = $session->get('package', null);
$package = json_decode($package, true);
// clear session
$session->clear('package');
$session->clear('dataType');
$session->clear('hasPackage');
break;
default:
$app->setUserState('com_###component###.message', JText::_('COM_###COMPONENT###_IMPORT_NO_IMPORT_TYPE_FOUND'));
return false;
break;
}
}
// Was the package valid?
if (!$package || !$package['type'])
{
if (in_array($this->getType, array('upload', 'url')))
{
$this->remove($package['packagename']);
}
$app->setUserState('com_###component###.message', JText::_('COM_###COMPONENT###_IMPORT_UNABLE_TO_FIND_IMPORT_PACKAGE'));
return false;
}
// first link data to table headers
if(!$continue){
$package = json_encode($package);
$session->set('package', $package);
$session->set('dataType', $this->dataType);
$session->set('hasPackage', true);
return true;
}
// set the data
$headerList = json_decode($session->get($this->dataType.'_VDM_IMPORTHEADERS', false), true);
if (!$this->setData($package,$this->dataType,$headerList))
{
// There was an error importing the package
$msg = JText::_('COM_###COMPONENT###_IMPORT_ERROR');
$back = $session->get('backto_VDM_IMPORT', NULL);
if ($back)
{
$app->setUserState('com_###component###.redirect_url', 'index.php?option=com_###component###&view='.$back);
$session->clear('backto_VDM_IMPORT');
}
$result = false;
}
else
{
// Package imported sucessfully
$msg = JText::sprintf('COM_###COMPONENT###_IMPORT_SUCCESS', $package['packagename']);
$back = $session->get('backto_VDM_IMPORT', NULL);
if ($back)
{
$app->setUserState('com_###component###.redirect_url', 'index.php?option=com_###component###&view='.$back);
$session->clear('backto_VDM_IMPORT');
}
$result = true;
}
// Set some model state values
$app->enqueueMessage($msg);
// remove file after import
$this->remove($package['packagename']);
$session->clear($this->getType.'_VDM_IMPORTHEADERS');
return $result;
}
/** /**
* Works out an importation spreadsheet from a HTTP upload * Works out an importation spreadsheet from a HTTP upload
@ -406,30 +296,8 @@ class ###Component###Model###View### extends JModelLegacy
JFile::delete(JPath::clean($package)); JFile::delete(JPath::clean($package));
} }
} }
###IMPORT_SETDATE_METHOD_CUSTOM###
/** ###IMPORT_SAVE_METHOD_CUSTOM###
* Set the data from the spreadsheet to the database
*
* @param string $package Paths to the uploaded package file
*
* @return boolean false on failure
*
**/
protected function setData($package,$table,$target_headers)
{###IMPORT_SETDATE_METOD_CUSTOM###
}
/**
* Save the data from the file to the database
*
* @param string $package Paths to the uploaded package file
*
* @return boolean false on failure
*
**/
protected function save($data,$table)
{###IMPORT_SAVE_METOD_CUSTOM###
}
protected function getAlias($name,$type = false) protected function getAlias($name,$type = false)
{ {

View File

@ -34,8 +34,7 @@ JHtml::_('bootstrap.tooltip');
JHtml::_('script', 'system/core.js', false, true); JHtml::_('script', 'system/core.js', false, true);
?> ?>
<script type="text/javascript"> <script type="text/javascript">
<?php if ($this->hasPackage && ###Component###Helper::checkArray($this->headerList)) : ?>
<?php if ($this->hasPackage && ###Component###Helper::checkArray($this->headerList)) : ?>
Joomla.continueImport = function() Joomla.continueImport = function()
{ {
var form = document.getElementById('adminForm'); var form = document.getElementById('adminForm');
@ -62,7 +61,7 @@ JHtml::_('script', 'system/core.js', false, true);
form.submit(); form.submit();
} }
}; };
<?php else: ?> <?php else: ?>
Joomla.submitbutton = function() Joomla.submitbutton = function()
{ {
var form = document.getElementById('adminForm'); var form = document.getElementById('adminForm');
@ -115,25 +114,25 @@ JHtml::_('script', 'system/core.js', false, true);
form.submit(); form.submit();
} }
}; };
<?php endif; ?> <?php endif; ?>
// Add spindle-wheel for importations: // Add spindle-wheel for importations:
jQuery(document).ready(function($) { jQuery(document).ready(function($) {
var outerDiv = $('body'); var outerDiv = $('body');
$('<div id="loading"></div>') $('<div id="loading"></div>')
.css("background", "rgba(255, 255, 255, .8) url('components/com_###component###/assets/images/import.gif') 50% 15% no-repeat") .css("background", "rgba(255, 255, 255, .8) url('components/com_###component###/assets/images/import.gif') 50% 15% no-repeat")
.css("top", outerDiv.position().top - $(window).scrollTop()) .css("top", outerDiv.position().top - $(window).scrollTop())
.css("left", outerDiv.position().left - $(window).scrollLeft()) .css("left", outerDiv.position().left - $(window).scrollLeft())
.css("width", outerDiv.width()) .css("width", outerDiv.width())
.css("height", outerDiv.height()) .css("height", outerDiv.height())
.css("position", "fixed") .css("position", "fixed")
.css("opacity", "0.80") .css("opacity", "0.80")
.css("-ms-filter", "progid:DXImageTransform.Microsoft.Alpha(Opacity = 80)") .css("-ms-filter", "progid:DXImageTransform.Microsoft.Alpha(Opacity = 80)")
.css("filter", "alpha(opacity = 80)") .css("filter", "alpha(opacity = 80)")
.css("display", "none") .css("display", "none")
.appendTo(outerDiv); .appendTo(outerDiv);
}); });
</script> </script>
@ -148,89 +147,87 @@ JHtml::_('script', 'system/core.js', false, true);
<?php else : ?> <?php else : ?>
<div id="j-main-container"> <div id="j-main-container">
<?php endif;?> <?php endif;?>
<?php if ($this->hasPackage && ###Component###Helper::checkArray($this->headerList) && ###Component###Helper::checkArray($this->headers)) : ?> <?php if ($this->hasPackage && ###Component###Helper::checkArray($this->headerList) && ###Component###Helper::checkArray($this->headers)) : ?>
<fieldset class="uploadform"> <fieldset class="uploadform">
<legend><?php echo JText::_('COM_###COMPONENT###_IMPORT_LINK_FILE_TO_TABLE_COLUMNS'); ?></legend> <legend><?php echo JText::_('COM_###COMPONENT###_IMPORT_LINK_FILE_TO_TABLE_COLUMNS'); ?></legend>
<div class="control-group"> <div class="control-group">
<label class="control-label" ><h4><?php echo JText::_('COM_###COMPONENT###_IMPORT_TABLE_COLUMNS'); ?></h4></label> <label class="control-label" ><h4><?php echo JText::_('COM_###COMPONENT###_IMPORT_TABLE_COLUMNS'); ?></h4></label>
<div class="controls"> <div class="controls">
<label class="control-label" ><h4><?php echo JText::_('COM_###COMPONENT###_IMPORT_FILE_COLUMNS'); ?></h4></label> <label class="control-label" ><h4><?php echo JText::_('COM_###COMPONENT###_IMPORT_FILE_COLUMNS'); ?></h4></label>
</div> </div>
</div> </div>
<?php foreach($this->headerList as $name => $title): ?> <?php foreach($this->headerList as $name => $title): ?>
<div class="control-group"> <div class="control-group">
<label for="<?php echo $name; ?>" class="control-label" ><?php echo $title; ?></label> <label for="<?php echo $name; ?>" class="control-label" ><?php echo $title; ?></label>
<div class="controls"> <div class="controls">
<select name="<?php echo $name; ?>" id="vdm_<?php echo $name; ?>" required class="required input_box" > <select name="<?php echo $name; ?>" id="vdm_<?php echo $name; ?>" required class="required input_box" >
<option value=""><?php echo JText::_('COM_###COMPONENT###_IMPORT_PLEASE_SELECT_COLUMN'); ?></option> <option value=""><?php echo JText::_('COM_###COMPONENT###_IMPORT_PLEASE_SELECT_COLUMN'); ?></option>
<option value="IGNORE"><?php echo JText::_('COM_###COMPONENT###_IMPORT_IGNORE_COLUMN'); ?></option> <option value="IGNORE"><?php echo JText::_('COM_###COMPONENT###_IMPORT_IGNORE_COLUMN'); ?></option>
<?php foreach($this->headers as $value => $option): ?> <?php foreach($this->headers as $value => $option): ?>
<?php $selected = (strtolower($option) == strtolower ($title) || strtolower($option) == strtolower($name))? 'selected="selected"':''; ?> <?php $selected = (strtolower($option) == strtolower ($title) || strtolower($option) == strtolower($name))? 'selected="selected"':''; ?>
<option value="<?php echo ###Component###Helper::htmlEscape($value); ?>" class="required" <?php echo $selected ?>><?php echo ###Component###Helper::htmlEscape($option); ?></option> <option value="<?php echo ###Component###Helper::htmlEscape($value); ?>" class="required" <?php echo $selected ?>><?php echo ###Component###Helper::htmlEscape($option); ?></option>
<?php endforeach; ?> <?php endforeach; ?>
</select> </select>
</div> </div>
</div> </div>
<?php endforeach; ?> <?php endforeach; ?>
<div class="form-actions"> <div class="form-actions">
<input class="btn btn-primary" type="button" value="<?php echo JText::_('COM_###COMPONENT###_IMPORT_CONTINUE'); ?>" onclick="Joomla.continueImport()" /> <input class="btn btn-primary" type="button" value="<?php echo JText::_('COM_###COMPONENT###_IMPORT_CONTINUE'); ?>" onclick="Joomla.continueImport()" />
</div> </div>
</fieldset> </fieldset>
<input type="hidden" name="gettype" value="continue" /> <input type="hidden" name="gettype" value="continue" />
<?php else: ?> <?php else: ?>
<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'upload')); ?> <?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'upload')); ?>
<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'upload', JText::_('COM_###COMPONENT###_IMPORT_FROM_UPLOAD', true)); ?> <?php echo JHtml::_('bootstrap.addTab', 'myTab', 'upload', JText::_('COM_###COMPONENT###_IMPORT_FROM_UPLOAD', true)); ?>
<fieldset class="uploadform"> <fieldset class="uploadform">
<legend><?php echo JText::_('COM_###COMPONENT###_IMPORT_UPDATE_DATA'); ?></legend> <legend><?php echo JText::_('COM_###COMPONENT###_IMPORT_UPDATE_DATA'); ?></legend>
<div class="control-group"> <div class="control-group">
<label for="import_package" class="control-label"><?php echo JText::_('COM_###COMPONENT###_IMPORT_SELECT_FILE'); ?></label> <label for="import_package" class="control-label"><?php echo JText::_('COM_###COMPONENT###_IMPORT_SELECT_FILE'); ?></label>
<div class="controls"> <div class="controls">
<input class="input_box" id="import_package" name="import_package" type="file" size="57" /> <input class="input_box" id="import_package" name="import_package" type="file" size="57" />
</div> </div>
</div> </div>
<div class="form-actions"> <div class="form-actions">
<input class="btn btn-primary" type="button" value="<?php echo JText::_('COM_###COMPONENT###_IMPORT_UPLOAD_BOTTON'); ?>" onclick="Joomla.submitbutton()" />&nbsp;&nbsp;&nbsp;<small><?php echo JText::_('COM_###COMPONENT###_IMPORT_FORMATS_ACCEPTED'); ?> (.csv .xls .ods)</small> <input class="btn btn-primary" type="button" value="<?php echo JText::_('COM_###COMPONENT###_IMPORT_UPLOAD_BOTTON'); ?>" onclick="Joomla.submitbutton()" />&nbsp;&nbsp;&nbsp;<small><?php echo JText::_('COM_###COMPONENT###_IMPORT_FORMATS_ACCEPTED'); ?> (.csv .xls .ods)</small>
</div> </div>
</fieldset> </fieldset>
<?php echo JHtml::_('bootstrap.endTab'); ?> <?php echo JHtml::_('bootstrap.endTab'); ?>
<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'directory', JText::_('COM_###COMPONENT###_IMPORT_FROM_DIRECTORY', true)); ?> <?php echo JHtml::_('bootstrap.addTab', 'myTab', 'directory', JText::_('COM_###COMPONENT###_IMPORT_FROM_DIRECTORY', true)); ?>
<fieldset class="uploadform"> <fieldset class="uploadform">
<legend><?php echo JText::_('COM_###COMPONENT###_IMPORT_UPDATE_DATA'); ?></legend> <legend><?php echo JText::_('COM_###COMPONENT###_IMPORT_UPDATE_DATA'); ?></legend>
<div class="control-group"> <div class="control-group">
<label for="import_directory" class="control-label"><?php echo JText::_('COM_###COMPONENT###_IMPORT_SELECT_FILE_DIRECTORY'); ?></label> <label for="import_directory" class="control-label"><?php echo JText::_('COM_###COMPONENT###_IMPORT_SELECT_FILE_DIRECTORY'); ?></label>
<div class="controls"> <div class="controls">
<input type="text" id="import_directory" name="import_directory" class="span5 input_box" size="70" value="<?php echo $this->state->get('import.directory'); ?>" /> <input type="text" id="import_directory" name="import_directory" class="span5 input_box" size="70" value="<?php echo $this->state->get('import.directory'); ?>" />
</div> </div>
</div> </div>
<div class="form-actions"> <div class="form-actions">
<input type="button" class="btn btn-primary" value="<?php echo JText::_('COM_###COMPONENT###_IMPORT_GET_BOTTON'); ?>" onclick="Joomla.submitbutton3()" />&nbsp;&nbsp;&nbsp;<small><?php echo JText::_('COM_###COMPONENT###_IMPORT_FORMATS_ACCEPTED'); ?> (.csv .xls .ods)</small> <input type="button" class="btn btn-primary" value="<?php echo JText::_('COM_###COMPONENT###_IMPORT_GET_BOTTON'); ?>" onclick="Joomla.submitbutton3()" />&nbsp;&nbsp;&nbsp;<small><?php echo JText::_('COM_###COMPONENT###_IMPORT_FORMATS_ACCEPTED'); ?> (.csv .xls .ods)</small>
</div> </div>
</fieldset> </fieldset>
<?php echo JHtml::_('bootstrap.endTab'); ?> <?php echo JHtml::_('bootstrap.endTab'); ?>
<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'url', JText::_('COM_###COMPONENT###_IMPORT_FROM_URL', true)); ?> <?php echo JHtml::_('bootstrap.addTab', 'myTab', 'url', JText::_('COM_###COMPONENT###_IMPORT_FROM_URL', true)); ?>
<fieldset class="uploadform"> <fieldset class="uploadform">
<legend><?php echo JText::_('COM_###COMPONENT###_IMPORT_UPDATE_DATA'); ?></legend> <legend><?php echo JText::_('COM_###COMPONENT###_IMPORT_UPDATE_DATA'); ?></legend>
<div class="control-group"> <div class="control-group">
<label for="import_url" class="control-label"><?php echo JText::_('COM_###COMPONENT###_IMPORT_SELECT_FILE_URL'); ?></label> <label for="import_url" class="control-label"><?php echo JText::_('COM_###COMPONENT###_IMPORT_SELECT_FILE_URL'); ?></label>
<div class="controls"> <div class="controls">
<input type="text" id="import_url" name="import_url" class="span5 input_box" size="70" value="http://" /> <input type="text" id="import_url" name="import_url" class="span5 input_box" size="70" value="http://" />
</div> </div>
</div> </div>
<div class="form-actions"> <div class="form-actions">
<input type="button" class="btn btn-primary" value="<?php echo JText::_('COM_###COMPONENT###_IMPORT_GET_BOTTON'); ?>" onclick="Joomla.submitbutton4()" />&nbsp;&nbsp;&nbsp;<small><?php echo JText::_('COM_###COMPONENT###_IMPORT_FORMATS_ACCEPTED'); ?> (.csv .xls .ods)</small> <input type="button" class="btn btn-primary" value="<?php echo JText::_('COM_###COMPONENT###_IMPORT_GET_BOTTON'); ?>" onclick="Joomla.submitbutton4()" />&nbsp;&nbsp;&nbsp;<small><?php echo JText::_('COM_###COMPONENT###_IMPORT_FORMATS_ACCEPTED'); ?> (.csv .xls .ods)</small>
</div> </div>
</fieldset> </fieldset>
<?php echo JHtml::_('bootstrap.endTab'); ?>
<?php echo JHtml::_('bootstrap.endTab'); ?> <?php echo JHtml::_('bootstrap.endTabSet'); ?>
<?php echo JHtml::_('bootstrap.endTabSet'); ?>
<input type="hidden" name="gettype" value="upload" /> <input type="hidden" name="gettype" value="upload" />
<?php endif; ?> <?php endif; ?>
<input type="hidden" name="task" value="import.import" /> <input type="hidden" name="task" value="import.import" />
<?php echo JHtml::_('form.token'); ?> <?php echo JHtml::_('form.token'); ?>
</form> </form>
</div> </div>

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -1089,7 +1089,7 @@ class Get
// set custom import scripts // set custom import scripts
if (isset($view->add_custom_import) && $view->add_custom_import == 1) if (isset($view->add_custom_import) && $view->add_custom_import == 1)
{ {
$addImportArray = array('php_import_setdata','php_import_save','html_import_view'); $addImportArray = array('php_import','php_import_setdata','php_import_save','html_import_view');
foreach ($addImportArray as $importScripter) foreach ($addImportArray as $importScripter)
{ {
if (isset($view->$importScripter) && strlen($view->$importScripter) > 0) if (isset($view->$importScripter) && strlen($view->$importScripter) > 0)

View File

@ -6904,14 +6904,20 @@ class Interpretation extends Fields
// load the custom script to the files // load the custom script to the files
if (isset($this->customScriptBuilder['php_import_setdata']['import_'.$viewName_list])) if (isset($this->customScriptBuilder['php_import_setdata']['import_'.$viewName_list]))
{ {
// ###IMPORT_SETDATE_METOD_CUSTOM### <<<DYNAMIC>>> // ###IMPORT_SETDATE_METHOD_CUSTOM### <<<DYNAMIC>>>
$this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_SETDATE_METOD_CUSTOM###'] = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_import_setdata']['import_'.$viewName_list]); $this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_SETDATE_METHOD_CUSTOM###'] = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_import_setdata']['import_'.$viewName_list]);
unset($this->customScriptBuilder['php_import_setdata']['import_'.$viewName_list]); unset($this->customScriptBuilder['php_import_setdata']['import_'.$viewName_list]);
} }
if (isset($this->customScriptBuilder['php_import']['import_'.$viewName_list]))
{
// ###IMPORT_METHOD_CUSTOM### <<<DYNAMIC>>>
$this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_METHOD_CUSTOM###'] = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_import']['import_'.$viewName_list]);
unset($this->customScriptBuilder['php_import']['import_'.$viewName_list]);
}
if (isset($this->customScriptBuilder['php_import_save']['import_'.$viewName_list])) if (isset($this->customScriptBuilder['php_import_save']['import_'.$viewName_list]))
{ {
// ###IMPORT_SAVE_METOD_CUSTOM### <<<DYNAMIC>>> // ###IMPORT_SAVE_METHOD_CUSTOM### <<<DYNAMIC>>>
$this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_SAVE_METOD_CUSTOM###'] = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_import_save']['import_'.$viewName_list]); $this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_SAVE_METHOD_CUSTOM###'] = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_import_save']['import_'.$viewName_list]);
unset($this->customScriptBuilder['php_import_save']['import_'.$viewName_list]); unset($this->customScriptBuilder['php_import_save']['import_'.$viewName_list]);
} }
if (isset($this->customScriptBuilder['html_import_view']['import_'.$viewName_list])) if (isset($this->customScriptBuilder['html_import_view']['import_'.$viewName_list]))

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -314,6 +314,10 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETLISTQUERY="Php Getlistquery"
COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETLISTQUERY_DESCRIPTION="Add your PHP here! [Do not add the php tags]" COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETLISTQUERY_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETLISTQUERY_HINT="// PHP Here that should run in the getlistquery Method (to add custom filtering)" COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETLISTQUERY_HINT="// PHP Here that should run in the getlistquery Method (to add custom filtering)"
COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETLISTQUERY_LABEL="PHP" COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETLISTQUERY_LABEL="PHP"
COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT="Php Import"
COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HINT="// PHP Here that should run in the import Method."
COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_LABEL="Import Method PHP"
COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE="Php Import Save" COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE="Php Import Save"
COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE_DESCRIPTION="Add your PHP here! [Do not add the php tags]" COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE_HINT="// PHP Here that should run in the save Method, $data, $table" COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE_HINT="// PHP Here that should run in the save Method, $data, $table"

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@ -36,7 +36,8 @@ $fields = $displayData->get('fields') ?: array(
'add_custom_import', 'add_custom_import',
'html_import_view', 'html_import_view',
'php_import_setdata', 'php_import_setdata',
'php_import_save' 'php_import_save',
'php_import'
); );
?> ?>

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@ -29,7 +29,7 @@
defined('_JEXEC') or die('Restricted access'); defined('_JEXEC') or die('Restricted access');
// set the defaults // set the defaults
$items = $displayData->vxdfields; $items = $displayData->vxefields;
$user = JFactory::getUser(); $user = JFactory::getUser();
$id = $displayData->item->id; $id = $displayData->item->id;
$edit = "index.php?option=com_componentbuilder&view=fields&task=field.edit"; $edit = "index.php?option=com_componentbuilder&view=fields&task=field.edit";

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

View File

@ -10,7 +10,7 @@
|_| |_|
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.6 @version 2.1.7
@build 4th May, 2016 @build 4th May, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder

Some files were not shown because too many files have changed in this diff Show More