Projet

Général

Profil

« Précédent | Suivant » 

Révision 62424bdb

Ajouté par Renato Botelho il y a plus de 9 ans

Remove almost all calls to history.back() and make Cancel button back to HTTP_REFERER, there are a couple of places I didn't touch on this commit because it requires more work

Voir les différences:

usr/local/www/firewall_aliases_edit.php
51 51

  
52 52
$pgtitle = array(gettext("Firewall"),gettext("Aliases"),gettext("Edit"));
53 53

  
54
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/firewall_aliases.php');
55

  
54 56
// Keywords not allowed in names
55 57
$reserved_keywords = array("all", "pass", "block", "out", "queue", "max", "min", "pptp", "pppoe", "L2TP", "OpenVPN", "IPsec");
56 58

  
......
746 748
		<td width="22%" valign="top">&nbsp;</td>
747 749
		<td width="78%">
748 750
			<input id="submit" name="submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" />
749
			<input type="button" class="formbtn" value="<?=gettext("Cancel"); ?>" onclick="history.back()" />
751
			<input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
750 752
		</td>
751 753
	</tr>
752 754
</table>
usr/local/www/firewall_aliases_import.php
48 48

  
49 49
$pgtitle = array(gettext("Firewall"),gettext("Aliases"),gettext("Bulk import"));
50 50

  
51
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/firewall_aliases.php');
52

  
51 53
// Add all Load balance names to reserved_keywords
52 54
if (is_array($config['load_balancer']['lbpool']))
53 55
	foreach ($config['load_balancer']['lbpool'] as $lbpool)
......
207 209
		<td width="22%" valign="top">&nbsp;</td>
208 210
		<td width="78%">
209 211
			<input id="submit" name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" />
210
			<input class="formbtn" type="button" value="<?=gettext("Cancel"); ?>" onclick="history.back()" />
212
			<input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
211 213
		</td>
212 214
	</tr>
