joomla/Component-Builder
39
25
Fork 12
Code Issues 78 Pull Requests 2 Projects 4 Wiki Activity

added feature to remove site folder if not needed, also some linked to component tabs to fields, admin views, site views, and custom admin views

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2017-01-20 02:16:50 +02:00
parent b02771762d
commit ea2b2ea4c4
397 changed files with 1433 additions and 2596 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
admin/helpers/compiler.php
View File

@ -68,6 +68,19 @@ class Compiler extends Infusion
{
$this->gitPath = $this->params->get('git_folder_path', null);
}
// remove site folder
if ($this->removeSiteFolder)
{
// first remove the files and folders
$this->removeFolder($this->componentPath . '/site');
// clear form component xml
$xmlPath = $this->componentPath . '/'. $this->fileContentStatic['###component###']. '.xml';
$componentXML = JFile::read($xmlPath);
$textToSite = ComponentbuilderHelper::getBetween($componentXML,'<files folder="site">','</files>');
$textToSiteLang = ComponentbuilderHelper::getBetween($componentXML,'<languages folder="site">','</languages>');
$componentXML = str_replace(array('<files folder="site">'.$textToSite."</files>", '<languages folder="site">'.$textToSiteLang."</languages>"), array('',''), $componentXML);
$this->writeFile($xmlPath,$componentXML);
}
// now update the files
if ($this->updateFiles())
{

30
admin/helpers/compiler/e_Interpretation.php
View File

@ -957,14 +957,10 @@ class Interpretation extends Fields
$method[] = "\t\t\t\$password = self::randomkey(8);";
$method[] = "\t\t\t\$password2 = \$password;";
$method[] = "\t\t}";
$method[] = "\t\t//".$this->setLine(__LINE__)." set username";
$method[] = "\t\tif (isset(\$new['username']) && self::checkString(\$new['username']))";
$method[] = "\t\t//".$this->setLine(__LINE__)." set username if not set";
$method[] = "\t\tif (!isset(\$new['username']) || !self::checkString(\$new['username']))";
$method[] = "\t\t{";
$method[] = "\t\t\t\$new['username'] = self::safeString(\$new['username']);";
$method[] = "\t\t}";
$method[] = "\t\telse";
$method[] = "\t\t{";
$method[] = "\t\t\t\$new['username'] = self::safeString(\$new['name']);\t\t\t";
$method[] = "\t\t\t\$new['username'] = self::safeString(\$new['name']);";
$method[] = "\t\t}";
$method[] = "\t\t//".$this->setLine(__LINE__)." linup new user data";
$method[] = "\t\t\$data = array(";
@ -6854,6 +6850,11 @@ class Interpretation extends Fields
$query .= "\n\t\t\t\t\t{";
$query .= "\n\t\t\t\t\t\t\$item->".$target." = json_decode(\$item->".$target.");";
$query .= "\n\t\t\t\t\t}";
$query .= "\n\t\t\t\t\telse";
$query .= "\n\t\t\t\t\t{";
$query .= "\n\t\t\t\t\t\tunset(\$items[\$nr]);";
$query .= "\n\t\t\t\t\t\tcontinue;";
$query .= "\n\t\t\t\t\t}";
$query .= "\n\t\t\t\t\tif (!in_array(\$".$globalKey.",\$item->".$target."))";
}
else
@ -6862,6 +6863,11 @@ class Interpretation extends Fields
$query .= "\n\t\t\t\t\t{";
$query .= "\n\t\t\t\t\t\t\$item->".$_key." = json_decode(\$item->".$_key.");";
$query .= "\n\t\t\t\t\t}";
$query .= "\n\t\t\t\t\telse";
$query .= "\n\t\t\t\t\t{";
$query .= "\n\t\t\t\t\t\tunset(\$items[\$nr]);";
$query .= "\n\t\t\t\t\t\tcontinue;";
$query .= "\n\t\t\t\t\t}";
$query .= "\n\t\t\t\t\tif (!in_array(\$".$globalKey.",\$item->".$_key."))";
}
$query .= "\n\t\t\t\t\t{";
@ -6894,6 +6900,11 @@ class Interpretation extends Fields
$query .= "\n\t\t\t\t\t\t\tcontinue;";
$query .= "\n\t\t\t\t\t\t}";
$query .= "\n\t\t\t\t\t}";
$query .= "\n\t\t\t\t\telse";
$query .= "\n\t\t\t\t\t{";
$query .= "\n\t\t\t\t\t\tunset(\$items[\$nr]);";
$query .= "\n\t\t\t\t\t\tcontinue;";
$query .= "\n\t\t\t\t\t}";
$query .= "\n\t\t\t\t}";
$query .= "\n\t\t\t}";
$query .= "\n\t\t\telse";
@ -6928,6 +6939,11 @@ class Interpretation extends Fields
$query .= "\n\t\t\t\t\t\t\tcontinue;";
$query .= "\n\t\t\t\t\t\t}";
$query .= "\n\t\t\t\t\t}";
$query .= "\n\t\t\t\t\telse";
$query .= "\n\t\t\t\t\t{";
$query .= "\n\t\t\t\t\t\tunset(\$items[\$nr]);";
$query .= "\n\t\t\t\t\t\tcontinue;";
$query .= "\n\t\t\t\t\t}";
$query .= "\n\t\t\t\t}";
$query .= "\n\t\t\t}";
$query .= "\n\t\t\telse";

6
admin/helpers/compiler/f_Infusion.php
View File

@ -34,6 +34,7 @@ class Infusion extends Interpretation
public $eximportView = array();
public $importCustomScripts = array();
public $removeSiteFolder = false;
/**
* Constructor
@ -1004,6 +1005,11 @@ class Infusion extends Interpretation
// setup the layouts
$this->setCustomViewLayouts();
}
else
{
// clear all site folder since none is needed
$this->removeSiteFolder = true;
}
// ###LANG_ADMIN###
$this->fileContentStatic['###LANG_ADMIN###'] = $this->setLangAdmin();

2
admin/helpers/componentbuilder.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.2.6
@build 12th January, 2017
@build 20th January, 2017
@created 30th April, 2015
@package Component Builder
@subpackage componentbuilder.php

2
admin/helpers/html/batch_.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.2.6
@build 12th January, 2017
@build 20th January, 2017
@created 30th April, 2015
@package Component Builder
@subpackage batch_.php

2
admin/helpers/indenter.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.2.6
@build 12th January, 2017
@build 20th January, 2017
@created 30th April, 2015
@package Component Builder
@subpackage indenter.php

2
admin/helpers/js.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.2.6
@build 12th January, 2017
@build 20th January, 2017
@created 30th April, 2015
@package Component Builder
@subpackage js.php

2
admin/helpers/minify.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.2.6
@build 12th January, 2017
@build 20th January, 2017
@created 30th April, 2015
@package Component Builder
@subpackage minify.php