Improved the compiler. All other changes are only random variable name and date changes (due to automation)

This commit is contained in:
Llewellyn van der Merwe 2016-02-15 10:37:21 +02:00
parent 41defc9e7a
commit 737785ea33
368 changed files with 2974 additions and 2443 deletions

View File

@ -38,32 +38,32 @@ Would you require more help VDM.io has a number of support plans available [visi
+ *Author*: [Llewellyn van der Merwe] (mailto:info@vdm.io) + *Author*: [Llewellyn van der Merwe] (mailto:info@vdm.io)
+ *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*: 31st January, 2016 + *Last Build*: 15th February, 2016
+ *Version*: 2.0.9 + *Version*: 2.0.9
+ *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
**221 Hours** or **28 Eight Hour Days** (actual time the author saved - **222 Hours** or **28 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*: **79357** + *Line count*: **79771**
+ *File count*: **490** + *File count*: **490**
+ *Folder count*: **96** + *Folder count*: **96**
**146 Hours** or **18 Eight Hour Days** (the actual time the author spent) **147 Hours** or **18 Eight Hour Days** (the actual time the author spent)
> (with the following break down: > (with the following break down:
> **debugging @55hours** = codingtime / 4; > **debugging @56hours** = codingtime / 4;
> **planning @32hours** = codingtime / 7; > **planning @32hours** = codingtime / 7;
> **mapping @22hours** = codingtime / 10; > **mapping @22hours** = codingtime / 10;
> **office @37hours** = codingtime / 6;) > **office @37hours** = codingtime / 6;)
**367 Hours** or **46 Eight Hour Days** **369 Hours** or **46 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

@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage admin.css @subpackage admin.css

View File

@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage admin_view.css @subpackage admin_view.css

View File

@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage admin_views.css @subpackage admin_views.css

View File

@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage component.css @subpackage component.css

View File

@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage components.css @subpackage components.css

View File

@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage custom_admin_view.css @subpackage custom_admin_view.css

View File

@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage custom_admin_views.css @subpackage custom_admin_views.css

View File

@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage dashboard.css @subpackage dashboard.css

View File

@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage dynamic_get.css @subpackage dynamic_get.css

View File

@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage dynamic_gets.css @subpackage dynamic_gets.css

View File

@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage field.css @subpackage field.css

View File

@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage fields.css @subpackage fields.css

View File

@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage fieldtype.css @subpackage fieldtype.css

View File

@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage fieldtypes.css @subpackage fieldtypes.css

View File

@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage help_document.css @subpackage help_document.css

View File

@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage help_documents.css @subpackage help_documents.css

View File

@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage layout.css @subpackage layout.css

View File

@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage layouts.css @subpackage layouts.css

View File

@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage site_view.css @subpackage site_view.css

View File

@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage site_views.css @subpackage site_views.css

View File

@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage snippet.css @subpackage snippet.css

View File

@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage snippets.css @subpackage snippets.css

View File

@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage template.css @subpackage template.css

View File

@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage templates.css @subpackage templates.css

View File

@ -252,7 +252,7 @@ abstract class ###Component###Helper
foreach ($actions as $action) foreach ($actions as $action)
{ {
// set to use component default // set to use component default
$allow = true; $fallback= true;
if (self::checkObject($record) && isset($record->id) && $record->id > 0 && !in_array($action->name,$componentActions)) if (self::checkObject($record) && isset($record->id) && $record->id > 0 && !in_array($action->name,$componentActions))
{ {
// The record has been set. Check the record permissions. // The record has been set. Check the record permissions.
@ -268,13 +268,13 @@ abstract class ###Component###Helper
{ {
$result->set($action->name, true); $result->set($action->name, true);
// set not to use component default // set not to use component default
$allow = false; $fallback= false;
} }
else else
{ {
$result->set($action->name, false); $result->set($action->name, false);
// set not to use component default // set not to use component default
$allow = false; $fallback= false;
} }
} }
elseif ($user->authorise($view.'edit.own', 'com_###component###.'.$view.'.' . (int) $record->id)) elseif ($user->authorise($view.'edit.own', 'com_###component###.'.$view.'.' . (int) $record->id))
@ -284,13 +284,13 @@ abstract class ###Component###Helper
{ {
$result->set($action->name, true); $result->set($action->name, true);
// set not to use component default // set not to use component default
$allow = false; $fallback= false;
} }
else else
{ {
$result->set($action->name, false); $result->set($action->name, false);
// set not to use component default // set not to use component default
$allow = false; $fallback= false;
} }
} }
elseif ($user->authorise('core.edit.own', 'com_###component###')) elseif ($user->authorise('core.edit.own', 'com_###component###'))
@ -300,13 +300,13 @@ abstract class ###Component###Helper
{ {
$result->set($action->name, true); $result->set($action->name, true);
// set not to use component default // set not to use component default
$allow = false; $fallback= false;
} }
else else
{ {
$result->set($action->name, false); $result->set($action->name, false);
// set not to use component default // set not to use component default
$allow = false; $fallback= false;
} }
} }
elseif ($user->authorise($view.'edit.own', 'com_###component###')) elseif ($user->authorise($view.'edit.own', 'com_###component###'))
@ -316,13 +316,13 @@ abstract class ###Component###Helper
{ {
$result->set($action->name, true); $result->set($action->name, true);
// set not to use component default // set not to use component default
$allow = false; $fallback= false;
} }
else else
{ {
$result->set($action->name, false); $result->set($action->name, false);
// set not to use component default // set not to use component default
$allow = false; $fallback= false;
} }
} }
} }
@ -352,13 +352,13 @@ abstract class ###Component###Helper
{ {
$result->set($action->name, true); $result->set($action->name, true);
// set not to use component default // set not to use component default
$allow = false; $fallback= false;
} }
else else
{ {
$result->set($action->name, false); $result->set($action->name, false);
// set not to use component default // set not to use component default
$allow = false; $fallback= false;
} }
} }
elseif ($user->authorise($view.'edit.own', 'com_###component###.'.$views.'.category.' . (int) $record->catid)) elseif ($user->authorise($view.'edit.own', 'com_###component###.'.$views.'.category.' . (int) $record->catid))
@ -368,13 +368,13 @@ abstract class ###Component###Helper
{ {
$result->set($action->name, true); $result->set($action->name, true);
// set not to use component default // set not to use component default
$allow = false; $fallback= false;
} }
else else
{ {
$result->set($action->name, false); $result->set($action->name, false);
// set not to use component default // set not to use component default
$allow = false; $fallback= false;
} }
} }
elseif ($user->authorise('core.edit.own', 'com_###component###')) elseif ($user->authorise('core.edit.own', 'com_###component###'))
@ -384,13 +384,13 @@ abstract class ###Component###Helper
{ {
$result->set($action->name, true); $result->set($action->name, true);
// set not to use component default // set not to use component default
$allow = false; $fallback= false;
} }
else else
{ {
$result->set($action->name, false); $result->set($action->name, false);
// set not to use component default // set not to use component default
$allow = false; $fallback= false;
} }
} }
elseif ($user->authorise($view.'edit.own', 'com_###component###')) elseif ($user->authorise($view.'edit.own', 'com_###component###'))
@ -400,21 +400,21 @@ abstract class ###Component###Helper
{ {
$result->set($action->name, true); $result->set($action->name, true);
// set not to use component default // set not to use component default
$allow = false; $fallback= false;
} }
else else
{ {
$result->set($action->name, false); $result->set($action->name, false);
// set not to use component default // set not to use component default
$allow = false; $fallback= false;
} }
} }
} }
} }
} }
} }
// if allowed then fall back on component global settings // if allowed then fallback on component global settings
if ($allow) if ($fallback)
{ {
$result->set($action->name, $user->authorise($action->name, 'com_###component###')); $result->set($action->name, $user->authorise($action->name, 'com_###component###'));
} }

View File

@ -355,7 +355,7 @@ abstract class ###Component###Helper
foreach ($actions as $action) foreach ($actions as $action)
{ {
// set to use component default // set to use component default
$allow = true; $fallback = true;
if (self::checkObject($record) && isset($record->id) && $record->id > 0 && !in_array($action->name,$componentActions)) if (self::checkObject($record) && isset($record->id) && $record->id > 0 && !in_array($action->name,$componentActions))
{ {
// The record has been set. Check the record permissions. // The record has been set. Check the record permissions.
@ -371,13 +371,13 @@ abstract class ###Component###Helper
{ {
$result->set($action->name, true); $result->set($action->name, true);
// set not to use component default // set not to use component default
$allow = false; $fallback = false;
} }
else else
{ {
$result->set($action->name, false); $result->set($action->name, false);
// set not to use component default // set not to use component default
$allow = false; $fallback = false;
} }
} }
elseif ($user->authorise($view.'edit.own', 'com_###component###.'.$view.'.' . (int) $record->id)) elseif ($user->authorise($view.'edit.own', 'com_###component###.'.$view.'.' . (int) $record->id))
@ -387,13 +387,13 @@ abstract class ###Component###Helper
{ {
$result->set($action->name, true); $result->set($action->name, true);
// set not to use component default // set not to use component default
$allow = false; $fallback = false;
} }
else else
{ {
$result->set($action->name, false); $result->set($action->name, false);
// set not to use component default // set not to use component default
$allow = false; $fallback = false;
} }
} }
elseif ($user->authorise('core.edit.own', 'com_###component###')) elseif ($user->authorise('core.edit.own', 'com_###component###'))
@ -403,13 +403,13 @@ abstract class ###Component###Helper
{ {
$result->set($action->name, true); $result->set($action->name, true);
// set not to use component default // set not to use component default
$allow = false; $fallback = false;
} }
else else
{ {
$result->set($action->name, false); $result->set($action->name, false);
// set not to use component default // set not to use component default
$allow = false; $fallback = false;
} }
} }
elseif ($user->authorise($view.'edit.own', 'com_###component###')) elseif ($user->authorise($view.'edit.own', 'com_###component###'))
@ -419,13 +419,13 @@ abstract class ###Component###Helper
{ {
$result->set($action->name, true); $result->set($action->name, true);
// set not to use component default // set not to use component default
$allow = false; $fallback = false;
} }
else else
{ {
$result->set($action->name, false); $result->set($action->name, false);
// set not to use component default // set not to use component default
$allow = false; $fallback = false;
} }
} }
} }
@ -455,13 +455,13 @@ abstract class ###Component###Helper
{ {
$result->set($action->name, true); $result->set($action->name, true);
// set not to use component default // set not to use component default
$allow = false; $fallback = false;
} }
else else
{ {
$result->set($action->name, false); $result->set($action->name, false);
// set not to use component default // set not to use component default
$allow = false; $fallback = false;
} }
} }
elseif ($user->authorise($view.'edit.own', 'com_###component###.'.$views.'.category.' . (int) $record->catid)) elseif ($user->authorise($view.'edit.own', 'com_###component###.'.$views.'.category.' . (int) $record->catid))
@ -471,13 +471,13 @@ abstract class ###Component###Helper
{ {
$result->set($action->name, true); $result->set($action->name, true);
// set not to use component default // set not to use component default
$allow = false; $fallback = false;
} }
else else
{ {
$result->set($action->name, false); $result->set($action->name, false);
// set not to use component default // set not to use component default
$allow = false; $fallback = false;
} }
} }
elseif ($user->authorise('core.edit.own', 'com_###component###')) elseif ($user->authorise('core.edit.own', 'com_###component###'))
@ -487,13 +487,13 @@ abstract class ###Component###Helper
{ {
$result->set($action->name, true); $result->set($action->name, true);
// set not to use component default // set not to use component default
$allow = false; $fallback = false;
} }
else else
{ {
$result->set($action->name, false); $result->set($action->name, false);
// set not to use component default // set not to use component default
$allow = false; $fallback = false;
} }
} }
elseif ($user->authorise($view.'edit.own', 'com_###component###')) elseif ($user->authorise($view.'edit.own', 'com_###component###'))
@ -503,21 +503,21 @@ abstract class ###Component###Helper
{ {
$result->set($action->name, true); $result->set($action->name, true);
// set not to use component default // set not to use component default
$allow = false; $fallback = false;
} }
else else
{ {
$result->set($action->name, false); $result->set($action->name, false);
// set not to use component default // set not to use component default
$allow = false; $fallback = false;
} }
} }
} }
} }
} }
} }
// if allowed then fall back on component global settings // if allowed then fallback on component global settings
if ($allow) if ($fallback)
{ {
$result->set($action->name, $user->authorise($action->name, 'com_###component###')); $result->set($action->name, $user->authorise($action->name, 'com_###component###'));
} }

