moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make the close_window function better. Merged from MOODLE_17_STABLE.

Browse source
This commit is contained in:
tjhunt 2006-10-31 11:59:54 +00:00
parent d84d379e97
commit dfa924cc99
2 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lang/en_utf8/moodle.php
View file

@ -1047,6 +1047,7 @@ $string['periodending'] = 'Period ending ($a)';
$string['personalprofile'] = 'Personal profile'; $string['personalprofile'] = 'Personal profile';
$string['phone'] = 'Phone'; $string['phone'] = 'Phone';
$string['phpinfo'] = 'PHP info'; $string['phpinfo'] = 'PHP info';
$string['pleaseclose'] = 'Please close this window now.';
$string['pluginsetup'] = 'Setting up plugin tables'; $string['pluginsetup'] = 'Setting up plugin tables';
$string['policyagree'] = 'You must agree to this policy to continue using this site. Do you agree?'; $string['policyagree'] = 'You must agree to this policy to continue using this site. Do you agree?';
$string['policyagreement'] = 'Site Policy Agreement'; $string['policyagreement'] = 'Site Policy Agreement';

21
lib/weblib.php
View file

@ -690,15 +690,20 @@ function close_window_button($name='closewindow', $return=false) {
* Try and close the current window immediately using Javascript * Try and close the current window immediately using Javascript
*/ */
function close_window($delay=0) { function close_window($delay=0) {
echo '<script language="JavaScript" type="text/javascript">'."\n"; ?>
echo '<!--'."\n"; <script type="text/javascript">
if ($delay) { <!--
sleep($delay); function close_this_window() {
self.close();
} }
echo 'self.close();'."\n"; setTimeout("close_this_window()", <?php echo $delay * 1000 ?>);
echo '-->'."\n"; -->
echo '</script>'."\n"; </script>
exit; <noscript><center>
<?php print_string('pleaseclose') ?>
</center></noscript>
<?php
die;
} }