WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

removed create_function

This commit is contained in:
Roland Gruber 2018-04-29 20:51:29 +02:00
parent ecb9cb2dfe
commit a9ac81352e
2 changed files with 100 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

151
lam/templates/3rdParty/pla/lib/functions.php vendored
View File

@ -876,90 +876,99 @@ function get_custom_file($index,$filename,$path) {
return $return; return $return;
} }
$masortSortBy = array();
/** /**
* Sort a multi dimensional array. * Sort a multi dimensional array.
* *
* @param array Multi demension array passed by reference * @param array Multi demension array passed by reference
* @param string Comma delimited string of sort keys. * @param string Comma delimited string of sort keys.
* @param boolean Whether to reverse sort. * @param boolean Whether to reverse sort.
* @return array Sorted multi demension array.
*/ */
function masort(&$data,$sortby,$rev=0) { function masort(&$data,$sortby,$rev=false) {
# if the array to sort is null or empty global $masortSortBy;
if (! $data) return; $masortSortBy = explode(',', $sortby);
foreach ($masortSortBy as $index => $value) {
$code = "\$c=0;\n"; if (!preg_match('/^[a-zA-z0-9_]+$/', $value)) {
unset($masortSortBy[$index]);
foreach (explode(',',$sortby) as $key) {
if (!preg_match('/^[a-zA-z0-9_]+$/', $key)) {
return;
} }
$code .= "if (is_object(\$a) || is_object(\$b)) {\n"; }
$masortSortBy = array_values($masortSortBy);
$code .= " if (is_array(\$a->$key)) {\n"; uasort($data, 'masortCallback');
$code .= " asort(\$a->$key);\n"; if ($rev) {
$code .= " \$aa = array_shift(\$a->$key);\n"; $data = array_reverse($data, true);
$code .= " } else\n"; }
$code .= " \$aa = \$a->$key;\n"; }
$code .= " if (is_array(\$b->$key)) {\n";
$code .= " asort(\$b->$key);\n";
$code .= " \$bb = array_shift(\$b->$key);\n";
$code .= " } else\n";
$code .= " \$bb = \$b->$key;\n";
$code .= " if (\$aa != \$bb)";
if ($rev)
$code .= " return (\$aa < \$bb ? 1 : -1);\n";
else
$code .= " return (\$aa > \$bb ? 1 : -1);\n";
$code .= "} else {\n";
$code .= " \$a = array_change_key_case(\$a);\n";
$code .= " \$b = array_change_key_case(\$b);\n";
/**
* Callback to sort for masort().
*
* @param array|object $a first parameter
* @param array|object $b second parameter
* @return int comparison result
*/
function masortCallback($a, $b) {
global $masortSortBy;
foreach ($masortSortBy as $key) {
if (is_object($a)) {
if (is_array($a->$key)) {
asort($a->$key);
$aa = array_shift($a->$key);
}
else {
$aa = $a->$key;
}
if (is_array($b->$key)) {
asort($b->$key);
$bb = array_shift($b->$key);
}
else {
$bb = $b->$key;
}
if ($aa != $bb) {
return ($aa > $bb ? 1 : -1);
}
}
else {
$a = array_change_key_case($a);
$b = array_change_key_case($b);
$key = strtolower($key); $key = strtolower($key);
$code .= " if ((! isset(\$a['$key'])) && isset(\$b['$key'])) return 1;\n"; if ((! isset($a[$key])) && isset($b[$key])) {
$code .= " if (isset(\$a['$key']) && (! isset(\$b['$key']))) return -1;\n"; return 1;
}
$code .= " if ((isset(\$a['$key'])) && (isset(\$b['$key']))) {\n"; if (isset($a[$key]) && (! isset($b[$key]))) {
$code .= " if (is_array(\$a['$key'])) {\n"; return -1;
$code .= " asort(\$a['$key']);\n"; }
$code .= " \$aa = array_shift(\$a['$key']);\n"; if ((isset($a[$key])) && (isset($b[$key]))) {
$code .= " } else\n"; if (is_array($a[$key])) {
$code .= " \$aa = \$a['$key'];\n"; asort($a[$key]);
$aa = array_shift($a[$key]);
$code .= " if (is_array(\$b['$key'])) {\n"; }
$code .= " asort(\$b['$key']);\n"; else {
$code .= " \$bb = array_shift(\$b['$key']);\n"; $aa = $a[$key];
$code .= " } else\n"; }
$code .= " \$bb = \$b['$key'];\n"; if (is_array($b[$key])) {
asort($b[$key]);
$code .= " if (\$aa != \$bb)\n"; $bb = array_shift($b[$key]);
$code .= " if (is_numeric(\$aa) && is_numeric(\$bb)) {\n"; }
else {
if ($rev) $bb = $b[$key];
$code .= " return (\$aa < \$bb ? 1 : -1);\n";
else
$code .= " return (\$aa > \$bb ? 1 : -1);\n";
$code .= " } else {\n";
if ($rev)
$code .= " if ( (\$c = strcasecmp(\$bb,\$aa)) != 0 ) return \$c;\n";
else
$code .= " if ( (\$c = strcasecmp(\$aa,\$bb)) != 0 ) return \$c;\n";
$code .= " }\n";
$code .= " }\n";
$code .= "}\n";
} }
$code .= 'return $c;'; if ($aa != $bb) {
if (is_numeric($aa) && is_numeric($bb)) {
uasort($data, create_function('$a, $b',$code)); return ($aa > $bb ? 1 : -1);
}
else {
if (($c = strcasecmp($aa,$bb)) != 0 ) {
return $c;
}
}
}
}
}
}
} }
/** /**

20
lam/tests/lib/3rdParty/pla/functionsTest.php vendored
View File

@ -132,6 +132,26 @@ class PlaFunctionsTest extends PHPUnit_Framework_TestCase {
$this->compareArray($dataWanted, $data); $this->compareArray($dataWanted, $data);
} }
public function test_masortObjectMultiSort() {
$data = array(
'a' => (object) ['key1' => '1'],
'b' => (object) ['key1' => '5', 'key2' => 3],
'c' => (object) ['key1' => '2'],
'd' => (object) ['key1' => '5', 'key2' => 1],
);
masort($data, 'key1,key2', 0);
$dataWanted = array(
'a' => (object) ['key1' => '1'],
'c' => (object) ['key1' => '2'],
'd' => (object) ['key1' => '5', 'key2' => 1],
'b' => (object) ['key1' => '5', 'key2' => 3],
);
$this->compareArray($dataWanted, $data);
}
private function compareArray($dataWanted, $dataNew) { private function compareArray($dataWanted, $dataNew) {
$this->assertEquals(sizeof($dataWanted), sizeof($dataNew)); $this->assertEquals(sizeof($dataWanted), sizeof($dataNew));
$keysWanted = array_keys($dataWanted); $keysWanted = array_keys($dataWanted);