213 215
</table>
usr/local/www/firewall_nat_1to1_edit.php
44 44
require_once("filter.inc");
45 45
require("shaper.inc");
46 46

  
47
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/firewall_nat_1to1.php');
48

  
47 49
$specialsrcdst = explode(" ", "any pptp pppoe l2tp openvpn");
48 50
$ifdisp = get_configured_interface_with_descr();
49 51
foreach ($ifdisp as $kif => $kdescr) {
......
529 531
		<tr>
530 532
			<td width="22%" valign="top">&nbsp;</td>
531 533
			<td width="78%">
532
				<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" /> <input type="button" class="formbtn" value="<?=gettext("Cancel"); ?>" onclick="history.back()" />
534
				<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" />
535
				<input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
533 536
				<?php if (isset($id) && $a_1to1[$id]): ?>
534 537
				<input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
535 538
				<?php endif; ?>
usr/local/www/firewall_nat_edit.php
44 44
require_once("filter.inc");
45 45
require("shaper.inc");
46 46

  
47
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/firewall_nat.php');
48

  
47 49
$specialsrcdst = explode(" ", "any (self) pptp pppoe l2tp openvpn");
48 50
$ifdisp = get_configured_interface_with_descr();
49 51
foreach ($ifdisp as $kif => $kdescr) {
......
889 891
                <tr>
890 892
                  <td width="22%" valign="top">&nbsp;</td>
891 893
                  <td width="78%">
892
                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" /> <input type="button" class="formbtn" value="<?=gettext("Cancel"); ?>" onclick="history.back()" />
894
                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" />
895
                    <input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
893 896
                    <?php if (isset($id) && $a_nat[$id]): ?>
894 897
                    <input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
895 898
                    <?php endif; ?>
usr/local/www/firewall_nat_npt_edit.php
58 58
require_once("filter.inc");
59 59
require("shaper.inc");
60 60

  
61
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/firewall_nat_npt.php');
62

  
61 63
$ifdisp = get_configured_interface_with_descr();
62 64
foreach ($ifdisp as $kif => $kdescr) {
63 65
        $specialsrcdst[] = "{$kif}";
......
272 274
                <tr> 
273 275
                  <td width="22%" valign="top">&nbsp;</td>
274 276
                  <td width="78%"> 
275
                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" /> <input type="button" class="formbtn" value="<?=gettext("Cancel"); ?>" onclick="history.back()" />
277
                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" />
278
                    <input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
276 279
                    <?php if (isset($id) && $a_npt[$id]): ?>
277 280
                    <input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
278 281
                    <?php endif; ?>
usr/local/www/firewall_nat_out_edit.php
45 45
require_once("filter.inc");
46 46
require("shaper.inc");
47 47

  
48
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/firewall_nat_out.php');
49

  
48 50
if (!is_array($config['nat']['outbound']))
49 51
	$config['nat']['outbound'] = array();
50 52

  
......
822 824
		<tr>
823 825
			<td width="22%" valign="top">&nbsp;</td>
824 826
			<td width="78%">
825
				<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" /> <input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="history.back()" />
827
				<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" />
828
				<input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
826 829
<?php
827 830
			if (isset($id) && $a_out[$id]):
828 831
?>
usr/local/www/firewall_rules_edit.php
45 45
require_once("filter.inc");
46 46
require("shaper.inc");
47 47

  
48
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/firewall_rules.php');
49

  
48 50
function is_posnumericint($arg) {
49 51
	// Note that to be safe we do not allow any leading zero - "01", "007"
50 52
	return (is_numericint($arg) && $arg[0] != '0' && $arg > 0);
......
1251 1253
			<td width="22%" valign="top">&nbsp;</td>
1252 1254
			<td width="78%">
1253 1255
				&nbsp;<br />&nbsp;
1254
				<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" />  <input type="button" class="formbtn" value="<?=gettext("Cancel"); ?>" onclick="history.back()" />
1256
				<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" />
1257
				<input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
1255 1258
<?php			if (isset($id) && $a_filter[$id]): ?>
1256 1259
					<input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
1257 1260
<?php 			endif; ?>
......
1727 1730
			<td width="22%" valign="top">&nbsp;</td>
1728 1731
			<td width="78%">
1729 1732
				&nbsp;<br />&nbsp;
1730
				<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" />  <input type="button" class="formbtn" value="<?=gettext("Cancel"); ?>" onclick="history.back()" />
1733
				<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" />
1734
				<input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
1731 1735
<?php			if (isset($id) && $a_filter[$id]): ?>
1732 1736
					<input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
1733 1737
					<input name="tracker" type="hidden" value="<?=htmlspecialchars($pconfig['tracker']);?>">
usr/local/www/firewall_schedule_edit.php
60 60

  
61 61
$pgtitle = array(gettext("Firewall"),gettext("Schedules"),gettext("Edit"));
62 62

  
63
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/firewall_schedule.php');
64

  
63 65
$dayArray = array (gettext('Mon'),gettext('Tues'),gettext('Wed'),gettext('Thur'),gettext('Fri'),gettext('Sat'),gettext('Sun'));
64 66
$monthArray = array (gettext('January'),gettext('February'),gettext('March'),gettext('April'),gettext('May'),gettext('June'),gettext('July'),gettext('August'),gettext('September'),gettext('October'),gettext('November'),gettext('December'));
65 67

  
......
1163 1165
				    <td width="15%" valign="top">&nbsp;</td>
1164 1166
				    <td width="85%">
1165 1167
				      <input id="submit" name="submit" type="submit" onclick="return checkForRanges();" class="formbtn" value="<?=gettext("Save"); ?>" />
1166
				      <input id="cancelbutton" name="cancelbutton" type="button" class="formbtn" value="<?=gettext("Cancel"); ?>" onclick="history.back()" />
1168
				      <input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
1167 1169
				      <?php if (isset($id) && $a_schedules[$id]): ?>
1168 1170
				      <input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
1169 1171
				      <?php endif; ?>
usr/local/www/firewall_virtual_ip_edit.php
53 53
require_once("filter.inc");
54 54
require("shaper.inc");
55 55

  
56
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/firewall_virtual_ip.php');
57

  
56 58
if (!is_array($config['virtualip']['vip'])) {
57 59
        $config['virtualip']['vip'] = array();
58 60
}
......
470 472
                <tr>
471 473
                  <td width="22%" valign="top">&nbsp;</td>
472 474
                  <td width="78%">
473
                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" /> <input type="button" class="formbtn" value="<?=gettext("Cancel"); ?>" onclick="history.back()" />
475
                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" />
476
                    <input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
474 477
                    <?php if (isset($id) && $a_vip[$id]): ?>
475 478
                    <input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
476 479
                    <?php endif; ?>
usr/local/www/interfaces.php
54 54
require_once("vpn.inc");
55 55
require_once("xmlparse_attr.inc");
56 56

  
57
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/interfaces.php');
58

  
57 59
// Get configured interface list
58 60
$ifdescrs = get_configured_interface_with_descr(false, true);
59 61

  
......
3296 3298
							<td width="78%">
3297 3299
								<br />
3298 3300
								<input id="save" name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" />
3299
								<input id="cancel" type="button" class="formbtn" value="<?=gettext("Cancel"); ?>" onclick="history.back()" />
3301
								<input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
3300 3302
								<input name="if" type="hidden" id="if" value="<?=htmlspecialchars($if);?>" />
3301 3303
								<?php if ($wancfg['if'] == $a_ppps[$pppid]['if']) : ?>
3302 3304
								<input name="ppp_port" type="hidden" value="<?=htmlspecialchars($pconfig['port']);?>" />
usr/local/www/interfaces_bridge_edit.php
40 40

  
41 41
require("guiconfig.inc");
42 42

  
43
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/interfaces_bridge.php');
44

  
43 45
if (!is_array($config['bridges']['bridged']))
44 46
	$config['bridges']['bridged'] = array();
45 47

  
......
598 600
                  <td width="22%" valign="top">&nbsp;</td>
599 601
                  <td width="78%">
600 602
		    <input type="hidden" name="bridgeif" value="<?=htmlspecialchars($pconfig['bridgeif']); ?>" />
601
                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" /> <input type="button" value="<?=gettext("Cancel"); ?>" onclick="history.back()" />
603
                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" />
604
                    <input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
602 605
                    <?php if (isset($id) && $a_bridges[$id]): ?>
603 606
                    <input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
604 607
                    <?php endif; ?>
usr/local/www/interfaces_gif_edit.php
40 40

  
41 41
require("guiconfig.inc");
42 42

  
43
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/interfaces_gif.php');
44

  
43 45
if (!is_array($config['gifs']['gif']))
44 46
	$config['gifs']['gif'] = array();
45 47

  
......
227 229
                  <td width="22%" valign="top">&nbsp;</td>
228 230
                  <td width="78%">
229 231
		    <input type="hidden" name="gifif" value="<?=htmlspecialchars($pconfig['gifif']); ?>" />
230
                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" /> <input type="button" value="<?=gettext("Cancel"); ?>" onclick="history.back()" />
232
                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" />
233
                    <input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
231 234
                    <?php if (isset($id) && $a_gifs[$id]): ?>
232 235
                    <input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
233 236
                    <?php endif; ?>
usr/local/www/interfaces_gre_edit.php
41 41
require("guiconfig.inc");
42 42
require_once("functions.inc");
43 43

  
44
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/interfaces_gre.php');
45

  
44 46
if (!is_array($config['gres']['gre']))
45 47
	$config['gres']['gre'] = array();
46 48

  
......
230 232
                  <td width="22%" valign="top">&nbsp;</td>
231 233
                  <td width="78%">
232 234
		    <input type="hidden" name="greif" value="<?=htmlspecialchars($pconfig['greif']); ?>" />
233
                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" /> <input type="button" value="<?=gettext("Cancel");?>" onclick="history.back()" />
235
                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" />
236
                    <input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
234 237
                    <?php if (isset($id) && $a_gres[$id]): ?>
235 238
                    <input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
236 239
                    <?php endif; ?>
usr/local/www/interfaces_lagg_edit.php
40 40

  
41 41
require("guiconfig.inc");
42 42

  
43
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/interfaces_lagg.php');
44

  
43 45
if (!is_array($config['laggs']['lagg']))
44 46
	$config['laggs']['lagg'] = array();
45 47

  
......
229 231
                  <td width="22%" valign="top">&nbsp;</td>
230 232
                  <td width="78%">
231 233
				    <input type="hidden" name="laggif" value="<?=htmlspecialchars($pconfig['laggif']); ?>" />
232
                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" /> <input type="button" value="<?=gettext("Cancel"); ?>" onclick="history.back()" />
234
                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" />
235
                    <input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
233 236
                    <?php if (isset($id) && $a_laggs[$id]): ?>
234 237
                    <input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
235 238
                    <?php endif; ?>
usr/local/www/interfaces_ppps_edit.php
44 44
require("guiconfig.inc");
45 45
require("functions.inc");
46 46

  
47
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/interfaces_ppps.php');
48

  
47 49
define("CRON_MONTHLY_PATTERN", "0 0 1 * *");
48 50
define("CRON_WEEKLY_PATTERN", "0 0 * * 0");
49 51
define("CRON_DAILY_PATTERN", "0 0 * * *");
......
789 791
			<td width="22%" valign="top">&nbsp;</td>
790 792
			<td width="78%">
791 793
				<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" />
792
				<input type="button" value="<?=gettext("Cancel"); ?>" onclick="history.back()" />
794
				<input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
793 795
				<input name="ptpid" type="hidden" value="<?=htmlspecialchars($pconfig['ptpid']);?>" />
794 796
				<?php if (isset($id) && $a_ppps[$id]): ?>
795 797
					<input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
usr/local/www/interfaces_vlan_edit.php
41 41

  
42 42
require("guiconfig.inc");
43 43

  
44
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/interfaces_vlan.php');
45

  
44 46
if (!is_array($config['vlans']['vlan']))
45 47
	$config['vlans']['vlan'] = array();
46 48

  
......
197 199
                  <td width="22%" valign="top">&nbsp;</td>
198 200
                  <td width="78%">
199 201
		    <input type="hidden" name="vlanif" value="<?=htmlspecialchars($pconfig['vlanif']); ?>" />
200
                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" /> <input type="button" value="<?=gettext("Cancel");?>" onclick="history.back()" />
202
                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" />
203
                    <input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
201 204
                    <?php if (isset($id) && $a_vlans[$id]): ?>
202 205
                    <input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
203 206
                    <?php endif; ?>
usr/local/www/interfaces_wireless_edit.php
40 40

  
41 41
require("guiconfig.inc");
42 42

  
43
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/interfaces_wireless.php');
44

  
43 45
if (!is_array($config['wireless']))
44 46
	$config['wireless'] = array();
45 47
if (!is_array($config['wireless']['clone']))
......
195 197
                  <td width="22%" valign="top">&nbsp;</td>
196 198
                  <td width="78%">
197 199
                    <input type="hidden" name="cloneif" value="<?=htmlspecialchars($pconfig['cloneif']); ?>" />
198
                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" /> <input type="button" value="<?=gettext("Cancel");?>" onclick="history.back()" />
200
                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" />
201
                    <input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
199 202
                    <?php if (isset($id) && $a_clones[$id]): ?>
200 203
                    <input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
201 204
                    <?php endif; ?>
usr/local/www/load_balancer_monitor_edit.php
41 41

  
42 42
require("guiconfig.inc");
43 43

  
44
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/load_balancer_monitor.php');
45

  
44 46
if (!is_array($config['load_balancer']['monitor_type'])) {
45 47
	$config['load_balancer']['monitor_type'] = array();
46 48
}
......
352 354
		<tr align="left">
353 355
			<td width="22%" valign="top">&nbsp;</td>
354 356
			<td width="78%">
355
				<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" /><input type="button" class="formbtn" value="<?=gettext("Cancel"); ?>" onclick="history.back()" />
357
				<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" />
358
i				<input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
356 359
				<?php if (isset($id) && $a_monitor[$id]): ?>
357 360
				<input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
358 361
				<?php endif; ?>
usr/local/www/load_balancer_pool_edit.php
43 43
require_once("filter.inc");
44 44
require_once("util.inc");
45 45

  
46
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/load_balancer_pool.php');
47

  
46 48
if (!is_array($config['load_balancer']['lbpool'])) {
47 49
	$config['load_balancer']['lbpool'] = array();
48 50
}
......
329 331
			<td width="78%">
330 332
				<br />
331 333
				<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" onclick="AllServers('serversSelect', true); AllServers('serversDisabledSelect', true);" /> 
332
				<input type="button" class="formbtn" value="<?=gettext("Cancel"); ?>" onclick="history.back()" />
334
				<input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
333 335
				<?php if (isset($id) && $a_pool[$id] && $_GET['act'] != 'dup'): ?>
334 336
				<input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
335 337
				<?php endif; ?>
usr/local/www/load_balancer_relay_action_edit.php
40 40
##|-PRIV
41 41

  
42 42
require("guiconfig.inc");
43

  
44
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/load_balancer_relay_action.php');
45

  
43 46
if (!is_array($config['load_balancer']['lbaction'])) {
44 47
	$config['load_balancer']['lbaction'] = array();
45 48
}
......
551 554
		<tr align="left">
552 555
			<td width="22%" valign="top">&nbsp;</td>
553 556
			<td width="78%">
554
				<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>"><input type="button" class="formbtn" value="<?=gettext("Cancel"); ?>" onclick="history.back()">
557
				<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>">
558
				<input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
555 559
				<?php if (isset($id) && $a_action[$id] && $_GET['act'] != 'dup'): ?>
556 560
				<input name="id" type="hidden" value="<?=htmlspecialchars($id);?>">
557 561
				<?php endif; ?>
usr/local/www/load_balancer_relay_protocol_edit.php
41 41

  
42 42
require("guiconfig.inc");
43 43

  
44
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/load_balancer_relay_protocol.php');
45

  
44 46
if (!is_array($config['load_balancer']['lbprotocol'])) {
45 47
	$config['load_balancer']['lbprotocol'] = array();
46 48
}
......
275 277
		<tr align="left">
276 278
			<td width="22%" valign="top">&nbsp;</td>
277 279
			<td width="78%">
278
				<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" onClick="AllOptions($('lbaction'), true); AllOptions($('available_action'), false);"><input type="button" class="formbtn" value="<?=gettext("Cancel"); ?>" onclick="history.back()">
280
				<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" onClick="AllOptions($('lbaction'), true); AllOptions($('available_action'), false);">
281
				<input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
279 282
				<?php if (isset($id) && $a_protocol[$id] && $_GET['act'] != 'dup'): ?>
280 283
				<input name="id" type="hidden" value="<?=htmlspecialchars($id);?>">
281 284
				<?php endif; ?>
usr/local/www/load_balancer_virtual_server_edit.php
41 41

  
42 42
require("guiconfig.inc");
43 43

  
44
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/load_balancer_virtual_server.php');
45

  
44 46
if (!is_array($config['load_balancer']['virtual_server'])) {
45 47
        $config['load_balancer']['virtual_server'] = array();
46 48
}
......
273 275
                  <td width="22%" valign="top">&nbsp;</td>
274 276
                  <td align="left" valign="bottom" width="78%">
275 277
					<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Submit"); ?>" />
276
					<input type="button" class="formbtn" value="<?=gettext("Cancel"); ?>" onclick="history.back()" />
278
					<input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
277 279
			<?php if (isset($id) && $a_vs[$id] && $_GET['act'] != 'dup'): ?>
278 280
				<input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
279 281
			<?php endif; ?>
usr/local/www/pkg_edit.php
937 937
		echo "<input name='id' type='hidden' value=\"" . htmlspecialchars($id) . "\" />";
938 938
		echo "<input name='Submit' type='submit' class='formbtn' value=\"" . htmlspecialchars($savevalue) . "\" />\n{$pkg_buttons}\n";
939 939
		if (!$only_edit){
940
			echo "<input class='formbtn' type='button' value='".gettext("Cancel")."' onclick='history.back()' />";
940
			echo "<input class=\"formbtn\" type=\"button\" value=\"".gettext("Cancel")."\" onclick=\"window.location.href='" . $_SERVER['HTTP_REFERER'] . "'\" />";
941 941
			}
942 942
		?>
943 943
	</div>
usr/local/www/services_captiveportal_vouchers.php
46 46
require("captiveportal.inc");
47 47
require_once("voucher.inc");
48 48

  
49
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/services_captiveportal_vouchers.php');
50

  
49 51
$cpzone = $_GET['zone'];
50 52
if (isset($_POST['zone']))
51 53
        $cpzone = $_POST['zone'];
......
631 633
								<input type="hidden" name="zone" id="zone" value="<?=htmlspecialchars($cpzone);?>" />
632 634
								<input type="hidden" name="exponent" id="exponent" value="<?=$pconfig['exponent'];?>" />
633 635
								<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" onclick="enable_change(true); before_save();" />
634
								<input type="button" class="formbtn" value="<?=gettext("Cancel"); ?>" onclick="history.back()" />
636
								<input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
635 637
							</td>
636 638
						</tr>
637 639
						<tr>
usr/local/www/services_dhcp_edit.php
59 59

  
60 60
require("guiconfig.inc");
61 61

  
62
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/services_dhcp.php');
63

  
62 64
$if = $_GET['if'];
63 65
if ($_POST['if'])
64 66
	$if = $_POST['if'];
......
531 533
                <tr>
532 534
                  <td width="22%" valign="top">&nbsp;</td>
533 535
                  <td width="78%">
534
                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" /> <input class="formbtn" type="button" value="<?=gettext("Cancel");?>" onclick="history.back()" />
536
                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" />
537
                    <input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
535 538
                    <?php if (isset($id) && $a_maps[$id]): ?>
536 539
                    <input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
537 540
                    <?php endif; ?>
usr/local/www/services_dhcpv6_edit.php
53 53

  
54 54
require_once('globals.inc');
55 55

  
56
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/services_dhcpv6.php');
57

  
56 58
if(!$g['services_dhcp_server_enable']) {
57 59
	header("Location: /");
58 60
	exit;
......
243 245
                <tr> 
244 246
                  <td width="22%" valign="top">&nbsp;</td>
245 247
                  <td width="78%"> 
246
                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" /> <input class="formbtn" type="button" value="<?=gettext("Cancel");?>" onclick="history.back()" />
248
                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" />
249
                    <input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
247 250
                    <?php if (isset($id) && $a_maps[$id]): ?>
248 251
                    <input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
249 252
                    <?php endif; ?>
usr/local/www/services_dnsmasq_domainoverride_edit.php
40 40

  
41 41
require("guiconfig.inc");
42 42

  
43
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/services_dnsmasq.php');
44

  
43 45
if (!is_array($config['dnsmasq']['domainoverrides'])) {
44 46
       $config['dnsmasq']['domainoverrides'] = array();
45 47
}
......
158 160
                <tr>
159 161
                  <td width="22%" valign="top">&nbsp;</td>
160 162
                  <td width="78%">
161
                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" />  <input class="formbtn" type="button" value="<?=gettext("Cancel");?>" onclick="history.back()" />
163
                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" />
164
                    <input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
162 165
                    <?php if (isset($id) && $a_domainOverrides[$id]): ?>
163 166
                    <input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
164 167
                    <?php endif; ?>
usr/local/www/services_dnsmasq_edit.php
54 54

  
55 55
require("guiconfig.inc");
56 56

  
57
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/services_dnsmasq.php');
58

  
57 59
if (!is_array($config['dnsmasq']['hosts'])) 
58 60
	$config['dnsmasq']['hosts'] = array();
59 61

  
......
287 289
                <tr>
288 290
                  <td width="22%" valign="top">&nbsp;</td>
289 291
                  <td width="78%"> 
290
                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" /> <input class="formbtn" type="button" value="<?=gettext("Cancel");?>" onclick="history.back()" />
292
                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" />
293
                    <input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
291 294
                    <?php if (isset($id) && $a_hosts[$id]): ?>
292 295
                    <input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
293 296
                    <?php endif; ?>
usr/local/www/services_unbound_acls.php
32 32
require("guiconfig.inc");
33 33
require("unbound.inc");
34 34

  
35
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/services_unbound_acls.php');
36

  
35 37
if (!is_array($config['unbound']['acls']))
36 38
	$config['unbound']['acls'] = array();
37 39

  
......
302 304
							<td width="22%" valign="top">&nbsp;</td>
303 305
							<td width="78%">
304 306
								&nbsp;<br />&nbsp;
305
								<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" />  <input type="button" class="formbtn" value="<?=gettext("Cancel"); ?>" onclick="history.back()" />
307
								<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" />
308
								<input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
306 309
							</td>
307 310
						</tr>
308 311
					</table>
usr/local/www/services_unbound_domainoverride_edit.php
42 42

  
43 43
require("guiconfig.inc");
44 44

  
45
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/services_unbound.php');
46

  
45 47
if (!is_array($config['unbound']['domainoverrides']))
46 48
       $config['unbound']['domainoverrides'] = array();
47 49

  
......
153 155
            <tr>
154 156
                <td width="22%" valign="top">&nbsp;</td>
155 157
                <td width="78%">
156
                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" />  <input class="formbtn" type="button" value="<?=gettext("Cancel");?>" onclick="history.back()" />
158
                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" />
159
                    <input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
157 160
                    <?php if (isset($id) && $a_domainOverrides[$id]): ?>
158 161
                    <input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
159 162
                    <?php endif; ?>
usr/local/www/services_unbound_host_edit.php
41 41
##|*MATCH=services_unbound_host_edit.php*
42 42
##|-PRIV
43 43

  
44
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/services_unbound.php');
45

  
44 46
function hostcmp($a, $b) {
45 47
	return strcasecmp($a['host'], $b['host']);
46 48
}
......
291 293
			<tr>
292 294
				<td width="22%" valign="top">&nbsp;</td>
293 295
				<td width="78%">
294
					<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" /> <input class="formbtn" type="button" value="<?=gettext("Cancel");?>" onclick="history.back()" />
296
					<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" />
297
					<input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
295 298
					<?php if (isset($id) && $a_hosts[$id]): ?>
296 299
					<input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
297 300
					<?php endif; ?>
usr/local/www/services_wol_edit.php
51 51

  
52 52
require("guiconfig.inc");
53 53

  
54
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/services_wol.php');
55

  
54 56
if (!is_array($config['wol']['wolentry'])) {
55 57
	$config['wol']['wolentry'] = array();
56 58
}
......
155 157
                <tr>
156 158
                  <td width="22%" valign="top">&nbsp;</td>
157 159
                  <td width="78%"> 
158
                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" /> <input class="formbtn" type="button" value="<?=gettext("Cancel");?>" onclick="history.back()" />
160
                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" />
161
                    <input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
159 162
                    <?php if (isset($id) && $a_wol[$id]): ?>
160 163
                    <input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
161 164
                    <?php endif; ?>
usr/local/www/system_advanced_sysctl.php
45 45

  
46 46
require("guiconfig.inc");
47 47

  
48
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/system_advanced_sysctl.php');
49

  
48 50
if (!is_array($config['sysctl']['item']))
49 51
	$config['sysctl']['item'] = array();
50 52

  
......
256 258
								<td width="22%" valign="top">&nbsp;</td>
257 259
								<td width="78%">
258 260
									<input id="submit" name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" />
259
									<input id="cancelbutton" name="cancelbutton" type="button" class="formbtn" value="<?=gettext("Cancel"); ?>" onclick="history.back()" />
261
									<input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
260 262
									<?php if (isset($id) && $a_tunable[$id]): ?>
261 263
									<input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
262 264
									<?php endif; ?>
usr/local/www/system_gateway_groups_edit.php
43 43
require_once("ipsec.inc");
44 44
require_once("vpn.inc");
45 45

  
46
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/system_gateway_groups.php');
47

  
46 48
if (!is_array($config['gateways']['gateway_group']))
47 49
	$config['gateways']['gateway_group'] = array();
48 50

  
......
341 343
                <tr>
342 344
                  <td width="22%" valign="top">&nbsp;</td>
343 345
                  <td width="78%"> 
344
                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" /> <input type="button" value="<?=gettext("Cancel"); ?>" class="formbtn"  onclick="history.back()" />
346
                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" />
347
                    <input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
345 348
                    <?php if (isset($id) && $a_gateway_groups[$id]): ?>
346 349
                    <input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
347 350
                    <?php endif; ?>
usr/local/www/system_gateways_edit.php
42 42
require("guiconfig.inc");
43 43
require("pkg-utils.inc");
44 44

  
45
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/system_gateways.php');
46

  
45 47
$a_gateways = return_gateways_array(true, false, true);
46 48
$a_gateways_arr = array();
47 49
foreach($a_gateways as $gw) {
......
855 857
			<tr>
856 858
				<td width="22%" valign="top">&nbsp;</td>
857 859
				<td width="78%">
858
					<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" onclick="enable_change()" /> <input type="button" value="<?=gettext("Cancel");?>" class="formbtn"  onclick="history.back()" />
860
					<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" onclick="enable_change()" />
861
					<input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
859 862
					<?php if (isset($id) && $a_gateways[$id]): ?>
860 863
					<input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
861 864
					<?php endif; ?>
usr/local/www/system_hasync.php
41 41

  
42 42
require("guiconfig.inc");
43 43

  
44
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/system_hasync.php');
45

  
44 46
if (!is_array($config['hasync']))
45 47
	$config['hasync'] = array();
46 48

  
......
342 344
		<td width="78%">
343 345
			<input name="id" type="hidden" value="0" />
344 346
			<input name="Submit" type="submit" class="formbtn" value="Save" />
345
			<input class="formbtn" type="button" value="Cancel" onclick="history.back()" />
347
			<input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
346 348
		</td>
347 349
	</tr>
348 350
	</table>
usr/local/www/system_routes_edit.php
44 44
require_once("util.inc");
45 45
require_once("gwlb.inc");
46 46

  
47
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/system_routes.php');
48

  
47 49
if (!is_array($config['staticroutes']['route']))
48 50
	$config['staticroutes']['route'] = array();
49 51

  
......
326 328
			<tr>
327 329
				<td width="22%" valign="top">&nbsp;</td>
328 330
				<td width="78%">
329
					<input id="save" name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" /> <input id="cancel" type="button" value="<?=gettext("Cancel"); ?>" class="formbtn"  onclick="history.back()" />
331
					<input id="save" name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" />
332
					<input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
330 333
					<?php if (isset($id) && $a_routes[$id]): ?>
331 334
						<input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
332 335
					<?php endif; ?>
usr/local/www/vpn_l2tp_users_edit.php
54 54
require("guiconfig.inc");
55 55
require_once("vpn.inc");
56 56

  
57
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/vpn_l2tp_users.php');
58

  
57 59
if (!is_array($config['l2tp']['user'])) {
58 60
	$config['l2tp']['user'] = array();
59 61
}
......
177 179
                  <td width="22%" valign="top">&nbsp;</td>
178 180
                  <td width="78%">
179 181
                    <input id="submit" name="Submit" type="submit" class="formbtn" value="<?=gettext('Save');?>" />
180
                    <input id="cancelbutton" name="cancelbutton" type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="history.back()" />
182
                    <input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
181 183
                    <?php if (isset($id) && $a_secret[$id]): ?>
182 184
                    <input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
183 185
                    <?php endif; ?>

Formats disponibles : Unified diff