From: Janusz Dobrowolski Date: Mon, 28 Sep 2009 20:37:28 +0000 (+0000) Subject: Removed duplicated natsort function in inst_lang.php X-Git-Tag: v2.4.2~19^2~1194 X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=8941f62de41fe41c9ce6bf09c9fbd4e4eb847ea5;p=fa-stable.git Removed duplicated natsort function in inst_lang.php --- diff --git a/CHANGELOG.txt b/CHANGELOG.txt index a3107eb0..b64a88f6 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -25,6 +25,7 @@ $ /frontaccounting.php /installed_extensions.php /admin/create_coy.php /admin/inst_module.php + /admin/inst_lang.php /admin/db/maintenance_db.inc /applications/customers.php /applications/dimensions.php diff --git a/admin/inst_lang.php b/admin/inst_lang.php index 1020d770..9c8ea4b5 100644 --- a/admin/inst_lang.php +++ b/admin/inst_lang.php @@ -44,49 +44,6 @@ function check_data() return true; } -/** - * @return Returns the array sorted as required - * @param $aryData Array containing data to sort - * @param $strIndex name of column to use as an index - * @param $strSortBy Column to sort the array by - * @param $strSortType String containing either asc or desc [default to asc] - * @desc Naturally sorts an array using by the column $strSortBy - */ -function array_natsort($aryData, $strIndex, $strSortBy, $strSortType=false) -{ - // if the parameters are invalid - if (!is_array($aryData) || !$strIndex || !$strSortBy) - // return the array - return $aryData; - - // create our temporary arrays - $arySort = $aryResult = array(); - - // loop through the array - foreach ($aryData as $aryRow) - // set up the value in the array - $arySort[$aryRow[$strIndex]] = $aryRow[$strSortBy]; - - // apply the natural sort - natsort($arySort); - - // if the sort type is descending - if ($strSortType=="desc") - // reverse the array - arsort($arySort); - - // loop through the sorted and original data - foreach ($arySort as $arySortKey => $arySorted) - foreach ($aryData as $aryOriginal) - // if the key matches - if ($aryOriginal[$strIndex]==$arySortKey) - // add it to the output array - array_push($aryResult, $aryOriginal); - - // return the return - return $aryResult; -} - function write_lang() { global $path_to_root, $installed_languages, $dflt_lang;