mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Firewall Schedule GUI! ... and there was much rejoicing.

Browse Source
This commit is contained in:
Scott Dale 2007-03-23 11:08:36 +00:00
parent ba393f6c45
commit 615b27bc26
6 changed files with 1171 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/inc/xmlparse.inc
View File

@ -35,7 +35,7 @@ function listtags() {
$ret = explode(" ", "element alias aliasurl allowedip cacert config columnitem disk dnsserver domainoverrides " .
"earlyshellcmd encryption-algorithm-option field fieldname hash-algorithm-option " .
"hosts group interface_array item key lbpool menu mobilekey mount onetoone option package passthrumac priv proxyarpnet " .
"queue pages pipe route row rule service servernat servers earlyshellcmd shellcmd staticmap subqueue " .
"queue pages pipe route row rule schedule service servernat servers earlyshellcmd shellcmd staticmap subqueue " .
"tunnel user vip virtual_server vlan winsserver wolentry depends_on_package");
return $ret;
}

1
usr/local/www/fbegin.inc
View File

@ -147,6 +147,7 @@ require_once("notices.inc");
<li><a href="/firewall_aliases.php" class="navlnk">Aliases</a></li>
<li><a href="/firewall_nat.php" class="navlnk">NAT</a></li>
<li><a href="/firewall_rules.php" class="navlnk">Rules</a></li>
<li><a href="/firewall_schedule.php" class="navlnk">Schedules</a></li>
<li><a href="/firewall_shaper.php" class="navlnk">Traffic Shaper</a></li>
<li><a href="/firewall_virtual_ip.php" class="navlnk">Virtual IPs</a></li>
<?php echo return_ext_menu("Firewall"); ?>

41
usr/local/www/firewall_rules_edit.php
View File

