From 4ffdf60ac00d3b07a514b9238df6e7c86c465cad Mon Sep 17 00:00:00 2001 From: Nigel Cunningham Date: Wed, 6 Aug 2014 10:04:33 +1000 Subject: [PATCH] (Bug1353802) Show progress in title during bulkimport.php. admin/users/bulkimport.php works one file at a time, with a page reload for each user imported. It could probably do with a rewrite to be more like bulkdownload. For now, though, give the user an idea of the status via the page title. Change-Id: I8f41e1889d9071930d049e4f51769fa1e760963b Signed-off-by: Nigel Cunningham --- htdocs/admin/users/bulkimport.php | 6 +++++- htdocs/lib/htmloutput.php | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/htdocs/admin/users/bulkimport.php b/htdocs/admin/users/bulkimport.php index e569b28..71360fc 100644 --- a/htdocs/admin/users/bulkimport.php +++ b/htdocs/admin/users/bulkimport.php @@ -104,7 +104,11 @@ function meta_redirect() { $SESSION->set('bulkimport_failedusers', $FAILEDUSERS); $url = get_config('wwwroot') . '/admin/users/bulkimport.php'; - print_meta_redirect($url); + $failed = sizeof($FAILEDUSERS) ? ' (' . sizeof($FAILEDUSERS) . ' failed)' : ''; + $done = sizeof($FAILEDUSERS) + sizeof($ADDEDUSERS); + $total = $done + sizeof($LEAP2AFILES); + $title = "Completed {$done}/{$total}{$failed}"; + print_meta_redirect($title, $url); exit; } diff --git a/htdocs/lib/htmloutput.php b/htdocs/lib/htmloutput.php index 3ace78e..f21ce1e 100644 --- a/htdocs/lib/htmloutput.php +++ b/htdocs/lib/htmloutput.php @@ -128,8 +128,9 @@ function execute_javascript_and_close($js='') { exit; } -function print_meta_redirect($url) { +function print_meta_redirect($title, $url) { print ''; + print "$title"; print '

Please follow link!

'; } -- 2.1.0