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

Trying to remove random variable changes per/build, or at least to cut it down in a major way.

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2016-02-26 15:57:30 +02:00
parent 2ecf186846
commit 15e3c82dd2
35 changed files with 1715 additions and 1674 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
admin/helpers/get.php
View File

@ -160,7 +160,14 @@ class Get
*
* @var array
*/
public $codes = array();
public $uniquecodes = array();
/*
* The unique keys
*
* @var array
*/
public $uniquekeys = array();
/*
* The Ad contributors Switch
@ -2319,13 +2326,47 @@ class Get
*/
public function uniqueCode($code)
{
if (!isset($this->codes[$this->target]) || !in_array($code,$this->codes[$this->target]))
if (!isset($this->uniquecodes[$this->target]) || !in_array($code,$this->uniquecodes[$this->target]))
{
$this->codes[$this->target][] = $code;
$this->uniquecodes[$this->target][] = $code;
return $code;
}
// make sure it is unique
return $this->uniqueCode($code.ComponentbuilderHelper::randomkey(1));
return $this->uniqueCode($code.$this->uniquekey(1));
}
/*
* Creating an unique local key
*
* @param int $size The key size
*
* @return string The unique localkey
*
*/
public function uniquekey($size, $random = false)
{
if ($random)
{
$bag = "abcefghijknopqrstuwxyzABCDDEFGHIJKLLMMNOPQRSTUVVWXYZabcddefghijkllmmnopqrstuvvwxyzABCEFGHIJKNOPQRSTUWXYZ";
}
else
{
$bag = "vvvvvvvvvvvvvvvvvvv";
}
$key = array();
$bagsize = strlen($bag) - 1;
for ($i = 0; $i < $size; $i++)
{
$get = rand(0, $bagsize);
$key[] = $bag[$get];
}
$key = implode($key);
while (in_array($key, $this->uniquekeys))
{
$key++;
}
$this->uniquekeys[] = $key;
return $key;
}
/*

14
admin/helpers/interpretation.php
View File

@ -127,7 +127,7 @@ class Interpretation extends Structure
{
if ($this->componentData->add_license && $this->componentData->license_type == 3)
{
$_VDM = '_'.ComponentbuilderHelper::safeString(ComponentbuilderHelper::randomkey(10),'U');
$_VDM = '_'.ComponentbuilderHelper::safeString($this->uniquekey(10),'U');
// add it to the system
$this->fileContentStatic['###HELPER_SITE_LICENSE_LOCK###'] = $this->setHelperLincenseLock($_VDM,'site');
$this->fileContentStatic['###HELPER_LICENSE_LOCK###'] = $this->setHelperLincenseLock($_VDM,'admin');
@ -149,7 +149,7 @@ class Interpretation extends Structure
if ($this->componentData->add_license && $this->componentData->license_type == 3)
{
$boolMethod = 'isHonest';
$globalbool = ComponentbuilderHelper::safeString(ComponentbuilderHelper::randomkey(4));
$globalbool = ComponentbuilderHelper::safeString($this->uniquekey(4));
// add it to the system
$this->fileContentDynamic[$view]['###LICENSE_LOCKED_SET_BOOL###'] = $this->setBoolLincenseLock($boolMethod,$globalbool);
$this->fileContentDynamic[$view]['###LICENSE_LOCKED_CHECK###'] = $this->checkStatmentLicenseLocked();
@ -5461,7 +5461,7 @@ class Interpretation extends Structure
// set identifiers
$linkedViewIdentifier[$linkedViewId] = $tabCodeName;
//set function name
$codeName = ComponentbuilderHelper::safeString(ComponentbuilderHelper::randomkey(3).$tabCodeName);
$codeName = ComponentbuilderHelper::safeString($this->uniquekey(3).$tabCodeName);
// set as items layout
$this->setLayout($viewName_single,$layoutCodeName,$codeName,'layoutlinkedview');
// set the lang to tab
@ -5814,7 +5814,7 @@ class Interpretation extends Structure
$_key = $key;
}
// set the global key
$globalKey = ComponentbuilderHelper::safeString($_key.ComponentbuilderHelper::randomkey(4));
$globalKey = ComponentbuilderHelper::safeString($_key.$this->uniquekey(4));
// ###LINKEDVIEWGLOBAL### <<<DYNAMIC>>>
$this->fileContentDynamic[$viewName_single]['###LINKEDVIEWGLOBAL###'] .= "\n\t\t\$this->".$globalKey." = \$item->".$parent_key.";";
// ###LINKEDVIEWMETHODS### <<<DYNAMIC>>>
@ -7108,7 +7108,7 @@ class Interpretation extends Structure
{
if (isset($condition['match_name']) && ComponentbuilderHelper::checkString($condition['match_name']))
{
$uniqueVar = ComponentbuilderHelper::randomkey(7);
$uniqueVar = $this->uniquekey(7);
$matchName = $condition['match_name'].'_'.$uniqueVar;
$targetBehavior = ($condition['target_behavior'] == 1) ? 'show' : 'hide';
$targetDefault = ($condition['target_behavior'] == 1) ? 'hide' : 'show';
@ -7592,7 +7592,7 @@ class Interpretation extends Structure
// set the required var
if($target['required'] == 'yes')
{
$unique = $uniqueVar.ComponentbuilderHelper::randomkey(3);
$unique = $uniqueVar.$this->uniquekey(3);
$bucket[$target['name']]['requiredVar'] = "jform_".$unique."_required = false;\n";
}
else
@ -8330,7 +8330,7 @@ class Interpretation extends Structure
{
$translation = true;
}
$function[] = "\n\tpublic function getThe".$filter['function']."Selections()";
$function[] = "\n\tprotected function getThe".$filter['function']."Selections()";
$function[] = "\t{";
$function[] = "\t\t//".$this->setLine(__LINE__)." Get a db connection.";
$function[] = "\t\t\$db = JFactory::getDbo();";