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

fixed refreshing before PHP script stops execution

This commit is contained in:
Roland Gruber 2005-07-19 12:19:50 +00:00
parent f694cb93f4
commit aff8d46802
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lam/templates/massDoUpload.php
View File

@ -58,10 +58,11 @@ echo "<link rel=\"stylesheet\" type=\"text/css\" href=\"../style/layout.css\">\n
// create accounts // create accounts
$accounts = unserialize($_SESSION['ldap']->decrypt($_SESSION['mass_accounts'])); $accounts = unserialize($_SESSION['ldap']->decrypt($_SESSION['mass_accounts']));
if (($_SESSION['mass_counter'] < sizeof($accounts)) || !isset($_SESSION['mass_postActions']['finished'])) { if (($_SESSION['mass_counter'] < sizeof($accounts)) || !isset($_SESSION['mass_postActions']['finished'])) {
$maxTime = get_cfg_var('max_execution_time') - 5;
$refreshTime = get_cfg_var('max_execution_time') + 1;
$startTime = time(); $startTime = time();
echo "<meta http-equiv=\"refresh\" content=\"2; URL=massDoUpload.php\">\n"; $maxTime = get_cfg_var('max_execution_time') - 5;
if ($maxTime > 60) $maxTime = 60;
$refreshTime = $maxTime + 7;
echo "<meta http-equiv=\"refresh\" content=\"" . $refreshTime . "; URL=massDoUpload.php\">\n";
echo "</head>\n<body>\n"; echo "</head>\n<body>\n";
echo "<h1>" . _("LDAP upload in progress. Please wait.") . "</h1>\n"; echo "<h1>" . _("LDAP upload in progress. Please wait.") . "</h1>\n";
echo "<table align=\"center\" width=\"80%\" style=\"border-color: grey\" border=\"2\" cellspacing=\"0\" rules=\"none\">\n"; echo "<table align=\"center\" width=\"80%\" style=\"border-color: grey\" border=\"2\" cellspacing=\"0\" rules=\"none\">\n";
@ -70,7 +71,7 @@ if (($_SESSION['mass_counter'] < sizeof($accounts)) || !isset($_SESSION['mass_po
echo "</table>"; echo "</table>";
flush(); // send HTML to browser flush(); // send HTML to browser
// add accounts to LDAP // add accounts to LDAP
while (($_SESSION['mass_counter'] < sizeof($accounts)) && ($startTime + $maxTime > time())) { while (($_SESSION['mass_counter'] < sizeof($accounts)) && (($startTime + $maxTime) > time())) {
// create accounts as long as max_execution_time is not near // create accounts as long as max_execution_time is not near
$attrs = $accounts[$_SESSION['mass_counter']]; $attrs = $accounts[$_SESSION['mass_counter']];
$dn = $attrs['dn']; $dn = $attrs['dn'];
@ -101,7 +102,7 @@ if (($_SESSION['mass_counter'] < sizeof($accounts)) || !isset($_SESSION['mass_po
echo "<td bgcolor=\"grey\" width=\"" . (100 - $return['progress']) . "%\">&nbsp;</td></tr>\n"; echo "<td bgcolor=\"grey\" width=\"" . (100 - $return['progress']) . "%\">&nbsp;</td></tr>\n";
echo "</table>"; echo "</table>";
flush(); flush();
while (!isset($_SESSION['mass_postActions']['finished']) && ($startTime + $maxTime > time())) { while (!isset($_SESSION['mass_postActions']['finished']) && (($startTime + $maxTime) > time())) {
$return = doUploadPostActions($_SESSION['mass_scope'], $data, $_SESSION['mass_ids'], $_SESSION['mass_failed']); $return = doUploadPostActions($_SESSION['mass_scope'], $data, $_SESSION['mass_ids'], $_SESSION['mass_failed']);
if ($return['status'] == 'finished') { if ($return['status'] == 'finished') {
$_SESSION['mass_postActions']['finished'] = true; $_SESSION['mass_postActions']['finished'] = true;