Index: trunk/globals.php =================================================================== diff -u -r415 -r418 --- trunk/globals.php (.../globals.php) (revision 415) +++ trunk/globals.php (.../globals.php) (revision 418) @@ -1176,6 +1176,12 @@ if( !function_exists('GetVar') ) { + /** + * @return string + * @param string $name + * @param bool $post_priority + * @desc Get's variable from http query + */ function GetVar($name, $post_priority = false) { if(!$post_priority) // follow gpc_order in php.ini Index: trunk/kernel/admin/include/toolbar/main_import.php =================================================================== diff -u -r348 -r418 --- trunk/kernel/admin/include/toolbar/main_import.php (.../main_import.php) (revision 348) +++ trunk/kernel/admin/include/toolbar/main_import.php (.../main_import.php) (revision 418) @@ -85,24 +85,13 @@ } } - function SetPercent(step_id, new_percent, current_rec, time_str) + function SetTotal(text, run_time) { - var step_element = document.getElementById(step_id); - step_element.innerHTML = new_percent; - - var add_element = document.getElementById(step_id+'_additional'); - - StepInfo[step_id]['current'] = current_rec; - add_element.innerHTML = '('+StepInfo[step_id]['current']+' of '+StepInfo[step_id]['total']+')'; - - var time_element = document.getElementById('total_time'); - time_element.innerHTML = time_str+'s'; - } - - function SetTotal(text) - { var txt = document.getElementById('import_totals'); if(txt) txt.innerHTML = text; + + var txt = document.getElementById('total_time'); + if(txt) txt.innerHTML = run_time; }