View File

@ -264,7 +264,7 @@ class ###Component###Controller###View### extends JControllerForm
* *
* @since 11.1 * @since 11.1
*/ */
protected function postSaveHook(JModelLegacy &$model, $validData = array()) protected function postSaveHook(JModelLegacy $model, $validData = array())
{###POSTSAVEHOOK### {###POSTSAVEHOOK###
} }

View File

@ -264,7 +264,7 @@ class ###Component###Controller###View### extends JControllerForm
* *
* @since 11.1 * @since 11.1
*/ */
protected function postSaveHook(JModelLegacy &$model, $validData = array()) protected function postSaveHook(JModelLegacy $model, $validData = array())
{###POSTSAVEHOOK### {###POSTSAVEHOOK###
} }

View File

@ -700,7 +700,7 @@
"type": "template" "type": "template"
}, },
"layout_custom_admin.php": { "layout_custom_admin.php": {
"path": "c0mp0n3nt/admin/layouts/VIEW", "path": "c0mp0n3nt/admin/layouts",
"rename": "layout_custom_admin", "rename": "layout_custom_admin",
"type": "layout" "type": "layout"
} }

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage componentbuilder.php @subpackage componentbuilder.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage controller.php @subpackage controller.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage admin_view.php @subpackage admin_view.php
@ -319,7 +319,7 @@ class ComponentbuilderControllerAdmin_view extends JControllerForm
* *
* @since 11.1 * @since 11.1
*/ */
protected function postSaveHook(JModelLegacy &$model, $validData = array()) protected function postSaveHook(JModelLegacy $model, $validData = array())
{ {
return; return;
} }

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage admin_views.php @subpackage admin_views.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage ajax.json.php @subpackage ajax.json.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage compiler.php @subpackage compiler.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage component.php @subpackage component.php
@ -305,7 +305,7 @@ class ComponentbuilderControllerComponent extends JControllerForm
* *
* @since 11.1 * @since 11.1
*/ */
protected function postSaveHook(JModelLegacy &$model, $validData = array()) protected function postSaveHook(JModelLegacy $model, $validData = array())
{ {
return; return;
} }

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage componentbuilder.php @subpackage componentbuilder.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage components.php @subpackage components.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage custom_admin_view.php @subpackage custom_admin_view.php
@ -319,7 +319,7 @@ class ComponentbuilderControllerCustom_admin_view extends JControllerForm
* *
* @since 11.1 * @since 11.1
*/ */
protected function postSaveHook(JModelLegacy &$model, $validData = array()) protected function postSaveHook(JModelLegacy $model, $validData = array())
{ {
return; return;
} }

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage custom_admin_views.php @subpackage custom_admin_views.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage dynamic_get.php @subpackage dynamic_get.php
@ -319,7 +319,7 @@ class ComponentbuilderControllerDynamic_get extends JControllerForm
* *
* @since 11.1 * @since 11.1
*/ */
protected function postSaveHook(JModelLegacy &$model, $validData = array()) protected function postSaveHook(JModelLegacy $model, $validData = array())
{ {
return; return;
} }

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage dynamic_gets.php @subpackage dynamic_gets.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage field.php @subpackage field.php
@ -349,7 +349,7 @@ class ComponentbuilderControllerField extends JControllerForm
* *
* @since 11.1 * @since 11.1
*/ */
protected function postSaveHook(JModelLegacy &$model, $validData = array()) protected function postSaveHook(JModelLegacy $model, $validData = array())
{ {
return; return;
} }

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage fields.php @subpackage fields.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage fieldtype.php @subpackage fieldtype.php
@ -349,7 +349,7 @@ class ComponentbuilderControllerFieldtype extends JControllerForm
* *
* @since 11.1 * @since 11.1
*/ */
protected function postSaveHook(JModelLegacy &$model, $validData = array()) protected function postSaveHook(JModelLegacy $model, $validData = array())
{ {
return; return;
} }

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage fieldtypes.php @subpackage fieldtypes.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage help.php @subpackage help.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage help_document.php @subpackage help_document.php
@ -319,7 +319,7 @@ class ComponentbuilderControllerHelp_document extends JControllerForm
* *
* @since 11.1 * @since 11.1
*/ */
protected function postSaveHook(JModelLegacy &$model, $validData = array()) protected function postSaveHook(JModelLegacy $model, $validData = array())
{ {
return; return;
} }

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage help_documents.php @subpackage help_documents.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage import.php @subpackage import.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage layout.php @subpackage layout.php
@ -319,7 +319,7 @@ class ComponentbuilderControllerLayout extends JControllerForm
* *
* @since 11.1 * @since 11.1
*/ */
protected function postSaveHook(JModelLegacy &$model, $validData = array()) protected function postSaveHook(JModelLegacy $model, $validData = array())
{ {
return; return;
} }

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage layouts.php @subpackage layouts.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage site_view.php @subpackage site_view.php
@ -319,7 +319,7 @@ class ComponentbuilderControllerSite_view extends JControllerForm
* *
* @since 11.1 * @since 11.1
*/ */
protected function postSaveHook(JModelLegacy &$model, $validData = array()) protected function postSaveHook(JModelLegacy $model, $validData = array())
{ {
return; return;
} }

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage site_views.php @subpackage site_views.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage snippet.php @subpackage snippet.php
@ -319,7 +319,7 @@ class ComponentbuilderControllerSnippet extends JControllerForm
* *
* @since 11.1 * @since 11.1
*/ */
protected function postSaveHook(JModelLegacy &$model, $validData = array()) protected function postSaveHook(JModelLegacy $model, $validData = array())
{ {
return; return;
} }

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage snippets.php @subpackage snippets.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage template.php @subpackage template.php
@ -319,7 +319,7 @@ class ComponentbuilderControllerTemplate extends JControllerForm
* *
* @since 11.1 * @since 11.1
*/ */
protected function postSaveHook(JModelLegacy &$model, $validData = array()) protected function postSaveHook(JModelLegacy $model, $validData = array())
{ {
return; return;
} }

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage templates.php @subpackage templates.php

View File

