joomla/Component-Builder
39
25
Fork 11
Code Issues 78 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;
}
/*