@ -100,6 +100,9 @@ if (isset($id) && $a_filter[$id]) {
/* Multi-WAN next-hop support */
$pconfig['gateway'] = $a_filter[$id]['gateway'];
//schedule support
$pconfig['sched'] = $a_filter[$id]['sched'];
} else {
/* defaults */
@ -320,6 +323,10 @@ if ($_POST) {
$filterent['gateway'] = $_POST['gateway'];
}
if ($_POST['sched'] != "") {
$filterent['sched'] = $_POST['sched'];
}
if (isset($id) && $a_filter[$id])
$a_filter[$id] = $filterent;
else {
@ -715,10 +722,42 @@ include("head.inc");
HINT: This prevents the rule from automatically syncing to other carp members.
</td>
</tr>
<?php
//build list of schedules
$schedules = array();
$schedules[] = "none";//leave none to leave rule enabled all the time
foreach ($config['schedules']['schedule'] as $schedule)
{
if ($schedule['name'] <> "")
$schedules[] = $schedule['name'];
}
?>
<tr>
<td width="22%" valign="top" class="vncell">Schedule</td>
<td width="78%" class="vtable">
<select name='sched'>
<?php
foreach($schedules as $schedule) {
if($schedule == $pconfig['sched']) {
$selected = " SELECTED";
} else {
$selected = "";
}
if ($schedule == "none") {
echo "<option value=\"\" {$selected}>{$schedule}</option>\n";
} else {
echo "<option value=\"{$schedule}\" {$selected}>{$schedule}</option>\n";
}
}?>
</select>
<p>Leave as 'none' to leave the rule enabled all the time.</p>
</td>
</tr>
<?php
/* build a list of gateways */
$gateways = array();
$gateways[] = "default"; // default to don't use this feature :)
$gateways[] = "default"; // default to don't use this feature :)
foreach($config['interfaces'] as $int) {
if($int['gateway'] <> "")
$gateways[]=$int['gateway'];

218
usr/local/www/firewall_schedule.php Normal file
View File

@ -0,0 +1,218 @@
<?php
/*
firewall_aliases.php
Copyright (C) 2004 Scott Ullrich
All rights reserved.
originially part of m0n0wall (http://m0n0.ch/wall)
Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
$pgtitle = "Firewall: Schedules";
$dayArray = array ('Sun','Mon','Tues','Wed','Thur','Fri','Sat');
$monthArray = array ('January','February','March','April','May','June','July','August','September','October','November','December');
require("guiconfig.inc");
if (!is_array($config['schedules']['schedule']))
$config['schedules']['schedule'] = array();
schedule_sort();
$a_schedules = &$config['schedules']['schedule'];
if ($_GET['act'] == "del") {
if ($a_schedules[$_GET['id']]) {
/* make sure rule is not being referenced by any nat or filter rules */
$is_schedule_referenced = false;
$referenced_by = false;
$schedule_name = $a_schedules[$_GET['id']]['name'];
if(is_array($config['filter']['rule'])) {
foreach($config['filter']['rule'] as $rule) {
//check for this later once this is established
if ($rule['sched'] = $schedule_name){
$referenced_by = $rule['descr'];
$is_schedule_referenced = true;
}
}
}
if($is_schedule_referenced == true) {
$savemsg = "Cannot delete Schedule. Currently in use by {$referenced_by}";
} else {
unset($a_schedules[$_GET['id']]);
write_config();
header("Location: firewall_schedule.php");
exit;
}
}
}
include("head.inc");
?>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
<p class="pgtitle"><?=$pgtitle?></p>
<?php if ($savemsg) print_info_box($savemsg); ?>
<form action="firewall_schedule.php" method="post">
<table class="sortable" width="98%" border="0" cellpadding="0" cellspacing="0">
<tr>
<td width="25%" class="listhdrr">Name</td>
<td width="35%" class="listhdrr">Time Range(s)</td>
<td width="35%" class="listhdr">Description</td>
<td width="5%" class="list sort_ignore"></td>
</tr>
<?php $i = 0; foreach ($a_schedules as $schedule): ?>
<tr>
<td class="listlr" ondblclick="document.location='firewall_schedule_edit.php?id=<?=$i;?>';">
<?=htmlspecialchars($schedule['name']);?>
</td>
<td class="listlr" ondblclick="document.location='firewall_schedule_edit.php?id=<?=$i;?>';">
<?php
$timerangearray = explode("||", $schedule['timerange']);
foreach($timerangearray as $timerange) {
$dayFriendly = "";
$firstday = true;
if ($timerange){
$daytimeseparator = strrpos($timerange, ",");
$tempID = substr($timerange, 0, $daytimeseparator+1);
$temptimerange = substr($timerange, $daytimeseparator+1);
$temptimeseparator = strrpos($temptimerange, "-");
$tempDayFriendly = "";
$starttime = substr ($temptimerange, 0, $temptimeseparator);
$stoptime = substr ($temptimerange, $temptimeseparator+1);
$tempdayRange = explode(",", $tempID);
foreach ($tempdayRange as $day)
{
if ($day != "")
{
$monthpos = strpos($day, "m");
if (!$monthpos)
{
if ($firstday){
$tempDayFriendly .= $day;
$firstday = false;
}
else
$tempDayFriendly .= "," . $day;
}
else
{
$daypos = strpos($day, "d");
$month = substr($day, $monthpos+1, $daypos-$monthpos-1);
$day = substr($day, $daypos+1);
$month = $monthArray[$month-1];
$dayFriendly .= $month . " " . $day . ", ";
}
}
}
$foundEnd = false;
$firstDayFound = false;
$firstprint = false;
$tempFriendlyDayArray = explode(",", $tempDayFriendly);
$currentDay = "";
$firstDay = "";
$nextDay = "";
$counter = 0;
foreach ($tempFriendlyDayArray as $day){
if ($day != ""){
if (!$firstDayFound)
{
$firstDay = $tempFriendlyDayArray[$counter];
$firstDayFound = true;
}
$currentDay =$tempFriendlyDayArray[$counter];
//get next day
$nextDay = $tempFriendlyDayArray[$counter+1];
$currentDay++;
if ($currentDay != $nextDay){
if ($firstprint)
$dayFriendly .= ", ";
$currentDay--;
if ($currentDay != $firstDay)
$dayFriendly .= $dayArray[$firstDay] . " - " . $dayArray[$currentDay];
else
$dayFriendly .= $dayArray[$firstDay];
$firstDayFound = false;
$firstprint = true;
}
$counter++;
}
}
$dayFriendly .= ": " . $starttime . "-" . $stoptime;
echo $dayFriendly;
echo "<br/>";
}
}?>
</td>
<td class="listbg" ondblclick="document.location='firewall_schedule_edit.php?id=<?=$i;?>';">
<font color="#FFFFFF">
<?=htmlspecialchars($schedule['descr']);?>&nbsp;
</td>
<td valign="middle" nowrap class="list">
<table border="0" cellspacing="0" cellpadding="1">
<tr>
<td valign="middle"><a href="firewall_schedule_edit.php?id=<?=$i;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" title="edit alias"></a></td>
<td><a href="firewall_schedule.php?act=del&id=<?=$i;?>" onclick="return confirm('Do you really want to delete this schedule?')"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" title="delete alias"></a></td>
</tr>
</table>
</td>
</tr>
<?php $i++; endforeach; ?>
<tr>
<td class="list" colspan="3"></td>
<td class="list">
<table border="0" cellspacing="0" cellpadding="1">
<tr>
<td valign="middle">
<a href="firewall_schedule_edit.php">
<img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" title="<?=gettext("add a new schedule");?>" alt="" />
</a>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td class="tabcont" colspan="3">
<p><span class="vexpl"><span class="red"><strong>Note:<br></strong></span>Schedules act as placeholders for time ranges to be used in Firewall Rules.</span></p>
</td>
</tr>
</table>
</form>
<?php include("fend.inc"); ?>
</body>
</html>

900
usr/local/www/firewall_schedule_edit.php Normal file
View File

@ -0,0 +1,900 @@
<?php
/*
firewall_schedule_edit.php
Copyright (C) 2004 Scott Ullrich
All rights reserved.
originially part of m0n0wall (http://m0n0.ch/wall)
Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
$pgtitle = "Firewall: Schedules: Edit";
require("guiconfig.inc");
$starttimehr = 00;
$starttimemin = 00;
$stoptimehr = 24;
$stoptimemin = 00;
$dayArray = array ('Sun','Mon','Tues','Wed','Thur','Fri','Sat');
$monthArray = array ('January','February','March','April','May','June','July','August','September','October','November','December');
if (!is_array($config['schedules']['schedule']))
$config['schedules']['schedule'] = array();
schedule_sort();
$a_schedules = &$config['schedules']['schedule'];
$id = $_GET['id'];
if (isset($_POST['id']))
$id = $_POST['id'];
if (isset($id) && $a_schedules[$id]) {
$pconfig['name'] = $a_schedules[$id]['name'];
$pconfig['descr'] = html_entity_decode($a_schedules[$id]['descr']);
$pconfig['timerange'] = $a_schedules[$id]['timerange'];
$pconfig['timedescr'] = html_entity_decode($a_schedules[$id]['timedescr']);
$getSchedule = true;
}
if ($_POST) {
if(strtolower($_POST['name']) == "lan")
$input_errors[] = "Schedule may not be named LAN.";
if(strtolower($_POST['name']) == "wan")
$input_errors[] = "Schedule may not be named WAN.";
$x = is_validaliasname($_POST['name']);
if (!isset($x)) {
$input_errors[] = "Reserved word used for schedule name.";
} else {
if (is_validaliasname($_POST['name']) == false)
$input_errors[] = "The schedule name may only consist of the characters a-z, A-Z, 0-9, -, _.";
}
/* check for name conflicts */
foreach ($a_schedules as $schedule) {
if (isset($id) && ($a_schedules[$id]) && ($a_schedules[$id] === $schedule))
continue;
if ($schedule['name'] == $_POST['name']) {
$input_errors[] = "A Schedule with this name already exists.";
break;
}
}
$schedule = array();
for ($x=0; $x<99; $x++){
if($_POST['schedule' . $x]) {
$timestr .= $_POST['schedule' . $x];
$timestr .= $_POST['starttime' . $x];
$timestr .= "-";
$timestr .= $_POST['stoptime' . $x];
$timestr .= "||";
$timedescrstr .= htmlentities($_POST['timedescr' . $x], ENT_QUOTES, 'UTF-8');
$timedescrstr .= "||";
}
}
$schedule['name'] = $_POST['name'];
$schedule['descr'] = htmlentities($_POST['descr'], ENT_QUOTES, 'UTF-8');
$schedule['timerange'] = $timestr;
$schedule['timedescr'] = $timedescrstr;
if (!$input_errors) {
if (isset($id) && $a_schedules[$id])
$a_schedules[$id] = $schedule;
else
$a_schedules[] = $schedule;
write_config();
header("Location: firewall_schedule.php");
exit;
}
//we received input errors, copy data to prevent retype
else
{
$getSchedule = true;
$pconfig['descr'] = $schedule['descr'] = htmlentities($_POST['descr'], ENT_QUOTES, 'UTF-8');
$pconfig['timerange'] = $schedule['timerange'];
$pconfig['timedescr'] = $schedule['timedescr'];
}
}
include("head.inc");
/* put your custom HTML head content here */
/* using some of the $pfSenseHead function calls */
$jscriptstr = <<<EOD
<script type="text/javascript">
var daysSelected = "";
var month_array = ['January','February','March','April','May','June','July','August','September','October','November','December'];
var day_array = ['Sun','Mon','Tues','Wed','Thur','Fri','Sat'];
var schCounter = 0;
function repeatExistingDays(){
var tempstr, tempstrdaypos, week, daypos, dayposdone = "";
var dayarray = daysSelected.split(",");
for (i=0; i<=dayarray.length; i++){
tempstr = dayarray[i];
tempstrdaypos = tempstr.search("p");
week = tempstr.substring(1,tempstrdaypos);
week = parseInt(week);
dashpos = tempstr.search("-");
daypos = tempstr.substring(tempstrdaypos+1, dashpos);
daypos = parseInt(daypos);
daydone = dayposdone.search(daypos);
tempstr = 'w' + week + 'p' + daypos;
daycell = eval('document.getElementById(tempstr)');
if (daydone == "-1"){
if (daycell.style.backgroundColor == "lightcoral")
daytogglerepeating(week,daypos,true);
else
daytogglerepeating(week,daypos,false);
dayposdone += daypos + ",";
}
}
}
function daytogglerepeating(week,daypos,bExists){
var tempstr, daycell, dayoriginal = "";
for (j=1; j<=53; j++)
{
tempstr = 'w' + j + 'p' + daypos;
daycell = eval('document.getElementById(tempstr)');
dayoriginalpos = daysSelected.indexOf(tempstr);
//if bExists set to true, means cell is already select it
//unselect it and remove original day from daysSelected string
if (daycell != null)
{
if (bExists){
daycell.style.backgroundColor = "WHITE";
}
else
{
daycell.style.backgroundColor = "lightcoral";
}
if (dayoriginalpos != "-1")
{
dayoriginalend = daysSelected.indexOf(',', dayoriginalpos);
tempstr = daysSelected.substring(dayoriginalpos, dayoriginalend+1);
daysSelected = daysSelected.replace(tempstr, "");
}
}
}
}
function daytoggle(id) {
var runrepeat, tempstr = "";
var bFoundValid = false;
iddashpos = id.search("-");
var tempstrdaypos = id.search("p");
var week = id.substring(1,tempstrdaypos);
week = parseInt(week);
if (iddashpos == "-1")
{
idmod = id;
runrepeat = true;
var daypos = id.substr(tempstrdaypos+1);
}
else
{
idmod = id.substring(0,iddashpos);
var daypos = id.substring(tempstrdaypos+1,iddashpos);
}
daypos = parseInt(daypos);
while (!bFoundValid){
var daycell = document.getElementById(idmod);
if (daycell != null){
if (daycell.style.backgroundColor == "RED"){
daycell.style.backgroundColor = "WHITE";
str = id + ",";
daysSelected = daysSelected.replace(str, "");
}
else if (daycell.style.backgroundColor == "lightcoral")
{
daytogglerepeating(week,daypos,true);
}
else //color is white cell
{
if (!runrepeat)
{
daycell.style.backgroundColor = "RED";
}
else
{
daycell.style.backgroundColor = "lightcoral";
daytogglerepeating(week,daypos,false);
}
daysSelected += id + ",";
}
bFoundValid = true;
}
else
{
//we found an invalid cell when column was clicked, move up to the next week
week++;
tempstr = "w" + week + "p" + daypos;
idmod = tempstr;
}
}
}
function update_month(){
var indexNum = document.forms[0].monthsel.selectedIndex;
var selected = document.forms[0].monthsel.options[indexNum].text;
for (i=0; i<=11; i++){
option = document.forms[0].monthsel.options[i].text;
document.popupMonthLayer = eval('document.getElementById (option)');
if(selected == option) {
document.popupMonthLayer.style.display="block";
}
else
document.popupMonthLayer.style.display="none";
}
}
//limit numbers only input for time range input boxes
function checkKeyEntry(incEvent)
{
//cross browser support
if (incEvent.which)
var code = incEvent.which;
else
var code = event.keyCode;
if (code > 31 && (code < 48 || code > 57))
return false;
else
return true;
}
//check time limits
function checkTimeLimits(){
var starttimehour, starttimemin, stoptimehour, stoptimemin = "";
//get time specified
starttimehour = parseInt(document.getElementById("starttimehour").value);
starttimemin = parseInt(document.getElementById("starttimemin").value);
stoptimehour = parseInt(document.getElementById("stoptimehour").value);
stoptimemin = parseInt(document.getElementById("stoptimemin").value);
//check limits
if (starttimehour > 23)
document.getElementById("starttimehour").value = 23;
if (starttimemin > 59)
document.getElementById("starttimemin").value = 59;
if (stoptimehour >= 24){
document.getElementById("stoptimehour").value = 24;
document.getElementById("stoptimemin").value = 0;
}
if (stoptimemin > 59)
if (stoptimehour != 24)
document.getElementById("stoptimemin").value = 59;
else
document.getElementById("stoptimemin").value = 0;
}
function processEntries(){
var tempstr, starttimehour, starttimemin, stoptimehour, stoptimemin, errors = "";
var passedValidiation = true;
//get time specified
starttimehour = parseInt(document.getElementById("starttimehour").value);
starttimemin = parseInt(document.getElementById("starttimemin").value);
stoptimehour = parseInt(document.getElementById("stoptimehour").value);
stoptimemin = parseInt(document.getElementById("stoptimemin").value);
//do time checks
if (starttimehour > stoptimehour)
{
errors = "Error: Start Hour cannot be greater than Stop Hour.";
passedValidiation = false;
}
else if (starttimehour = stoptimehour)
{
if (starttimemin > stoptimemin){
errors = "Error: Start Minute cannot be greater than Stop Minute.";
passedValidiation = false;
}
}
if (passedValidiation){
addTimeRange();
}
else if (errors != "")
alert(errors);
}
function addTimeRange(){
var tempdayarray = daysSelected.split(",");
var tempstr, tempFriendlyDay, starttimehour, starttimemin, stoptimehour, tempFriendlyTime, tempID, stoptimemin, timeRange, tempstrdaypos, week, daypos, day, month, dashpos, tempTime = "";
tempFriendlyTime = "";
tempID = "";
tempdayarray.sort();
tempFriendlyDay = "";
//check for existing entries
var findCurrentCounter;
for (u=0; u<99; u++){
findCurrentCounter = document.getElementById("schedule" + u);
if (!findCurrentCounter)
{
//found last entry, bump id number up by 1
u++
schCounter = u;
break;
}
}
if (daysSelected != ""){
//get days selected
for (i=0; i<tempdayarray.length; i++)
{
tempstr = tempdayarray[i];
if (tempstr != "")
{
tempstrdaypos = tempstr.search("p");
week = tempstr.substring(1,tempstrdaypos);
week = parseInt(week);
dashpos = tempstr.search("-");
if (dashpos != "-1")
{
daypos = tempstr.substring(tempstrdaypos+1, dashpos);
daypos = parseInt(daypos);
monthpos = tempstr.search("m");
tempstrdaypos = tempstr.search("d");
month = tempstr.substring(monthpos+1, tempstrdaypos);
month = parseInt(month);
day = tempstr.substring(tempstrdaypos+1);
day = parseInt(day);
tempFriendlyTime += month_array[month-1] + " " + day + ",";
tempID += tempstr + ",";
}
else
{
daypos = tempstr.substr(tempstrdaypos+1);
daypos = parseInt(daypos);
tempFriendlyDay += daypos + ",";
tempID += daypos + ",";
}
}
}
var foundEnd = false;
var firstDayFound = false;
var firstprint = false;
var tempFriendlyDayArray = tempFriendlyDay.split(",");
var currentDay, firstDay, nextDay = "";
for (k=0; k<tempFriendlyDayArray.length; k++){
tempstr = tempFriendlyDayArray[k];
if (tempstr != ""){
if (!firstDayFound)
{
firstDay = tempFriendlyDayArray[k];
firstDay = parseInt(firstDay);
firstDayFound = true;
}
currentDay = tempFriendlyDayArray[k];
currentDay = parseInt(currentDay);
//get next day
nextDay = tempFriendlyDayArray[k+1];
nextDay = parseInt(nextDay);
currentDay++;
if (currentDay != nextDay){
if (firstprint)
tempFriendlyTime += ", ";
currentDay--;
if (currentDay != firstDay)
tempFriendlyTime += day_array[firstDay] + " - " + day_array[currentDay];
else
tempFriendlyTime += day_array[firstDay];
firstDayFound = false;
firstprint = true;
}
}
}
tempTime += tempID;
//get time specified
starttimehour = document.getElementById("starttimehour").value;
starttimemin = document.getElementById("starttimemin").value;
stoptimehour = document.getElementById("stoptimehour").value;
stoptimemin = document.getElementById("stoptimemin").value;
timeRange = "||" + starttimehour + ":";
timeRange += starttimemin + "-";
timeRange += stoptimehour + ":";
timeRange += stoptimemin;
//add time ranges
tempTime += timeRange;
//get description for time range
var tempdescr = document.getElementById("timerangedescr").value
tempTime += "||" + tempdescr;
//add it to the schedule list
d = document;
tbody = d.getElementById("scheduletable").getElementsByTagName("tbody").item(0);
tr = d.createElement("tr");
td = d.createElement("td");
td.innerHTML= "<input type='text' readonly class='formfld' name='dayselected" + schCounter + "' id='dayselected" + schCounter + "' style=' word-wrap:break-word; width:100%; border:0px solid;' value='" + tempFriendlyTime + "'>";
tr.appendChild(td);
td = d.createElement("td");
td.innerHTML="<input type='text' readonly class='formfld' name='starttime" + schCounter + "' id='starttime" + schCounter + "' style=' word-wrap:break-word; width:100%; border:0px solid;' value='" + starttimehour + ":" + starttimemin + "'>";
tr.appendChild(td);
td = d.createElement("td");
td.innerHTML="<input type='text' readonly class='formfld' name='stoptime" + schCounter + "' id='stoptime" + schCounter + "' style=' word-wrap:break-word; width:100%; border:0px solid;' value='" + stoptimehour + ":" + stoptimemin + "'>";
tr.appendChild(td);
td = d.createElement("td");
td.innerHTML=td.innerHTML="<input type='text' readonly class='formfld' name='timedescr" + schCounter + "' id='timedescr" + schCounter + "' style=' word-wrap:break-word; width:100%; border:0px solid;' value='" + tempdescr + "'>";
tr.appendChild(td);
td = d.createElement("td");
td.innerHTML = "<input type='image' src='/themes/" + theme + "/images/icons/icon_e.gif' onclick='editRow(\"" + tempTime + "\"); removeRow(this); return false;' value='Edit'>";
tr.appendChild(td);
td = d.createElement("td");
td.innerHTML = "<input type='image' src='/themes/" + theme + "/images/icons/icon_x.gif' onclick='removeRow(this); return false;' value='Delete'>";
tr.appendChild(td);
td = d.createElement("td");
td.innerHTML="<input type='hidden' id='schedule" + schCounter + "' name='schedule" + schCounter + "' value='" + tempID + "'>";
tr.appendChild(td);
tbody.appendChild(tr);
schCounter++;
//reset calendar and time and descr
clearCalendar();
clearTime();
clearDescr();
}
else
{
//no days were selected, alert user
alert ("You must select at least 1 day before adding time");
}
}
function clearCalendar(){
var tempstr, daycell = "";
//clear days selected
daysSelected = "";
//loop through all 52 weeks
for (j=1; j<=53; j++)
{
//loop through all 7 days
for (k=0; k<7; k++){
tempstr = 'w' + j + 'p' + k;
daycell = eval('document.getElementById(tempstr)');
if (daycell != null){
daycell.style.backgroundColor = "WHITE";
}
}
}
}
function clearTime(){
document.getElementById("starttimehour").value = $starttimehr;
document.getElementById("starttimemin").value = $starttimemin;
document.getElementById("stoptimehour").value = $stoptimehr;
document.getElementById("stoptimemin").value = $stoptimemin;
}
function clearDescr(){
document.getElementById("timerangedescr").value = "";
}
function editRow(incTime) {
//reset calendar and time
clearCalendar();
clearTime();
var starttimehour, descr, days, tempstr, starttimemin, hours, stoptimehour, stoptimemin = "";
tempArray = incTime.split ("||");
days = tempArray[0];
hours = tempArray[1];
descr = tempArray[2];
var tempdayArray = days.split(",");
var temphourArray = hours.split("-");
tempstr = temphourArray[0];
var temphourArray2 = tempstr.split(":");
document.getElementById("starttimehour").value = temphourArray2[0];
document.getElementById("starttimemin").value = temphourArray2[1];
tempstr = temphourArray[1];
temphourArray2 = tempstr.split(":");
document.getElementById("stoptimehour").value = temphourArray2[0];
document.getElementById("stoptimemin").value = temphourArray2[1];
document.getElementById("timerangedescr").value = descr;
//toggle the appropriate days
for (i=0; i<tempdayArray.length-1; i++)
{
var tempweekstr = tempdayArray[i];
dashpos = tempweekstr.search("-");
if (dashpos == "-1")
{
tempstr = "w2p" + tempdayArray[i];
}
else
{
tempstr = tempdayArray[i];
}
daytoggle(tempstr);
}
}
function removeRow(el) {
var cel;
while (el && el.nodeName.toLowerCase() != "tr")
el = el.parentNode;
if (el && el.parentNode) {
cel = el.getElementsByTagName("td").item(0);
el.parentNode.removeChild(el);
}
}
</script>
EOD;
?>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC" onload="<?= $jsevents["body"]["onload"] ?>">
<?php include("fbegin.inc"); echo $jscriptstr; ?>
<p class="pgtitle"><?=$pgtitle?></p>
<?php if ($input_errors) print_input_errors($input_errors); ?>
<div id="inputerrors"></div>
<form action="firewall_schedule_edit.php" method="post" name="iform" id="iform">
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr>
<td>
<table width="100%" border="0" cellpadding="6" cellspacing="0">
<tr>
<td width="15%" valign="top" class="vncellreq">Schedule Name</td>
<td width="85%" class="vtable">
<input name="name" type="text" id="name" size="40" class="formfld" value="<?=htmlspecialchars($pconfig['name']);?>"><br>
<span class="vexpl">
The name of the alias may only consist of the characters a-z, A-Z and 0-9.
</span>
</td>
</tr>
<tr>
<td width="15%" valign="top" class="vncell">Description</td>
<td width="85%" class="vtable"><input name="descr" type="text" id="descr" size="40" class="formfld" value="<?=htmlspecialchars($pconfig['descr']);?>"><br>
<span class="vexpl">
You may enter a description here for your reference (not parsed).
</span>
</td>
</tr>
<tr>
</tr>
<tr>
<td width="15%" valign="top" class="vncellreq">Month</td>
<td width="85%" class="vtable">
<select name="monthsel" class="formselect" id="monthsel" onchange="update_month();">
<?php
$monthcounter = date("n");
$monthlimit = $monthcounter + 12;
for ($monthcounter; $monthcounter<$monthlimit; $monthcounter++){?>
<option value="<?php echo $monthcounter;?>"><?php echo date("F y", mktime(0, 0, 0, date($monthcounter), 1, date("Y")));?></option>
<?php } ?>
</select><br><br>
<?php
$firstmonth = TRUE;
$weekcounter = 1;
$monthcounter = date("n");
$monthlimit = $monthcounter + 12;
for ($monthcounter; $monthcounter<$monthlimit; $monthcounter++){
$firstdayofmonth = date("w", mktime(0, 0, 0, date($monthcounter), 1, date("Y")));
$daycounter = 1;//number of day in month
$numberofdays = date("t", mktime(0, 0, 0, date($monthcounter), 1, date("Y")));
$firstdayprinted = FALSE;
$lasttr = FALSE;
$weekdaycounter = 0;//0 for Sun, 1 for Mon, etc
?>
<div id="<?php echo date("F y",mktime(0, 0, 0, date($monthcounter), 1, date("Y")));?>" z-index:-1000; style="position:relative; display:<?php if($firstmonth)echo "block";else echo "none";?>">
<TABLE BORDER=1 CELLSPACING=1 CELLPADDING=1 id="calTable" class="tabcont">
<TR><TD COLSPAN="7" ALIGN=center class="listbg"><B><font color="white"><?php echo date("F Y", mktime(0, 0, 0, date($monthcounter), 1, date("Y")));?></B></TD>
</TR>
<TR>
<TD ALIGN=center class="listhdrr" style="cursor: pointer;" onClick="daytoggle('w1p0');"><u><b>Sun</b></u></TD>
<TD ALIGN=center class="listhdrr" style="cursor: pointer;" onClick="daytoggle('w1p1');"><u><b>Mon</b></u></TD>
<TD ALIGN=center class="listhdrr" style="cursor: pointer;" onClick="daytoggle('w1p2');"><u><b>Tue</b></u></TD>
<TD ALIGN=center class="listhdrr" style="cursor: pointer;" onClick="daytoggle('w1p3');"><u><b>Wed</b></u></TD>
<TD ALIGN=center class="listhdrr" style="cursor: pointer;" onClick="daytoggle('w1p4');"><u><b>Thu</b></u></TD>
<TD ALIGN=center class="listhdrr" style="cursor: pointer;" onClick="daytoggle('w1p5');"><u><b>Fri</b></u></TD>
<TD ALIGN=center class="listhdrr" style="cursor: pointer;" onClick="daytoggle('w1p6');"><u><b>Sa</b>t</u></TD>
</TR>
<?php
$firstmonth = FALSE;
for ($i=0; $daycounter<=$numberofdays; $i++){
if ($weekdaycounter == 0)
{
echo "<tr>";
}
if ($firstdayofmonth == $weekdaycounter){?>
<TD ALIGN=center style="cursor: pointer;" class="listr" id="w<?=$weekcounter;?>p<?=$weekdaycounter;?>" onClick="daytoggle('w<?=$weekcounter;?>p<?=$weekdaycounter;?>-m<?=$monthcounter;?>d<?=$daycounter;?>');">
<?php echo $daycounter;
$daycounter++;
$firstdayprinted = TRUE;
echo "</td>";
}
elseif ($firstdayprinted == TRUE && $daycounter <= $numberofdays){?>
<TD ALIGN=center style="cursor: pointer;" class="listr" id="w<?=$weekcounter;?>p<?=$weekdaycounter;?>" onClick="daytoggle('w<?=$weekcounter;?>p<?=$weekdaycounter;?>-m<?=$monthcounter;?>d<?=$daycounter;?>');">
<?php echo $daycounter;
$daycounter++;
echo "</td>";
}
else
{
echo "<td align=center class=\"listr\"></td>";
}
//if day is Saturday,
if ($weekdaycounter == 6)
{
$weekdaycounter = 0;
$weekcounter++;
echo "</tr>";
}
else{
$weekdaycounter++;
}
}?>
</TABLE>
</div>
<?php } //end for loop
?>
<br/>
Click individual date to select that date only. Click the appropriate weekday Header to select all occurences of that weekday.
</td>
</tr>
<tr>
<td width="15%" valign="top" class="vncellreq">Time</td>
<td width="85%" class="vtable">
<table cellspacing=2 class="tabcont">
<tr>
<td class="listhdrr" align="center">Start Time</td><td></td><td class="listhdrr" align="center">Stop Time</td>
</tr>
<tr>
<td>
<input name="starttimehour" type="text" onkeypress="return checkKeyEntry(event)" onkeyup="javascript:checkTimeLimits();" class="formfld" id="starttimehour" size="2" maxlength="2" value="<?=$starttimehr;?>">&nbsp;Hr&nbsp;&nbsp;
<input name="starttimemin" type="text" onkeypress="return checkKeyEntry(event)" onkeyup="javascript:checkTimeLimits();" class="formfld" id="starttimemin" size="2" maxlength="2" value="<?=$starttimemin;?>">&nbsp;Min
</td>
<td></td>
<td>
<input name="stoptimehour" type="text" onkeypress="return checkKeyEntry(event)" onkeyup="javascript:checkTimeLimits();" class="formfld" id="stoptimehour" size="2" maxlength="2" value="<?=$stoptimehr;?>">&nbsp;Hr&nbsp;&nbsp;
<input name="stoptimemin" type="text" onkeypress="return checkKeyEntry(event)" onkeyup="javascript:checkTimeLimits();" class="formfld" id="stoptimemin" size="2" maxlength="2" value="<?=$stoptimemin;?>">&nbsp;Min
</td>
</tr>
</table><br>
Enter the time range (in 24 hour format) for the day(s) selected on the Month(s) above.
</td>
</tr>
<tr>
<td width="15%" valign="top" class="vncell">Time Range Description</td>
<td width="85%" class="vtable"><input name="timerangedescr" type="text" class="formfld" id="timerangedescr" size="40" maxlength="40" value=""><br>
<span class="vexpl">
You may enter a description here for your reference (not parsed).
</span>
</td>
</tr>
<tr>
<td width="22%" valign="top">&nbsp;</td>
<td width="78%">
<input type="button" value="Add Time" class="formbtn" onclick="javascript:processEntries();">&nbsp;&nbsp;&nbsp;
<input type="button" value="Clear Selection" class="formbtn" onclick="javascript:clearCalendar(); clearTime(); clearDescr();">
</td>
</tr>
<tr>
<td width="15%" valign="top" class="vtable"></td>
<td width="85%" class="vtable">
</td>
</tr>
<tr>
<td width="15%" valign="top" class="vncellreq">Configured Ranges</td>
<td width="85%">
<table id="scheduletable">
<tbody>
<tr>
<TD ALIGN=center class="listbg" width="35%"><font color="white">Day(s)</td>
<TD ALIGN=center class="listbg" width="12%"><font color="white">Start Time</td>
<TD ALIGN=center class="listbg" width="11%"><font color="white">Stop Time</td>
<TD ALIGN=center class="listbg" width="42%"><font color="white">Description</td>
</tr>
<?php
if ($getSchedule){
$counter = 0;
$tempFriendlyTime = "";
$timerangearray = explode("||", $pconfig['timerange']);
$timerangedescrarray = explode("||", $pconfig['timedescr']);
foreach($timerangearray as $timerange) {
$dayFriendly = "";
$tempFriendlyTime = "";
$monthpos = "";
if ($timerange){
$timedescr = $timerangedescrarray[$counter];
$daytimeseparator = strrpos($timerange, ",");
$tempID = substr($timerange, 0, $daytimeseparator+1);
$temptimerange = substr($timerange, $daytimeseparator+1);
$temptimeseparator = strrpos($temptimerange, "-");
$starttime = substr ($temptimerange, 0, $temptimeseparator);
$stoptime = substr ($temptimerange, $temptimeseparator+1);
$tempTime = $tempID . "||" . $starttime . "-" . $stoptime . "||" . $timedescr;
$tempdayRange = explode(",", $tempID);
foreach ($tempdayRange as $day)
{
if ($day != "")
{
$monthpos = strpos($day, "m");
if (!$monthpos)
{
$dayFriendly .= $day . ",";
}
else
{
$daypos = strpos($day, "d");
$month = substr($day, $monthpos+1, $daypos-$monthpos-1);
$day = substr($day, $daypos+1);
$month = $monthArray[$month-1];
$tempFriendlyTime .= $month . " " . $day . ",";
}
}
}
$foundEnd = false;
$firstDayFound = false;
$firstprint = false;
$tempFriendlyDayArray = explode(",", $dayFriendly);
$currentDay = "";
$firstDay = "";
$nextDay = "";
$i = 0;
foreach ($tempFriendlyDayArray as $day){
if ($day != ""){
if (!$firstDayFound)
{
$firstDay = $tempFriendlyDayArray[$i];
$firstDayFound = true;
}
$currentDay =$tempFriendlyDayArray[$i];
//get next day
$nextDay = $tempFriendlyDayArray[$i+1];
$currentDay++;
if ($currentDay != $nextDay){
if ($firstprint)
$tempFriendlyTime .= ", ";
$currentDay--;
if ($currentDay != $firstDay)
$tempFriendlyTime .= $dayArray[$firstDay] . " - " . $dayArray[$currentDay];
else
$tempFriendlyTime .= $dayArray[$firstDay];
$firstDayFound = false;
$firstprint = true;
}
$i++;
}
}
?>
<tr>
<td>
<input type='text' readonly class='formfld' name='dayselected<?php echo $counter; ?>' id='dayselected<?php echo $counter; ?>' style=' word-wrap:break-word; width:100%; border:0px solid;' value='<?php echo $tempFriendlyTime; ?>'>
</td>
<td>
<input type='text' readonly class='formfld' name='starttime<?php echo $counter; ?>' id='starttime<?php echo $counter; ?>' style=' word-wrap:break-word; width:100%; border:0px solid;' value='<?php echo $starttime; ?>'>
</td>
<td>
<input type='text' readonly class='formfld' name='stoptime<?php echo $counter; ?>' id='stoptime<?php echo $counter; ?>' style=' word-wrap:break-word; width:100%; border:0px solid;' value='<?php echo $stoptime; ?>'>
</td>
<td>
<input type='text' readonly class='formfld' name='timedescr<?php echo $counter; ?>' id='timedescr<?php echo $counter; ?>' style=' word-wrap:break-word; width:100%; border:0px solid;' value='<?php echo $timedescr; ?>'>
</td>
<td>
<input type='image' src='/themes/<?php echo $g['theme']; ?>/images/icons/icon_e.gif' onclick='editRow("<?php echo $tempTime; ?>"); removeRow(this); return false;' value='Edit'>
</td>
<td>
<input type='image' src='/themes/<?php echo $g['theme']; ?>/images/icons/icon_x.gif' onclick='removeRow(this); return false;' value='Delete'>
</td>
<td>
<input type='hidden' id='schedule<?php echo $counter; ?>' name='schedule<?php echo $counter; ?>' value='<?php echo $tempID; ?>'>
</td>
</tr>
<?php
$counter++;
}//end if
} // end foreach
}//end if
?>
</tdody>
</table>
</td>
</tr>
<tr>
<td width="15%" valign="top">&nbsp;</td>
<td width="85%">
<input id="submit" name="submit" type="submit" class="formbtn" value="Save" />
<input id="cancelbutton" name="cancelbutton" type="button" class="formbtn" value="Cancel" onclick="history.back()" />
<?php if (isset($id) && $a_schedules[$id]): ?>
<input name="id" type="hidden" value="<?=$id;?>" />
<?php endif; ?>
</td>
</tr>
</table>
</td></tr></table></form>
<?php include("fend.inc"); ?>
</body>
</html>

11
usr/local/www/guiconfig.inc
View File

@ -443,6 +443,17 @@ function aliases_sort() {
usort($config['aliases']['alias'], "aliascmp");
}
function schedule_sort(){
global $g, $config;
function schedulecmp($a, $b) {
return strcmp($a['name'], $b['name']);
}
usort($config['schedules']['schedule'], "schedulecmp");
}
function ipsec_mobilekey_sort() {
global $g, $config;