joomla/Component-Builder
39
25
Fork 11
Code Issues 75 Pull Requests Projects 4 Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

40
admin/helpers/componentbuilder.php
View File

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