maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

more function reducing and fixing

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2018-12-21 16:53:04 +01:00
parent 0a28ef2af6
commit a819d81ef2
21 changed files with 125 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
lib/functions/froxlor/function.version_compare2.php
View File

@@ -1,88 +0,0 @@
<?php
/**
* This file is part of the Froxlor project.
* Copyright (c) 2010 the Froxlor Team (see authors).
*
* For the full copyright and license information, please view the COPYING
* file that was distributed with this source code. You can also view the
* COPYING file online at http://files.froxlor.org/misc/COPYING.txt
*
* @copyright (c) the authors
* @author Michael Kaufmann <d00p@froxlor.org>
* @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
* @package Functions
*
*/
/**
* compare of froxlor versions
*
* @param string $a
* @param string $b
*
* @return integer 0 if equal, 1 if a>b and -1 if b>a
*/
function version_compare2($a, $b)
{
// split version into pieces and remove trailing .0
$a = explode(".", $a);
$b = explode(".", $b);
_parseVersionArray($a);
_parseVersionArray($b);
while (count($a) != count($b)) {
if (count($a) < count($b)) {
$a[] = '0';
} elseif (count($b) < count($a)) {
$b[] = '0';
}
}
foreach ($a as $depth => $aVal) {
// iterate over each piece of A
if (isset($b[$depth])) {
// if B matches A to this depth, compare the values
if ($aVal > $b[$depth]) {
return 1; // A > B
} else if ($aVal < $b[$depth]) {
return - 1; // B > A
}
// an equal result is inconclusive at this point
} else {
// if B does not match A to this depth, then A comes after B in sort order
return 1; // so A > B
}
}
// at this point, we know that to the depth that A and B extend to, they are equivalent.
// either the loop ended because A is shorter than B, or both are equal.
return (count($a) < count($b)) ? - 1 : 0;
}
function _parseVersionArray(&$arr = null)
{
// -svn or -dev or -rc ?
if (stripos($arr[count($arr) - 1], '-') !== false) {
$x = explode("-", $arr[count($arr) - 1]);
$arr[count($arr) - 1] = $x[0];
if (stripos($x[1], 'rc') !== false) {
$arr[] = '-1';
$arr[] = '2'; // rc > dev > svn
// number of rc
$arr[] = substr($x[1], 2);
} else if (stripos($x[1], 'dev') !== false) {
$arr[] = '-1';
$arr[] = '1'; // svn < dev < rc
// number of dev
$arr[] = substr($x[1], 3);
} // -svn version are deprecated
else if (stripos($x[1], 'svn') !== false) {
$arr[] = '-1';
$arr[] = '0'; // svn < dev < rc
// number of svn
$arr[] = substr($x[1], 3);
}
}
}

38
lib/functions/phphelpers/function.intval_ressource.php
View File

@@ -1,38 +0,0 @@
<?php
/**
* This file is part of the Froxlor project.
* Copyright (c) 2003-2009 the SysCP Team (see authors).
* Copyright (c) 2010 the Froxlor Team (see authors).
*
* For the full copyright and license information, please view the COPYING
* file that was distributed with this source code. You can also view the
* COPYING file online at http://files.froxlor.org/misc/COPYING.txt
*
* @copyright (c) the authors
* @author Florian Lippert <flo@syscp.org> (2003-2009)
* @author Froxlor team <team@froxlor.org> (2010-)
* @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
* @package Functions
*
*/
/**
* Returns an integer of the given value which isn't negative.
* Returns -1 if the given value was -1.
*
* @param
* any The value
* @return int The positive value
* @author Florian Lippert <flo@syscp.org>
*/
function intval_ressource($the_value)
{
$the_value = intval($the_value);
if ($the_value < 0 && $the_value != '-1') {
$the_value *= - 1;
}
return $the_value;
}