@ -132,6 +132,8 @@ class Compiler
protected $layoutData = array(); protected $layoutData = array();
protected $getAsLookup = array(); protected $getAsLookup = array();
protected $otherWhere = array(); protected $otherWhere = array();
protected $target;
protected $_adminViewData;
/** /**
* Constructor * Constructor
@ -324,6 +326,11 @@ class Compiler
// ###UPDATE_VERSION_MYSQL### // ###UPDATE_VERSION_MYSQL###
$this->setVersionController(); $this->setVersionController();
// build route parse switch
$this->fileContentStatic['###ROUTER_PARSE_SWITCH###'] = '';
// build route views
$this->fileContentStatic['###ROUTER_BUILD_VIEWS###'] = '';
// setup back-views and all needed stuff for the admin // setup back-views and all needed stuff for the admin
if (isset($this->componentData->admin_views) && ComponentbuilderHelper::checkArray($this->componentData->admin_views)) if (isset($this->componentData->admin_views) && ComponentbuilderHelper::checkArray($this->componentData->admin_views))
{ {
@ -628,6 +635,13 @@ class Compiler
$this->fileContentStatic['###ROUTEHELPER###'] = ''; $this->fileContentStatic['###ROUTEHELPER###'] = '';
} }
$this->fileContentStatic['###ROUTEHELPER###'] .= $this->setRouterHelp($viewName_single, $viewName_list); $this->fileContentStatic['###ROUTEHELPER###'] .= $this->setRouterHelp($viewName_single, $viewName_list);
if ($view['edit_create_site_view'])
{
// add needed router stuff for front edit views
$this->fileContentStatic['###ROUTER_PARSE_SWITCH###'] .= $this->routerParseSwitch($viewName_single);
$this->fileContentStatic['###ROUTER_BUILD_VIEWS###'] .= $this->routerBuildViews($viewName_single);
}
// ###ACCESS_SECTIONS### // ###ACCESS_SECTIONS###
if (!isset($this->fileContentStatic['###ACCESS_SECTIONS###'])) if (!isset($this->fileContentStatic['###ACCESS_SECTIONS###']))
@ -891,16 +905,11 @@ class Compiler
$this->setConfigFieldsets(2); $this->setConfigFieldsets(2);
$this->lang = $keepLang; $this->lang = $keepLang;
} }
// build route parse switch
$this->fileContentStatic['###ROUTER_PARSE_SWITCH###'] = '';
// setup front-views and all needed stuff for the site // setup front-views and all needed stuff for the site
if (isset($this->componentData->site_views) && ComponentbuilderHelper::checkArray($this->componentData->site_views)) if (isset($this->componentData->site_views) && ComponentbuilderHelper::checkArray($this->componentData->site_views))
{ {
$this->target = 'site'; $this->target = 'site';
// build route views
$this->fileContentStatic['###ROUTER_BUILD_VIEWS###'] = '';
// var_dump($this->componentData->site_views);exit; // var_dump($this->componentData->site_views);exit;
// start dynamic build // start dynamic build
foreach ($this->componentData->site_views as $view) foreach ($this->componentData->site_views as $view)
@ -944,7 +953,7 @@ class Compiler
// insure the needed route helper is loaded // insure the needed route helper is loaded
$this->fileContentStatic['###ROUTEHELPER###'] .= $this->setRouterHelp($view['settings']->code,$view['settings']->code, true); $this->fileContentStatic['###ROUTEHELPER###'] .= $this->setRouterHelp($view['settings']->code,$view['settings']->code, true);
// build route details // build route details
$this->fileContentStatic['###ROUTER_PARSE_SWITCH###'] .= $this->routerParseSwitch($view['settings']->code,1); $this->fileContentStatic['###ROUTER_PARSE_SWITCH###'] .= $this->routerParseSwitch($view['settings']->code);
$this->fileContentStatic['###ROUTER_BUILD_VIEWS###'] .= $this->routerBuildViews($view['settings']->code); $this->fileContentStatic['###ROUTER_BUILD_VIEWS###'] .= $this->routerBuildViews($view['settings']->code);
if ($view['settings']->main_get->gettype == 1) if ($view['settings']->main_get->gettype == 1)
@ -1135,7 +1144,7 @@ class Compiler
protected function setLockLicense() protected function setLockLicense()
{ {
if ($this->componentData->add_license && $this->componentData->license_type == 2) if ($this->componentData->add_license && $this->componentData->license_type == 3)
{ {
$_VDM = '_'.ComponentbuilderHelper::safeString(ComponentbuilderHelper::randomkey(10),'U'); $_VDM = '_'.ComponentbuilderHelper::safeString(ComponentbuilderHelper::randomkey(10),'U');
// add it to the system // add it to the system
@ -1156,7 +1165,7 @@ class Compiler
protected function setLockLicensePer($view) protected function setLockLicensePer($view)
{ {
if ($this->componentData->add_license && $this->componentData->license_type == 2) if ($this->componentData->add_license && $this->componentData->license_type == 3)
{ {
$boolMethod = 'isHonest'; $boolMethod = 'isHonest';
$globalbool = ComponentbuilderHelper::safeString(ComponentbuilderHelper::randomkey(4)); $globalbool = ComponentbuilderHelper::safeString(ComponentbuilderHelper::randomkey(4));
@ -1283,15 +1292,15 @@ class Compiler
$encrypt[] = "\t\t\$session = JFactory::getSession();"; $encrypt[] = "\t\t\$session = JFactory::getSession();";
$encrypt[] = "\t\t\$V2uekt2wcgwk = \$session->get(\$Vk5smi0wjnjb, null);"; $encrypt[] = "\t\t\$V2uekt2wcgwk = \$session->get(\$Vk5smi0wjnjb, null);";
$encrypt[] = "\t\t\$h4sgrGsqq = \$this->get(\$Vk5smi0wjnjb,\$V2uekt2wcgwk);"; $encrypt[] = "\t\t\$h4sgrGsqq = \$this->get(\$Vk5smi0wjnjb,\$V2uekt2wcgwk);";
$encrypt[] = "\t\tif (isset(\$h4sgrGsqq['nuut']) && \$h4sgrGsqq['nuut'] && \$h4sgrGsqq['status'] == 'Active' && isset(\$h4sgrGsqq['eiegrendel']) && strlen(\$h4sgrGsqq['eiegrendel']) > 300)"; $encrypt[] = "\t\tif (isset(\$h4sgrGsqq['nuut']) && \$h4sgrGsqq['nuut'] && (isset(\$h4sgrGsqq['status']) && 'Active' == \$h4sgrGsqq['status']) && isset(\$h4sgrGsqq['eiegrendel']) && strlen(\$h4sgrGsqq['eiegrendel']) > 300)";
$encrypt[] = "\t\t{"; $encrypt[] = "\t\t{";
$encrypt[] = "\t\t\t\$session->set(\$Vk5smi0wjnjb, \$h4sgrGsqq['eiegrendel']);"; $encrypt[] = "\t\t\t\$session->set(\$Vk5smi0wjnjb, \$h4sgrGsqq['eiegrendel']);";
$encrypt[] = "\t\t}"; $encrypt[] = "\t\t}";
$encrypt[] = "\t\tif (\$h4sgrGsqq['status'] == 'Active' && isset(\$h4sgrGsqq['md5hash']) && strlen(\$h4sgrGsqq['md5hash']) == 32 && isset(\$h4sgrGsqq['customfields']) && strlen(\$h4sgrGsqq['customfields']) > 4)"; $encrypt[] = "\t\tif ((isset(\$h4sgrGsqq['status']) && 'Active' == \$h4sgrGsqq['status']) && isset(\$h4sgrGsqq['md5hash']) && strlen(\$h4sgrGsqq['md5hash']) == 32 && isset(\$h4sgrGsqq['customfields']) && strlen(\$h4sgrGsqq['customfields']) > 4)";
$encrypt[] = "\t\t{"; $encrypt[] = "\t\t{";
$encrypt[] = "\t\t\t\$this->_key = md5(\$h4sgrGsqq['customfields']);"; $encrypt[] = "\t\t\t\$this->_key = md5(\$h4sgrGsqq['customfields']);";
$encrypt[] = "\t\t}"; $encrypt[] = "\t\t}";
$encrypt[] = "\t\tif (\$h4sgrGsqq['status'] == 'Active' && isset(\$h4sgrGsqq['md5hash']) && strlen(\$h4sgrGsqq['md5hash']) == 32 )"; $encrypt[] = "\t\tif ((isset(\$h4sgrGsqq['status']) && 'Active' == \$h4sgrGsqq['status']) && isset(\$h4sgrGsqq['md5hash']) && strlen(\$h4sgrGsqq['md5hash']) == 32 )";
$encrypt[] = "\t\t{"; $encrypt[] = "\t\t{";
$encrypt[] = "\t\t\t\$this->_is = true;"; $encrypt[] = "\t\t\t\$this->_is = true;";
$encrypt[] = "\t\t}"; $encrypt[] = "\t\t}";
@ -1398,7 +1407,7 @@ class Compiler
$encrypt[] = "\t\t\t\t\treturn \$Vwasqoybpyed;"; $encrypt[] = "\t\t\t\t\treturn \$Vwasqoybpyed;";
$encrypt[] = "\t\t\t\t}"; $encrypt[] = "\t\t\t\t}";
$encrypt[] = "\t\t\t} else {"; $encrypt[] = "\t\t\t} else {";
$encrypt[] = "\t\t\t\tpreg_match_all('/<(.*?)>([^<]+)<\/\1>/i', \$Vqojefyeohg5, \$V1ot20wob03f);"; $encrypt[] = "\t\t\t\tpreg_match_all('".'/<(.*?)>([^<]+)<\/\\1>/i'."', \$Vqojefyeohg5, \$V1ot20wob03f);";
$encrypt[] = "\t\t\t\t\$Vwasqoybpyed = array();"; $encrypt[] = "\t\t\t\t\$Vwasqoybpyed = array();";
$encrypt[] = "\t\t\t\tforeach (\$V1ot20wob03f[1] AS \$V2sgyscukmgi=>\$V1u00zkzmb1d) {"; $encrypt[] = "\t\t\t\tforeach (\$V1ot20wob03f[1] AS \$V2sgyscukmgi=>\$V1u00zkzmb1d) {";
$encrypt[] = "\t\t\t\t\t\$Vwasqoybpyed[\$V1u00zkzmb1d] = \$V1ot20wob03f[2][\$V2sgyscukmgi];"; $encrypt[] = "\t\t\t\t\t\$Vwasqoybpyed[\$V1u00zkzmb1d] = \$V1ot20wob03f[2][\$V2sgyscukmgi];";
@ -1571,6 +1580,10 @@ class Compiler
$updateXML[] = "\t\t<version>".$update['version']."</version>"; $updateXML[] = "\t\t<version>".$update['version']."</version>";
$updateXML[] = "\t\t".'<infourl title="'.$this->fileContentStatic['###Component_name###'].'!">'.$this->fileContentStatic['###AUTHORWEBSITE###'].'</infourl>'; $updateXML[] = "\t\t".'<infourl title="'.$this->fileContentStatic['###Component_name###'].'!">'.$this->fileContentStatic['###AUTHORWEBSITE###'].'</infourl>';
$updateXML[] = "\t\t<downloads>"; $updateXML[] = "\t\t<downloads>";
if (!isset($update['url']))
{
$update['url'] = 'http://domain.com/demo.xml';
}
$updateXML[] = "\t\t\t".'<downloadurl type="full" format="zip">'.$update['url'].'</downloadurl>'; $updateXML[] = "\t\t\t".'<downloadurl type="full" format="zip">'.$update['url'].'</downloadurl>';
$updateXML[] = "\t\t</downloads>"; $updateXML[] = "\t\t</downloads>";
$updateXML[] = "\t\t<tags>"; $updateXML[] = "\t\t<tags>";
@ -3477,7 +3490,7 @@ class Compiler
protected function setGetModules($view,$TARGET) protected function setGetModules($view,$TARGET)
{ {
if ($this->getModule[$this->target][$view['settings']->code]) if (isset($this->getModule[$this->target][$view['settings']->code]) && $this->getModule[$this->target][$view['settings']->code])
{ {
$addModule = array(); $addModule = array();
$addModule[] = "\n\n\t/**"; $addModule[] = "\n\n\t/**";
@ -4912,10 +4925,9 @@ class Compiler
} }
return $script; return $script;
} }
protected function setInstallScript() protected function setComponentToContentTypes($action)
{ {
// reset script
$script = ''; $script = '';
if (isset($this->componentData->admin_views) && ComponentbuilderHelper::checkArray($this->componentData->admin_views)) if (isset($this->componentData->admin_views) && ComponentbuilderHelper::checkArray($this->componentData->admin_views))
{ {
@ -4948,26 +4960,64 @@ class Compiler
// build the db insert query // build the db insert query
if (ComponentbuilderHelper::checkArray($dbStuff)) if (ComponentbuilderHelper::checkArray($dbStuff))
{ {
$taabb = '';
if ($action == 'update')
{
$taabb = "\t";
}
$script .= "\n\n\t\t\t//".$this->setLine(__LINE__)." Get The Database object"; $script .= "\n\n\t\t\t//".$this->setLine(__LINE__)." Get The Database object";
$script .= "\n\n\t\t\t\$db = JFactory::getDbo();"; $script .= "\n\t\t\t\$db = JFactory::getDbo();";
foreach ($dbStuff as $name => $tables) foreach ($dbStuff as $name => $tables)
{ {
if (ComponentbuilderHelper::checkArray($tables)) if (ComponentbuilderHelper::checkArray($tables))
{ {
$code = ComponentbuilderHelper::safeString($name); $code = ComponentbuilderHelper::safeString($name);
$script .= "\n\n\t\t\t//".$this->setLine(__LINE__)." Create the ".$name." content type object."; $script .= "\n\n\t\t\t//".$this->setLine(__LINE__)." Create the ".$name." content type object.";
$script .= "\n\t\t\t\$".$code." = new stdClass();"; $script .= "\n\t\t\t\$".$code." = new stdClass();";
foreach ($tables as $table => $data) foreach ($tables as $table => $data)
{ {
$script .= "\n\t\t\t\$".$code."->".$table." = '".$data."';"; $script .= "\n\t\t\t\$".$code."->".$table." = '".$data."';";
} }
$script .= "\n\n\t\t\t//".$this->setLine(__LINE__)." Insert the object into the content types table."; if ($action == 'update')
$script .= "\n\t\t\t\$".$code."Inserted = \$db->insertObject('#__content_types', \$".$code.");"; {
// we first load script to check if data exist
$script .= "\n\n\t\t\t//".$this->setLine(__LINE__)." Check if ".$name." type is already in content_type DB.";
$script .= "\n\t\t\t\$".$code."_id = null;";
$script .= "\n\t\t\t\$query = \$db->getQuery(true);";
$script .= "\n\t\t\t\$query->select(\$db->quoteName(array('type_id')));";
$script .= "\n\t\t\t\$query->from(\$db->quoteName('#__content_types'));";
$script .= "\n\t\t\t\$query->where(\$db->quoteName('type_alias') . ' LIKE '. \$db->quote($".$code."->type_alias));";
$script .= "\n\t\t\t\$db->setQuery(\$query);";
$script .= "\n\t\t\t\$db->execute();";
}
$script .= "\n\n\t\t\t//".$this->setLine(__LINE__)." Set the object into the content types table.";
if ($action == 'update')
{
$script .= "\n\t\t\tif (\$db->getNumRows())";
$script .= "\n\t\t\t{";
$script .= "\n\t\t\t\t\$".$code."->type_id = \$db->loadResult();";
$script .= "\n\t\t\t\t\$".$code."_Updated = \$db->updateObject('#__content_types', \$".$code.", 'type_id');";
$script .= "\n\t\t\t}";
$script .= "\n\t\t\telse";
$script .= "\n\t\t\t{";
}
$script .= "\n\t\t\t".$taabb."\$".$code."_Inserted = \$db->insertObject('#__content_types', \$".$code.");";
if ($action == 'update')
{
$script .= "\n\t\t\t}";
}
} }
} }
$script .= "\n\n"; $script .= "\n\n";
} }
} }
return $script;
}
protected function setInstallScript()
{
// reset script
$script = $this->setComponentToContentTypes('install');
if (isset($this->paramsBuilder) && ComponentbuilderHelper::checkString($this->paramsBuilder)) if (isset($this->paramsBuilder) && ComponentbuilderHelper::checkString($this->paramsBuilder))
{ {
@ -5008,7 +5058,7 @@ class Compiler
protected function setUpdateScript() protected function setUpdateScript()
{ {
// reset script // reset script
$script = ''; $script = $this->setComponentToContentTypes('update');
if (isset($this->componentData->admin_views) && ComponentbuilderHelper::checkArray($this->componentData->admin_views)) if (isset($this->componentData->admin_views) && ComponentbuilderHelper::checkArray($this->componentData->admin_views))
{ {
$script .= "\n\t\t\t".'echo \'<a target="_blank" href="'.$this->fileContentStatic['###AUTHORWEBSITE###'].'" title="'.$this->fileContentStatic['###Component_name###'].'">'; $script .= "\n\t\t\t".'echo \'<a target="_blank" href="'.$this->fileContentStatic['###AUTHORWEBSITE###'].'" title="'.$this->fileContentStatic['###Component_name###'].'">';
@ -5993,7 +6043,7 @@ class Compiler
$this->langContent['admin'][$this->langPrefix.'_KEEP_ORIGINAL_STATE'] = "- Keep Original State -"; $this->langContent['admin'][$this->langPrefix.'_KEEP_ORIGINAL_STATE'] = "- Keep Original State -";
$this->langContent['admin'][$this->langPrefix.'_KEEP_ORIGINAL_ACCESS'] = "- Keep Original Access -"; $this->langContent['admin'][$this->langPrefix.'_KEEP_ORIGINAL_ACCESS'] = "- Keep Original Access -";
$this->langContent['admin'][$this->langPrefix.'_KEEP_ORIGINAL_CATEGORY'] = "- Keep Original Category -"; $this->langContent['admin'][$this->langPrefix.'_KEEP_ORIGINAL_CATEGORY'] = "- Keep Original Category -";
if ($this->componentData->add_license && $this->componentData->license_type == 2) if ($this->componentData->add_license && $this->componentData->license_type == 3)
{ {
$this->langContent['admin']['NIE_REG_NIE'] = "<br /><br /><center><h1>Lincense not set for ".$this->componentData->name.".</h1><p>Notify your administrator!<br />The lincense can be obtained from ".$this->componentData->companyname.".</p></center>"; $this->langContent['admin']['NIE_REG_NIE'] = "<br /><br /><center><h1>Lincense not set for ".$this->componentData->name.".</h1><p>Notify your administrator!<br />The lincense can be obtained from ".$this->componentData->companyname.".</p></center>";
} }
@ -6615,6 +6665,13 @@ class Compiler
// set the linked view tabs // set the linked view tabs
$linkedTab = array(); $linkedTab = array();
$keys = array(); $keys = array();
// setup correct core target
$coreLoad = false;
if (isset($this->permissionCore[$viewName_single]))
{
$core = $this->permissionCore[$viewName_single];
$coreLoad = true;
}
if (isset($this->linkedAdminViews[$viewName_single]) && ComponentbuilderHelper::checkArray($this->linkedAdminViews[$viewName_single])) if (isset($this->linkedAdminViews[$viewName_single]) && ComponentbuilderHelper::checkArray($this->linkedAdminViews[$viewName_single]))
{ {
foreach ($this->linkedAdminViews[$viewName_single] as $linkedView) foreach ($this->linkedAdminViews[$viewName_single] as $linkedView)
@ -6761,6 +6818,8 @@ class Compiler
{ {
// set layout code name // set layout code name
$layoutCodeName = $tabCodeName.'_fullwidth'; $layoutCodeName = $tabCodeName.'_fullwidth';
// set identifiers
$linkedViewIdentifier[$linkedViewId] = $tabCodeName;
//set function name //set function name
$codeName = ComponentbuilderHelper::safeString(ComponentbuilderHelper::randomkey(3).$tabCodeName); $codeName = ComponentbuilderHelper::safeString(ComponentbuilderHelper::randomkey(3).$tabCodeName);
// set as items layout // set as items layout
@ -6856,8 +6915,40 @@ class Compiler
{ {
$body .= "\n\n\t<?php echo JHtml::_('bootstrap.startTabSet', '".$viewName_single."Tab', array('active' => '".$tabCodeName."')); ?>"; $body .= "\n\n\t<?php echo JHtml::_('bootstrap.startTabSet', '".$viewName_single."Tab', array('active' => '".$tabCodeName."')); ?>";
} }
// if this is a linked view set permissions
$closeIT = false;
if(in_array($tabCodeName,$linkedViewIdentifier))
{
// get view name
$linkedViewId = array_search($tabCodeName,$linkedViewIdentifier);
$linkedViewData = $this->getAdminViewData($linkedViewId);
$linkedCodeName = ComponentbuilderHelper::safeString($linkedViewData->name_single);
// setup correct core target
$coreLoadLinked = false;
if (isset($this->permissionCore[$linkedCodeName]))
{
$coreLinked = $this->permissionCore[$linkedCodeName];
$coreLoadLinked = true;
}
// check if the item has permissions.
if ($coreLoadLinked && isset($coreLinked['core.access']) && isset($this->permissionBuilder['global'][$coreLinked['core.access']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$coreLinked['core.access']]) && in_array($linkedCodeName,$this->permissionBuilder['global'][$coreLinked['core.access']]))
{
$body .= "\n\n\t<?php if (\$this->canDo->get('".$coreLinked['core.access']."')) : ?>";
$closeIT = true;
}
else
{
$body .= "\n";
}
// insure clear
unset($coreLoadLinked,$coreLinked,$linkedViewData);
}
else
{
$body .= "\n";
}
// start tab // start tab
$body .= "\n\n\t<?php echo JHtml::_('bootstrap.addTab', '".$viewName_single."Tab', '".$tabCodeName."', JText::_('".$tabLangName."', true)); ?>"; $body .= "\n\t<?php echo JHtml::_('bootstrap.addTab', '".$viewName_single."Tab', '".$tabCodeName."', JText::_('".$tabLangName."', true)); ?>";
// add the main // add the main
$body .= "\n\t\t".'<div class="row-fluid form-horizontal-desktop">'; $body .= "\n\t\t".'<div class="row-fluid form-horizontal-desktop">';
$body .= $main; $body .= $main;
@ -6870,6 +6961,10 @@ class Compiler
$body .= "\n\t\t</div>"; $body .= "\n\t\t</div>";
} }
$body .= "\n\t<?php echo JHtml::_('bootstrap.endTab'); ?>"; $body .= "\n\t<?php echo JHtml::_('bootstrap.endTab'); ?>";
if($closeIT)
{
$body .= "\n\t<?php endif; ?>";
}
// set counter // set counter
$tabCounter++; $tabCounter++;
} }
@ -6913,8 +7008,25 @@ class Compiler
$this->setLayout($viewName_single, $tabCodeNameLeft, $items_one, 'layoutpublished'); $this->setLayout($viewName_single, $tabCodeNameLeft, $items_one, 'layoutpublished');
$this->setLayout($viewName_single, $tabCodeNameRight, $items_two, 'layoutpublished'); $this->setLayout($viewName_single, $tabCodeNameRight, $items_two, 'layoutpublished');
} }
// check if the item has permissions.
$publishingPer = array();
$allToBeChekced = array('core.delete','core.edit.created_by','core.edit.state','core.edit.created');
foreach ($allToBeChekced as $core_permission)
{
if ($coreLoad && isset($core[$core_permission]) && isset($this->permissionBuilder['global'][$core[$core_permission]]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core[$core_permission]]) && in_array($viewName_single,$this->permissionBuilder['global'][$core[$core_permission]]))
{
// set permissions.
$publishingPer[] = "\$this->canDo->get('".$core[$core_permission]."')";
}
else
{
// set permissions.
$publishingPer[] = "\$this->canDo->get('".$core_permission."')";
}
}
$body .= "\n\n\t<?php if (".implode(' || ', $publishingPer).") : ?>";
// set the default publishing tab // set the default publishing tab
$body .= "\n\n\t<?php echo JHtml::_('bootstrap.addTab', '".$viewName_single."Tab', '".$tabCodeNameLeft."', JText::_('".$tabLangName."', true)); ?>"; $body .= "\n\t<?php echo JHtml::_('bootstrap.addTab', '".$viewName_single."Tab', '".$tabCodeNameLeft."', JText::_('".$tabLangName."', true)); ?>";
$body .= "\n\t\t".'<div class="row-fluid form-horizontal-desktop">'; $body .= "\n\t\t".'<div class="row-fluid form-horizontal-desktop">';
$body .= "\n\t\t\t".'<div class="span6">'; $body .= "\n\t\t\t".'<div class="span6">';
$body .= "\n\t\t\t\t<?php echo JLayoutHelper::render('".$viewName_single.".".$tabCodeNameLeft."', \$this); ?>"; $body .= "\n\t\t\t\t<?php echo JLayoutHelper::render('".$viewName_single.".".$tabCodeNameLeft."', \$this); ?>";
@ -6924,6 +7036,7 @@ class Compiler
$body .= "\n\t\t\t</div>"; $body .= "\n\t\t\t</div>";
$body .= "\n\t\t</div>"; $body .= "\n\t\t</div>";
$body .= "\n\t<?php echo JHtml::_('bootstrap.endTab'); ?>"; $body .= "\n\t<?php echo JHtml::_('bootstrap.endTab'); ?>";
$body .= "\n\t<?php endif; ?>";
// make sure we dont load it to a view with the name component // make sure we dont load it to a view with the name component
if ($viewName_single != 'component') if ($viewName_single != 'component')
{ {
@ -13476,19 +13589,19 @@ class Compiler
$this->configFieldSets[] = "\t\t".'label="'.$lang.'_GLOBAL_LABEL"'; $this->configFieldSets[] = "\t\t".'label="'.$lang.'_GLOBAL_LABEL"';
$this->configFieldSets[] = "\t\t".'description="'.$lang.'_GLOBAL_DESC">'; $this->configFieldSets[] = "\t\t".'description="'.$lang.'_GLOBAL_DESC">';
// set application update License Key // set application update License Key
if ($this->componentData->add_license) if ($this->componentData->add_license && 1 != $this->componentData->license_type)
{ {
// set licence type switch // set licence type switch
switch ($this->componentData->license_type) switch ($this->componentData->license_type)
{ {
case 1: case 2:
// for updates // for updates
$this->langContent[$this->lang][$lang.'_LICENSE_KEY_NOTE_LABEL']= "Your License Key"; $this->langContent[$this->lang][$lang.'_LICENSE_KEY_NOTE_LABEL']= "Your License Key";
$this->langContent[$this->lang][$lang.'_LICENSE_KEY_NOTE_DESC'] = "To get updates you must add the license key here that you recieved from ".$this->componentData->companyname; $this->langContent[$this->lang][$lang.'_LICENSE_KEY_NOTE_DESC'] = "To get updates you must add the license key here that you recieved from ".$this->componentData->companyname;
// set the field // set the field
$this->configFieldSets[] = "\t\t".'<field type="note" name="license_key_note" class="alert alert-info" label="'.$lang.'_LICENSE_KEY_NOTE_LABEL" description="'.$lang.'_LICENSE_KEY_NOTE_DESC" />'; $this->configFieldSets[] = "\t\t".'<field type="note" name="license_key_note" class="alert alert-info" label="'.$lang.'_LICENSE_KEY_NOTE_LABEL" description="'.$lang.'_LICENSE_KEY_NOTE_DESC" />';
break; break;
case 2: case 3:
// with vdm to lock down ownership // with vdm to lock down ownership
$this->langContent[$this->lang][$lang.'_LICENSE_KEY_NOTE_LABEL']= "Your License Key"; $this->langContent[$this->lang][$lang.'_LICENSE_KEY_NOTE_LABEL']= "Your License Key";
$this->langContent[$this->lang][$lang.'_LICENSE_KEY_NOTE_DESC'] = "To use this component you must add the license key here that you recieved from ".$this->componentData->companyname; $this->langContent[$this->lang][$lang.'_LICENSE_KEY_NOTE_DESC'] = "To use this component you must add the license key here that you recieved from ".$this->componentData->companyname;
@ -14214,10 +14327,10 @@ for developing fast and powerful web interfaces. For more info visit <a href=\"h
if (isset($this->advancedEncryption) && $this->advancedEncryption) if (isset($this->advancedEncryption) && $this->advancedEncryption)
{ {
// set field lang // set field lang
$this->langContent[$this->lang][$lang.'_VDM_KEY_LABEL'] = "VDM Key <small>(advanced encryption)</small>"; $this->langContent[$this->lang][$lang.'_VDM_KEY_LABEL'] = "Advanced Key <small>(advanced encryption)</small>";
$this->langContent[$this->lang][$lang.'_VDM_KEY_DESC'] = "Add the VDM public key here."; $this->langContent[$this->lang][$lang.'_VDM_KEY_DESC'] = "Add the advanced key here.";
$this->langContent[$this->lang][$lang.'_VDM_KEY_NOTE_LABEL'] = "Advanced Encryption"; $this->langContent[$this->lang][$lang.'_VDM_KEY_NOTE_LABEL'] = "Advanced Encryption";
$this->langContent[$this->lang][$lang.'_VDM_KEY_NOTE_DESC'] = "When using the advanced encryption you need to get a VDM public key from https://www.vdm.io/encryption/<br />Never change this public key once it is set! <b>DATA WILL GET CORRUPTED IF YOU DO!</b>"; $this->langContent[$this->lang][$lang.'_VDM_KEY_NOTE_DESC'] = "When using the advanced encryption you need to get an advanced key from ".$this->componentData->companyname.".<br />Never change this advanced key once it is set! <b>DATA WILL GET CORRUPTED IF YOU DO!</b>";
// set the field // set the field
$this->configFieldSets[] = "\t\t".'<field type="note" name="vdm_key_note" class="alert alert-info" label="'.$lang.'_VDM_KEY_NOTE_LABEL" description="'.$lang.'_VDM_KEY_NOTE_DESC" />'; $this->configFieldSets[] = "\t\t".'<field type="note" name="vdm_key_note" class="alert alert-info" label="'.$lang.'_VDM_KEY_NOTE_LABEL" description="'.$lang.'_VDM_KEY_NOTE_DESC" />';
$this->configFieldSets[] = "\t\t".'<field name="advanced_key"'; $this->configFieldSets[] = "\t\t".'<field name="advanced_key"';
@ -15655,329 +15768,333 @@ for developing fast and powerful web interfaces. For more info visit <a href=\"h
protected function getAdminViewData($id) protected function getAdminViewData($id)
{ {
// Get a db connection. if (!isset($this->_adminViewData[$id]))
$db = JFactory::getDbo(); {
// Get a db connection.
$db = JFactory::getDbo();
// Create a new query object. // Create a new query object.
$query = $db->getQuery(true); $query = $db->getQuery(true);
$query->select('a.*'); $query->select('a.*');
$query->from('#__componentbuilder_admin_view AS a'); $query->from('#__componentbuilder_admin_view AS a');
$query->where($db->quoteName('a.id') . ' = '. (int) $id); $query->where($db->quoteName('a.id') . ' = '. (int) $id);
// Reset the query using our newly populated query object. // Reset the query using our newly populated query object.
$db->setQuery($query); $db->setQuery($query);
// Load the results as a list of stdClass objects (see later for more options on retrieving data). // Load the results as a list of stdClass objects (see later for more options on retrieving data).
$view = $db->loadObject(); $view = $db->loadObject();
// reset fields // reset fields
$view->fields = array(); $view->fields = array();
// setup view name to use in storing the data // setup view name to use in storing the data
$name_single = ComponentbuilderHelper::safeString($view->name_single); $name_single = ComponentbuilderHelper::safeString($view->name_single);
$name_list = ComponentbuilderHelper::safeString($view->name_list); $name_list = ComponentbuilderHelper::safeString($view->name_list);
// setup token check // setup token check
$this->customScriptBuilder['token'][$name_single] = false; $this->customScriptBuilder['token'][$name_single] = false;
$this->customScriptBuilder['token'][$name_list] = false; $this->customScriptBuilder['token'][$name_list] = false;
// load the values form params // load the values form params
$permissions = json_decode($view->addpermissions,true); $permissions = json_decode($view->addpermissions,true);
unset($view->addpermissions); unset($view->addpermissions);
$tabs = json_decode($view->addtabs,true); $tabs = json_decode($view->addtabs,true);
unset($view->addtabs); unset($view->addtabs);
$fields = json_decode($view->addfields,true); $fields = json_decode($view->addfields,true);
unset($view->addfields); unset($view->addfields);
$conditions = json_decode($view->addconditions,true); $conditions = json_decode($view->addconditions,true);
unset($view->addconditions); unset($view->addconditions);
$linked_views = json_decode($view->addlinked_views,true); $linked_views = json_decode($view->addlinked_views,true);
unset($view->addlinked_views); unset($view->addlinked_views);
$tables = json_decode($view->addtables,true); $tables = json_decode($view->addtables,true);
unset($view->addtables); unset($view->addtables);
// sort the values // sort the values
if (ComponentbuilderHelper::checkArray($tables)) if (ComponentbuilderHelper::checkArray($tables))
{
foreach ($tables as $option => $values)
{ {
foreach ($values as $nr => $value) foreach ($tables as $option => $values)
{ {
$view->tables[$nr][$option] = $value; foreach ($values as $nr => $value)
}
}
}
if (ComponentbuilderHelper::checkArray($tabs))
{
foreach ($tabs as $option => $values)
{
foreach ($values as $nr => $value)
{
$fix = $nr+1;
$view->tabs[$fix] = $value;
}
}
}
if (ComponentbuilderHelper::checkArray($permissions))
{
foreach ($permissions as $option => $values)
{
foreach ($values as $nr => $value)
{
$view->permissions[$nr][$option] = $value;
}
}
}
if (ComponentbuilderHelper::checkArray($fields))
{
foreach ($fields as $option => $values)
{
foreach ($values as $nr => $value)
{
$view->fields[$nr][$option] = (int) $value;
}
}
// sort the fields acording to order
usort($view->fields, function($a, $b)
{
if ($a['order_list'] != 0 && $b['order_list'] != 0)
{
return $a['order_list'] - $b['order_list'];
}
elseif ($b['order_list'] != 0 && $a['order_list'] == 0)
{
return 1;
}
elseif ($a['order_list'] != 0 && $b['order_list'] == 0)
{
return 0;
}
return 1;
});
// load the field data
foreach ($view->fields as $key => &$field)
{
$field['settings'] = $this->getFieldData($field['field'],$name_single,$name_list);
}
}
if (ComponentbuilderHelper::checkArray($conditions))
{
foreach ($conditions as $condition => $conditionValues)
{
foreach ($conditionValues as $nr => $conditionValue)
{
if ($condition == 'target_field')
{ {
if (ComponentbuilderHelper::checkArray($conditionValue) && ComponentbuilderHelper::checkArray($view->fields)) $view->tables[$nr][$option] = $value;
}
}
}
if (ComponentbuilderHelper::checkArray($tabs))
{
foreach ($tabs as $option => $values)
{
foreach ($values as $nr => $value)
{
$fix = $nr+1;
$view->tabs[$fix] = $value;
}
}
}
if (ComponentbuilderHelper::checkArray($permissions))
{
foreach ($permissions as $option => $values)
{
foreach ($values as $nr => $value)
{
$view->permissions[$nr][$option] = $value;
}
}
}
if (ComponentbuilderHelper::checkArray($fields))
{
foreach ($fields as $option => $values)
{
foreach ($values as $nr => $value)
{
$view->fields[$nr][$option] = (int) $value;
}
}
// sort the fields acording to order
usort($view->fields, function($a, $b)
{
if ($a['order_list'] != 0 && $b['order_list'] != 0)
{
return $a['order_list'] - $b['order_list'];
}
elseif ($b['order_list'] != 0 && $a['order_list'] == 0)
{
return 1;
}
elseif ($a['order_list'] != 0 && $b['order_list'] == 0)
{
return 0;
}
return 1;
});
// load the field data
foreach ($view->fields as $key => &$field)
{
$field['settings'] = $this->getFieldData($field['field'],$name_single,$name_list);
}
}
if (ComponentbuilderHelper::checkArray($conditions))
{
foreach ($conditions as $condition => $conditionValues)
{
foreach ($conditionValues as $nr => $conditionValue)
{
if ($condition == 'target_field')
{ {
foreach ($conditionValue as $fieldKey => $fieldId) if (ComponentbuilderHelper::checkArray($conditionValue) && ComponentbuilderHelper::checkArray($view->fields))
{ {
foreach ($view->fields as $fieldValues) foreach ($conditionValue as $fieldKey => $fieldId)
{ {
if ((int) $fieldValues['field'] == (int) $fieldId) foreach ($view->fields as $fieldValues)
{ {
// load the field details if ((int) $fieldValues['field'] == (int) $fieldId)
$required = ComponentbuilderHelper::getBetween($fieldValues['settings']->xml,'required="','"'); {
$required = ($required == true) ? 'yes' : 'no'; // load the field details
$filter = ComponentbuilderHelper::getBetween($fieldValues['settings']->xml,'filter="','"'); $required = ComponentbuilderHelper::getBetween($fieldValues['settings']->xml,'required="','"');
$filter = ComponentbuilderHelper::checkString($filter) ? $filter : 'none'; $required = ($required == true) ? 'yes' : 'no';
// get name $filter = ComponentbuilderHelper::getBetween($fieldValues['settings']->xml,'filter="','"');
$name = ComponentbuilderHelper::getBetween($fieldValues['settings']->xml,'name="','"'); $filter = ComponentbuilderHelper::checkString($filter) ? $filter : 'none';
$name = ComponentbuilderHelper::checkString($name) ? $name : $fieldValues['settings']->name; // get name
// get type $name = ComponentbuilderHelper::getBetween($fieldValues['settings']->xml,'name="','"');
$type = ComponentbuilderHelper::getBetween($fieldValues['settings']->xml,'type="','"'); $name = ComponentbuilderHelper::checkString($name) ? $name : $fieldValues['settings']->name;
$type = ComponentbuilderHelper::checkString($type) ? $type : $fieldValues['settings']->type_name; // get type
// set the field name $type = ComponentbuilderHelper::getBetween($fieldValues['settings']->xml,'type="','"');
$conditionValue[$fieldKey] = array( $type = ComponentbuilderHelper::checkString($type) ? $type : $fieldValues['settings']->type_name;
'name' => ComponentbuilderHelper::safeString($name), // set the field name
'type' => ComponentbuilderHelper::safeString($type), $conditionValue[$fieldKey] = array(
'required' => $required, 'name' => ComponentbuilderHelper::safeString($name),
'filter' => $filter 'type' => ComponentbuilderHelper::safeString($type),
); 'required' => $required,
break; 'filter' => $filter
);
break;
}
} }
} }
} }
} }
} if ($condition == 'match_field')
if ($condition == 'match_field')
{
foreach ($view->fields as $fieldValue)
{ {
if ((int) $fieldValue['field'] == (int) $conditionValue) foreach ($view->fields as $fieldValue)
{ {
// get name if ((int) $fieldValue['field'] == (int) $conditionValue)
$name = ComponentbuilderHelper::getBetween($fieldValue['settings']->xml,'name="','"'); {
$name = ComponentbuilderHelper::checkString($name) ? $name : $fieldValue['settings']->name; // get name
// get type $name = ComponentbuilderHelper::getBetween($fieldValue['settings']->xml,'name="','"');
$type = ComponentbuilderHelper::getBetween($fieldValue['settings']->xml,'type="','"'); $name = ComponentbuilderHelper::checkString($name) ? $name : $fieldValue['settings']->name;
$type = ComponentbuilderHelper::checkString($type) ? $type : $fieldValue['settings']->type_name; // get type
// set the field details $type = ComponentbuilderHelper::getBetween($fieldValue['settings']->xml,'type="','"');
$view->conditions[$nr]['match_name'] = ComponentbuilderHelper::safeString($name); $type = ComponentbuilderHelper::checkString($type) ? $type : $fieldValue['settings']->type_name;
$view->conditions[$nr]['match_type'] = ComponentbuilderHelper::safeString($type); // set the field details
$view->conditions[$nr]['match_xml'] = $fieldValue['settings']->xml; $view->conditions[$nr]['match_name'] = ComponentbuilderHelper::safeString($name);
break; $view->conditions[$nr]['match_type'] = ComponentbuilderHelper::safeString($type);
$view->conditions[$nr]['match_xml'] = $fieldValue['settings']->xml;
break;
}
} }
} }
// set condition values
$view->conditions[$nr][$condition] = $conditionValue;
} }
// set condition values
$view->conditions[$nr][$condition] = $conditionValue;
} }
} }
} // set linked views
// set linked views $linked_views_sorted = null;
$linked_views_sorted = null; if (ComponentbuilderHelper::checkArray($linked_views))
if (ComponentbuilderHelper::checkArray($linked_views))
{
$linked_views_sorted = array();
foreach ($linked_views as $option => $values)
{ {
foreach ($values as $nr => $value) $linked_views_sorted = array();
{ foreach ($linked_views as $option => $values)
$linked_views_sorted[$nr][$option] = $value;
}
}
}
unset($linked_views);
// setup linked views to global data sets
$this->linkedAdminViews[$name_single] = $linked_views_sorted;
unset($linked_views_sorted);
// add_javascript_view_file
if ($view->add_javascript_view_file == 1)
{
$view->javascript_view_file = base64_decode($view->javascript_view_file);
$this->customScriptBuilder['view_file'][$name_single] = $view->javascript_view_file;
if (strpos($view->javascript_view_file,"token") !== false && strpos($view->javascript_view_file,"task=ajax") !== false)
{
if (!$this->customScriptBuilder['token'][$name_single])
{
$this->customScriptBuilder['token'][$name_single] = true;
}
}
unset($view->javascript_view_file);
}
// add_javascript_view_footer
if ($view->add_javascript_view_footer == 1)
{
$view->javascript_view_footer = base64_decode($view->javascript_view_footer);
if (!isset($this->customScriptBuilder['view_footer'][$name_single]))
{
$this->customScriptBuilder['view_footer'][$name_single] = '';
}
$this->customScriptBuilder['view_footer'][$name_single] .= $view->javascript_view_footer;
if (strpos($view->javascript_view_footer,"token") !== false && strpos($view->javascript_view_footer,"task=ajax") !== false)
{
if (!$this->customScriptBuilder['token'][$name_single])
{
$this->customScriptBuilder['token'][$name_single] = true;
}
}
unset($view->javascript_view_footer);
}
// add_javascript_view_file
if ($view->add_javascript_views_file == 1)
{
$view->javascript_views_file = base64_decode($view->javascript_views_file);
$this->customScriptBuilder['views_file'][$name_list] = $view->javascript_views_file;
if (strpos($view->javascript_views_file,"token") !== false && strpos($view->javascript_views_file,"task=ajax") !== false)
{
if (!$this->customScriptBuilder['token'][$name_list])
{
$this->customScriptBuilder['token'][$name_list] = true;
}
}
unset($view->javascript_views_file);
}
// add_javascript_views_footer
if ($view->add_javascript_views_footer == 1)
{
$view->javascript_views_footer = base64_decode($view->javascript_views_footer);
$this->customScriptBuilder['views_footer'][$name_list] .= $view->javascript_views_footer;
if (strpos($view->javascript_views_footer,"token") !== false && strpos($view->javascript_views_footer,"task=ajax") !== false)
{
if (!$this->customScriptBuilder['token'][$name_list])
{
$this->customScriptBuilder['token'][$name_list] = true;
}
}
unset($view->javascript_views_footer);
}
// add_css_view
if ($view->add_css_view == 1)
{
$this->customScriptBuilder['css_view'][$name_single] .= base64_decode($view->css_view);
unset($view->css_view);
}
// add_css_views
if ($view->add_css_views == 1)
{
$this->customScriptBuilder['css_views'][$name_list] .= base64_decode($view->css_views);
unset($view->css_views);
}
$this->lang = 'admin';
$addArray = array('php_getitem','php_save','php_postsavehook','php_getitems','php_getlistquery','php_allowedit','php_before_delete','php_after_delete','php_batchcopy','php_batchmove');
foreach ($addArray as $scripter)
{
if (isset($view->{'add_'.$scripter}) && $view->{'add_'.$scripter} == 1)
{
$this->customScriptBuilder[$scripter][$name_single] = $this->setCustomContentLang(base64_decode($view->$scripter));
unset($view->$scripter);
}
}
// add_Ajax for this view
if ($view->add_php_ajax == 1)
{
$addAjaxSite = false;
if (isset($this->siteEditView[$id]) && $this->siteEditView[$id])
{
// we should add this site ajax to fron ajax
$addAjaxSite = true;
if (!isset($this->addSiteAjax) || !$this->addSiteAjax)
{
$this->addSiteAjax = true;
}
}
// check if controller input as been set
$ajax_input = json_decode($view->ajax_input,true);
if (ComponentbuilderHelper::checkArray($ajax_input))
{
foreach ($ajax_input as $option => $values)
{ {
foreach ($values as $nr => $value) foreach ($values as $nr => $value)
{ {
if ($addAjaxSite) $linked_views_sorted[$nr][$option] = $value;
{
$this->customScriptBuilder['site']['ajax_controller'][$name_single][$nr][$option] = $value;
}
$this->customScriptBuilder['admin']['ajax_controller'][$name_single][$nr][$option] = $value;
} }
} }
if ($addAjaxSite) }
unset($linked_views);
// setup linked views to global data sets
$this->linkedAdminViews[$name_single] = $linked_views_sorted;
unset($linked_views_sorted);
// add_javascript_view_file
if ($view->add_javascript_view_file == 1)
{
$view->javascript_view_file = base64_decode($view->javascript_view_file);
$this->customScriptBuilder['view_file'][$name_single] = $view->javascript_view_file;
if (strpos($view->javascript_view_file,"token") !== false && strpos($view->javascript_view_file,"task=ajax") !== false)
{ {
$this->customScriptBuilder['site']['ajax_model'][$name_single] = $this->setCustomContentLang(base64_decode($view->php_ajaxmethod)); if (!$this->customScriptBuilder['token'][$name_single])
{
$this->customScriptBuilder['token'][$name_single] = true;
}
} }
$this->customScriptBuilder['admin']['ajax_model'][$name_single] = $this->setCustomContentLang(base64_decode($view->php_ajaxmethod)); unset($view->javascript_view_file);
$this->addAjax = true;
unset($view->ajax_input);
} }
// unset anyway // add_javascript_view_footer
unset($view->php_ajaxmethod); if ($view->add_javascript_view_footer == 1)
}
// add_sql
if ($view->add_sql == 1)
{
if ($view->source == 1)
{ {
// build and add the SQL dump $view->javascript_view_footer = base64_decode($view->javascript_view_footer);
$this->customScriptBuilder['sql'][$name_single] = $this->buildSqlDump($view->tables,$name_single, $id); if (!isset($this->customScriptBuilder['view_footer'][$name_single]))
unset($view->tables); {
$this->customScriptBuilder['view_footer'][$name_single] = '';
}
$this->customScriptBuilder['view_footer'][$name_single] .= $view->javascript_view_footer;
if (strpos($view->javascript_view_footer,"token") !== false && strpos($view->javascript_view_footer,"task=ajax") !== false)
{
if (!$this->customScriptBuilder['token'][$name_single])
{
$this->customScriptBuilder['token'][$name_single] = true;
}
}
unset($view->javascript_view_footer);
} }
elseif ($view->source == 2) // add_javascript_view_file
if ($view->add_javascript_views_file == 1)
{ {
// add the SQL dump string $view->javascript_views_file = base64_decode($view->javascript_views_file);
$this->customScriptBuilder['sql'][$name_single] = base64_decode($view->sql); $this->customScriptBuilder['views_file'][$name_list] = $view->javascript_views_file;
unset($view->sql); if (strpos($view->javascript_views_file,"token") !== false && strpos($view->javascript_views_file,"task=ajax") !== false)
{
if (!$this->customScriptBuilder['token'][$name_list])
{
$this->customScriptBuilder['token'][$name_list] = true;
}
}
unset($view->javascript_views_file);
} }
// add_javascript_views_footer
if ($view->add_javascript_views_footer == 1)
{
$view->javascript_views_footer = base64_decode($view->javascript_views_footer);
$this->customScriptBuilder['views_footer'][$name_list] .= $view->javascript_views_footer;
if (strpos($view->javascript_views_footer,"token") !== false && strpos($view->javascript_views_footer,"task=ajax") !== false)
{
if (!$this->customScriptBuilder['token'][$name_list])
{
$this->customScriptBuilder['token'][$name_list] = true;
}
}
unset($view->javascript_views_footer);
}
// add_css_view
if ($view->add_css_view == 1)
{
$this->customScriptBuilder['css_view'][$name_single] .= base64_decode($view->css_view);
unset($view->css_view);
}
// add_css_views
if ($view->add_css_views == 1)
{
$this->customScriptBuilder['css_views'][$name_list] .= base64_decode($view->css_views);
unset($view->css_views);
}
$this->lang = 'admin';
$addArray = array('php_getitem','php_save','php_postsavehook','php_getitems','php_getlistquery','php_allowedit','php_before_delete','php_after_delete','php_batchcopy','php_batchmove');
foreach ($addArray as $scripter)
{
if (isset($view->{'add_'.$scripter}) && $view->{'add_'.$scripter} == 1)
{
$this->customScriptBuilder[$scripter][$name_single] = $this->setCustomContentLang(base64_decode($view->$scripter));
unset($view->$scripter);
}
}
// add_Ajax for this view
if ($view->add_php_ajax == 1)
{
$addAjaxSite = false;
if (isset($this->siteEditView[$id]) && $this->siteEditView[$id])
{
// we should add this site ajax to fron ajax
$addAjaxSite = true;
if (!isset($this->addSiteAjax) || !$this->addSiteAjax)
{
$this->addSiteAjax = true;
}
}
// check if controller input as been set
$ajax_input = json_decode($view->ajax_input,true);
if (ComponentbuilderHelper::checkArray($ajax_input))
{
foreach ($ajax_input as $option => $values)
{
foreach ($values as $nr => $value)
{
if ($addAjaxSite)
{
$this->customScriptBuilder['site']['ajax_controller'][$name_single][$nr][$option] = $value;
}
$this->customScriptBuilder['admin']['ajax_controller'][$name_single][$nr][$option] = $value;
}
}
if ($addAjaxSite)
{
$this->customScriptBuilder['site']['ajax_model'][$name_single] = $this->setCustomContentLang(base64_decode($view->php_ajaxmethod));
}
$this->customScriptBuilder['admin']['ajax_model'][$name_single] = $this->setCustomContentLang(base64_decode($view->php_ajaxmethod));
$this->addAjax = true;
unset($view->ajax_input);
}
// unset anyway
unset($view->php_ajaxmethod);
}
// add_sql
if ($view->add_sql == 1)
{
if ($view->source == 1)
{
// build and add the SQL dump
$this->customScriptBuilder['sql'][$name_single] = $this->buildSqlDump($view->tables,$name_single, $id);
unset($view->tables);
}
elseif ($view->source == 2)
{
// add the SQL dump string
$this->customScriptBuilder['sql'][$name_single] = base64_decode($view->sql);
unset($view->sql);
}
}
$this->_adminViewData[$id] = $view;
} }
// return the found view data // return the found view data
return $view; return $this->_adminViewData[$id];
} }
protected function uniqueCode($code) protected function uniqueCode($code)

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage componentbuilder.php @subpackage componentbuilder.php
@ -780,7 +780,7 @@ abstract class ComponentbuilderHelper
foreach ($actions as $action) foreach ($actions as $action)
{ {
// set to use component default // set to use component default
$allow = true; $fallback= true;
if (self::checkObject($record) && isset($record->id) && $record->id > 0 && !in_array($action->name,$componentActions)) if (self::checkObject($record) && isset($record->id) && $record->id > 0 && !in_array($action->name,$componentActions))
{ {
// The record has been set. Check the record permissions. // The record has been set. Check the record permissions.
@ -796,13 +796,13 @@ abstract class ComponentbuilderHelper
{ {
$result->set($action->name, true); $result->set($action->name, true);
// set not to use component default // set not to use component default
$allow = false; $fallback= false;
} }
else else
{ {
$result->set($action->name, false); $result->set($action->name, false);
// set not to use component default // set not to use component default
$allow = false; $fallback= false;
} }
} }
elseif ($user->authorise($view.'edit.own', 'com_componentbuilder.'.$view.'.' . (int) $record->id)) elseif ($user->authorise($view.'edit.own', 'com_componentbuilder.'.$view.'.' . (int) $record->id))
@ -812,13 +812,13 @@ abstract class ComponentbuilderHelper
{ {
$result->set($action->name, true); $result->set($action->name, true);
// set not to use component default // set not to use component default
$allow = false; $fallback= false;
} }
else else
{ {
$result->set($action->name, false); $result->set($action->name, false);
// set not to use component default // set not to use component default
$allow = false; $fallback= false;
} }
} }
elseif ($user->authorise('core.edit.own', 'com_componentbuilder')) elseif ($user->authorise('core.edit.own', 'com_componentbuilder'))
@ -828,13 +828,13 @@ abstract class ComponentbuilderHelper
{ {
$result->set($action->name, true); $result->set($action->name, true);
// set not to use component default // set not to use component default
$allow = false; $fallback= false;
} }
else else
{ {
$result->set($action->name, false); $result->set($action->name, false);
// set not to use component default // set not to use component default
$allow = false; $fallback= false;
} }
} }
elseif ($user->authorise($view.'edit.own', 'com_componentbuilder')) elseif ($user->authorise($view.'edit.own', 'com_componentbuilder'))
@ -844,13 +844,13 @@ abstract class ComponentbuilderHelper
{ {
$result->set($action->name, true); $result->set($action->name, true);
// set not to use component default // set not to use component default
$allow = false; $fallback= false;
} }
else else
{ {
$result->set($action->name, false); $result->set($action->name, false);
// set not to use component default // set not to use component default
$allow = false; $fallback= false;
} }
} }
} }
@ -880,13 +880,13 @@ abstract class ComponentbuilderHelper
{ {
$result->set($action->name, true); $result->set($action->name, true);
// set not to use component default // set not to use component default
$allow = false; $fallback= false;
} }
else else
{ {
$result->set($action->name, false); $result->set($action->name, false);
// set not to use component default // set not to use component default
$allow = false; $fallback= false;
} }
} }
elseif ($user->authorise($view.'edit.own', 'com_componentbuilder.'.$views.'.category.' . (int) $record->catid)) elseif ($user->authorise($view.'edit.own', 'com_componentbuilder.'.$views.'.category.' . (int) $record->catid))
@ -896,13 +896,13 @@ abstract class ComponentbuilderHelper
{ {
$result->set($action->name, true); $result->set($action->name, true);
// set not to use component default // set not to use component default
$allow = false; $fallback= false;
} }
else else
{ {
$result->set($action->name, false); $result->set($action->name, false);
// set not to use component default // set not to use component default
$allow = false; $fallback= false;
} }
} }
elseif ($user->authorise('core.edit.own', 'com_componentbuilder')) elseif ($user->authorise('core.edit.own', 'com_componentbuilder'))
@ -912,13 +912,13 @@ abstract class ComponentbuilderHelper
{ {
$result->set($action->name, true); $result->set($action->name, true);
// set not to use component default // set not to use component default
$allow = false; $fallback= false;
} }
else else
{ {
$result->set($action->name, false); $result->set($action->name, false);
// set not to use component default // set not to use component default
$allow = false; $fallback= false;
} }
} }
elseif ($user->authorise($view.'edit.own', 'com_componentbuilder')) elseif ($user->authorise($view.'edit.own', 'com_componentbuilder'))
@ -928,21 +928,21 @@ abstract class ComponentbuilderHelper
{ {
$result->set($action->name, true); $result->set($action->name, true);
// set not to use component default // set not to use component default
$allow = false; $fallback= false;
} }
else else
{ {
$result->set($action->name, false); $result->set($action->name, false);
// set not to use component default // set not to use component default
$allow = false; $fallback= false;
} }
} }
} }
} }
} }
} }
// if allowed then fall back on component global settings // if allowed then fallback on component global settings
if ($allow) if ($fallback)
{ {
$result->set($action->name, $user->authorise($action->name, 'com_componentbuilder')); $result->set($action->name, $user->authorise($action->name, 'com_componentbuilder'));
} }

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage batch_.php @subpackage batch_.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage indenter.php @subpackage indenter.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage js.php @subpackage js.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage minify.php @subpackage minify.php

View File

@ -456,6 +456,7 @@ COM_COMPONENTBUILDER_COMPONENT_ADMINVIEWS_LABEL="Views"
COM_COMPONENTBUILDER_COMPONENT_ADMINVIEW_DESCRIPTION="Select an admin view" COM_COMPONENTBUILDER_COMPONENT_ADMINVIEW_DESCRIPTION="Select an admin view"
COM_COMPONENTBUILDER_COMPONENT_ADMINVIEW_LABEL="View" COM_COMPONENTBUILDER_COMPONENT_ADMINVIEW_LABEL="View"
COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS="Admin Views" COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS="Admin Views"
COM_COMPONENTBUILDER_COMPONENT_ADVANCED_ENCRYPTION_ONLY_TO_LOCK_DATA="Advanced encryption (only to lock data)"
COM_COMPONENTBUILDER_COMPONENT_ALL="All" COM_COMPONENTBUILDER_COMPONENT_ALL="All"
COM_COMPONENTBUILDER_COMPONENT_ARCHIVE="Archive" COM_COMPONENTBUILDER_COMPONENT_ARCHIVE="Archive"
COM_COMPONENTBUILDER_COMPONENT_ARROW_DOWN="Arrow Down" COM_COMPONENTBUILDER_COMPONENT_ARROW_DOWN="Arrow Down"
@ -662,7 +663,7 @@ COM_COMPONENTBUILDER_COMPONENT_LICENSE_HINT="Add License Here"
COM_COMPONENTBUILDER_COMPONENT_LICENSE_LABEL="License" COM_COMPONENTBUILDER_COMPONENT_LICENSE_LABEL="License"
COM_COMPONENTBUILDER_COMPONENT_LICENSE_TYPE="License Type" COM_COMPONENTBUILDER_COMPONENT_LICENSE_TYPE="License Type"
COM_COMPONENTBUILDER_COMPONENT_LICENSE_TYPE_DESCRIPTION="How should the license be implemented." COM_COMPONENTBUILDER_COMPONENT_LICENSE_TYPE_DESCRIPTION="How should the license be implemented."
COM_COMPONENTBUILDER_COMPONENT_LICENSE_TYPE_LABEL="License Implementation" COM_COMPONENTBUILDER_COMPONENT_LICENSE_TYPE_LABEL="Implementation"
COM_COMPONENTBUILDER_COMPONENT_LINK="Link" COM_COMPONENTBUILDER_COMPONENT_LINK="Link"
COM_COMPONENTBUILDER_COMPONENT_LINK_DESCRIPTION="Enter menu link" COM_COMPONENTBUILDER_COMPONENT_LINK_DESCRIPTION="Enter menu link"
COM_COMPONENTBUILDER_COMPONENT_LINK_HINT="Menu Link Here" COM_COMPONENTBUILDER_COMPONENT_LINK_HINT="Menu Link Here"
@ -1876,7 +1877,7 @@ COM_COMPONENTBUILDER_FIELD_ADD_JAVASCRIPT_VIEWS_FOOTER="Add Javascript Views Foo
COM_COMPONENTBUILDER_FIELD_ADD_JAVASCRIPT_VIEWS_FOOTER_LABEL="Add JavaScript (views-footer)" COM_COMPONENTBUILDER_FIELD_ADD_JAVASCRIPT_VIEWS_FOOTER_LABEL="Add JavaScript (views-footer)"
COM_COMPONENTBUILDER_FIELD_ADD_JAVASCRIPT_VIEW_FOOTER="Add Javascript View Footer" COM_COMPONENTBUILDER_FIELD_ADD_JAVASCRIPT_VIEW_FOOTER="Add Javascript View Footer"
COM_COMPONENTBUILDER_FIELD_ADD_JAVASCRIPT_VIEW_FOOTER_LABEL="Add JavaScript (view-footer)" COM_COMPONENTBUILDER_FIELD_ADD_JAVASCRIPT_VIEW_FOOTER_LABEL="Add JavaScript (view-footer)"
COM_COMPONENTBUILDER_FIELD_ADVANCE_ENCRYPTION_VDMKEY="Advance Encryption (VDM-key)" COM_COMPONENTBUILDER_FIELD_ADVANCE_ENCRYPTION_WHMCSKEY="Advance Encryption (WHMCS-key)"
COM_COMPONENTBUILDER_FIELD_BASESIXTY_FOUR="base64" COM_COMPONENTBUILDER_FIELD_BASESIXTY_FOUR="base64"
COM_COMPONENTBUILDER_FIELD_BASIC_ENCRYPTION_LOCALKEY="Basic Encryption (local-key)" COM_COMPONENTBUILDER_FIELD_BASIC_ENCRYPTION_LOCALKEY="Basic Encryption (local-key)"
COM_COMPONENTBUILDER_FIELD_BIGINT="BIGINT" COM_COMPONENTBUILDER_FIELD_BIGINT="BIGINT"

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage css_fullwidth.php @subpackage css_fullwidth.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage fields_fullwidth.php @subpackage fields_fullwidth.php
@ -29,7 +29,7 @@
defined('_JEXEC') or die('Restricted access'); defined('_JEXEC') or die('Restricted access');
// set the defaults // set the defaults
$items = $displayData->vbqfields; $items = $displayData->ujafields;
$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

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage javascript_fullwidth.php @subpackage javascript_fullwidth.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage mysql_fullwidth.php @subpackage mysql_fullwidth.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage mysql_left.php @subpackage mysql_left.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage php_fullwidth.php @subpackage php_fullwidth.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage publishing.php @subpackage publishing.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage publlshing.php @subpackage publlshing.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage settings_above.php @subpackage settings_above.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage settings_left.php @subpackage settings_left.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage settings_right.php @subpackage settings_right.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage settings_under.php @subpackage settings_under.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage batchselection.php @subpackage batchselection.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage admin_views_fullwidth.php @subpackage admin_views_fullwidth.php
@ -29,7 +29,7 @@
defined('_JEXEC') or die('Restricted access'); defined('_JEXEC') or die('Restricted access');
// set the defaults // set the defaults
$items = $displayData->qbbadmin_views; $items = $displayData->qudadmin_views;
$user = JFactory::getUser(); $user = JFactory::getUser();
$id = $displayData->item->id; $id = $displayData->item->id;
$edit = "index.php?option=com_componentbuilder&view=admin_views&task=admin_view.edit"; $edit = "index.php?option=com_componentbuilder&view=admin_views&task=admin_view.edit";

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage details_above.php @subpackage details_above.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage details_left.php @subpackage details_left.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage details_right.php @subpackage details_right.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage details_under.php @subpackage details_under.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage publishing.php @subpackage publishing.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage publlshing.php @subpackage publlshing.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage readme_left.php @subpackage readme_left.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage readme_right.php @subpackage readme_right.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage scripts_fullwidth.php @subpackage scripts_fullwidth.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage settings_left.php @subpackage settings_left.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage settings_right.php @subpackage settings_right.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage site_views_fullwidth.php @subpackage site_views_fullwidth.php
@ -29,7 +29,7 @@
defined('_JEXEC') or die('Restricted access'); defined('_JEXEC') or die('Restricted access');
// set the defaults // set the defaults
$items = $displayData->qjisite_views; $items = $displayData->upjsite_views;
$user = JFactory::getUser(); $user = JFactory::getUser();
$id = $displayData->item->id; $id = $displayData->item->id;
$edit = "index.php?option=com_componentbuilder&view=site_views&task=site_view.edit"; $edit = "index.php?option=com_componentbuilder&view=site_views&task=site_view.edit";

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage custom_buttons_fullwidth.php @subpackage custom_buttons_fullwidth.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage custom_buttons_left.php @subpackage custom_buttons_left.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage custom_script_fullwidth.php @subpackage custom_script_fullwidth.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage details_above.php @subpackage details_above.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage details_fullwidth.php @subpackage details_fullwidth.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage details_left.php @subpackage details_left.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage details_right.php @subpackage details_right.php

View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------------------------------/
@version 2.0.9 @version 2.0.9
@build 31st January, 2016 @build 15th February, 2016
@created 30th April, 2015 @created 30th April, 2015
@package Component Builder @package Component Builder
@subpackage details_rightside.php @subpackage details_rightside.php

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