Project

General

Profile

« Previous | Next » 

Revision 0641b626

Added by Steve Beaver over 8 years ago

Fixed #6931

View differences:

src/usr/local/www/status_filter_reload.php
75 75
}
76 76
if ($_POST['reloadfilter']) {
77 77
	send_event("filter reload");
78
	header("Location: status_filter_reload.php");
78
	header("Location: status_filter_reload.php?reloading=true");
79 79
	exit;
80 80
}
81 81
if ($_POST['syncfilter']) {
......
87 87
include("head.inc");
88 88
?>
89 89

  
90

  
91 90
<div class="panel panel-default">
92 91
	<div class="panel-heading"><h2 class="panel-title"><?=gettext("Filter Reload");?></h2></div>
93 92
	<div class="panel-body">
......
101 100
endif;
102 101
?>
103 102
			</form>
104

  
105 103
			<br />
106

  
107
			<div id="status" class="panel panel-default">
108
				<?=$status; ?>
109
			</div>
110

  
111
			<div id="doneurl">
112
			</div>
113

  
104
			<div id="status"></div>
105
			<div id="doneurl"></div>
114 106
			<br/>
115 107

  
108
<?php if ($_GET['reloading']) { ?>
116 109
			<div id="reloadinfo"><?=gettext("This page will automatically refresh every 3 seconds until the filter is done reloading."); ?></div>
110
<?php } ?>
117 111

  
118 112
		</div>
119 113
	</div>
......
132 126
	result_text = result_text_split[1];
133 127
	result_text = result_text.replace("\n", "");
134 128
	result_text = result_text.replace("\r", "");
129

  
135 130
	if (result_text) {
136 131
		$('#status').html(result_text + '...');
137 132
	} else {
138 133
		$('#status').html('<?=gettext("Obtaining filter status...");?>');
139 134
	}
135

  
140 136
	if (result_text == "Initializing") {
141 137
		$('#status').html('<?=gettext("Initializing...");?>');
142 138
	} else if (result_text == "Done") {
143
		$('#status').effect('highlight');
139
		$('#status').addClass("alert alert-success");
144 140
		$('#status').html('<?=gettext("Done.  The filter rules have been reloaded.");?>');
145 141
		$('#reloadinfo').css("visibility", "hidden");
146 142
		$('#doneurl').css("visibility", "visible");
147 143
		$('#doneurl').html("<p><a href='status_queues.php'><?=gettext("Queue Status");?><\/a><\/p>");
148 144
	}
145

  
149 146
	window.setTimeout('update_status_thread()', 2500);
150 147
}
151 148
//]]>
......
195 192
					contentType : http_request.getResponseHeader("Content-Type") } );
196 193
			}
197 194
		}
195

  
198 196
		http_request.open('GET', url, true);
199 197
		http_request.send(null);
200 198
	}
201 199
}
202 200

  
203
window.setTimeout('update_status_thread()', 2500);
201
if ("<?=$_GET['reloading']?>" == "true") {
202
 	window.setTimeout('update_status_thread()', 2500);
203
 }
204 204
//]]>
205 205
</script>
206 206

  

Also available in: Unified diff