[prev in list] [next in list] [prev in thread] [next in thread] 

List:       os-sim-commits
Subject:    [Os-sim-commits] os-sim/www/policy modifypolicy.php,1.14,1.15 modifypolicyform.php,1.17,1.18 newpoli
From:       Dominique Karg <dkarg () users ! sourceforge ! net>
Date:       2006-03-29 14:46:21
Message-ID: E1FObwL-0005ot-Uh () mail ! sourceforge ! net
[Download RAW message or body]

Update of /cvsroot/os-sim/os-sim/www/policy
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16676/www/policy

Modified Files:
	modifypolicy.php modifypolicyform.php newpolicy.php 
	newpolicyform.php policy.php 
Log Message:
Store / do not store options, typo inside upgrade sql, -1 means == do not alter \
priority.


Index: newpolicyform.php
===================================================================
RCS file: /cvsroot/os-sim/os-sim/www/policy/newpolicyform.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- newpolicyform.php	29 Mar 2006 13:58:11 -0000	1.11
+++ newpolicyform.php	29 Mar 2006 14:46:19 -0000	1.12
@@ -379,10 +379,16 @@
       </table>
     </td>
   </tr>
-
+  <tr>
+    <th> <?php echo gettext("Store events"); ?> </th>
+    <td class="left">
+    <input type="radio" name="store" value="1" > <?= _("Yes"); ?>
+    <input type="radio" name="store" value="0" > <?= _("No"); ?>
+    </td>
+  </tr>
 
   <tr>
-    <th>Description</th>
+    <th><?= _("Description"); ?></th>
     <td class="left">
         <textarea name="descr" rows="2" cols="20"></textarea>
     </td>

Index: modifypolicy.php
===================================================================
RCS file: /cvsroot/os-sim/os-sim/www/policy/modifypolicy.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- modifypolicy.php	8 Mar 2006 15:42:15 -0000	1.14
+++ modifypolicy.php	29 Mar 2006 14:46:19 -0000	1.15
@@ -33,7 +33,7 @@
          !validateVar($_POST["nsigs"]) ||
          !validateVar($_POST["begin_day"]) ||
          !validateVar($_POST["end_day"]) ||
-         !validateVar($_POST["descr"])))
+         !validateVar($_POST["descr"]))) 
 {
     require_once("ossim_error.inc");
     $error = new OssimError();
@@ -47,8 +47,9 @@
     $end_hour   = validateVar($_POST["end_hour"]);
     $begin_day  = validateVar($_POST["begin_day"]);
     $end_day    = validateVar($_POST["end_day"]);
-    $descr = validateVar($_POST["descr"], OSS_ALPHA . OSS_PUNC . OSS_SCORE .
-    OSS_AT);
+    $descr = validateVar($_POST["descr"], OSS_ALPHA . OSS_PUNC . OSS_SCORE .  \
OSS_AT); +    $store = validateVar($_POST["store"]);
+
 
     /*
      *  Check correct range of dates
@@ -129,7 +130,7 @@
     Policy::update($conn, $id, $priority, $begin_hour, $end_hour, 
                    $begin_day, $end_day, $descr,
                    $source_ips, $dest_ips, $source_nets, $dest_nets,
-                   $ports, $sigs, $sensors);
+                   $ports, $sigs, $sensors, $store);
 ?>
     <p> <?php echo gettext("Policy succesfully updated"); ?> </p>
     <p><a href="policy.php">

Index: modifypolicyform.php
===================================================================
RCS file: /cvsroot/os-sim/os-sim/www/policy/modifypolicyform.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- modifypolicyform.php	29 Mar 2006 13:58:11 -0000	1.17
+++ modifypolicyform.php	29 Mar 2006 14:46:19 -0000	1.18
@@ -629,6 +629,15 @@
             cols="20"><?php echo $policy->get_descr(); ?></textarea>
     </td>
   </tr>
+  <tr>
+    <th> <?php echo gettext("Store events"); ?> </th>
+    <td class="left">
+    <input type="radio" name="store" value="1" <?php if($policy->get_store() == 1) \
echo " checked "; ?>> <?= _("Yes"); ?>  +    <input type="radio" name="store" \
value="0" <?php if($policy->get_store() == 0) echo " checked "; ?>> <?= _("No"); ?> + \
</td> +  </tr>
+
+
 
 <?php
     $db->close($conn);

Index: policy.php
===================================================================
RCS file: /cvsroot/os-sim/os-sim/www/policy/policy.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- policy.php	29 Mar 2006 13:58:11 -0000	1.14
+++ policy.php	29 Mar 2006 14:46:19 -0000	1.15
@@ -35,6 +35,7 @@
       <th> <?php echo gettext("Sensors"); ?> </th>
       <th> <?php echo gettext("Time Range"); ?> </th>
       <th> <?php echo gettext("Description"); ?> </th>
+      <th> <?php echo gettext("Store"); ?> </th>
       <th> <?php echo gettext("Action"); ?> </th>
     </tr>
 
@@ -160,6 +161,11 @@
       </td>
 
       <td><?php echo $policy->get_descr(); ?></td>
+      <td><?php if($policy->get_store() == 1){
+      echo _("Yes");
+      } elseif ($policy->get_store() == 0){
+      echo _("No");
+      }?></td>
 
       <td>
         <a href="modifypolicyform.php?id=<?php

Index: newpolicy.php
===================================================================
RCS file: /cvsroot/os-sim/os-sim/www/policy/newpolicy.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- newpolicy.php	8 Mar 2006 15:42:15 -0000	1.13
+++ newpolicy.php	29 Mar 2006 14:46:19 -0000	1.14
@@ -42,6 +42,7 @@
     $end_day    = validateVar($_POST["end_day"]);
     $descr      = validateVar($_POST["descr"], OSS_ALPHA . OSS_PUNC . OSS_SCORE
     . OSS_AT);
+    $store      = validateVar($_POST["store"]);
 
     /*
      *  Check correct range of dates
@@ -121,7 +122,7 @@
     Policy::insert($conn, $priority, 
                    $begin_hour, $end_hour, $begin_day, $end_day, $descr,
                    $source_ips, $dest_ips, $source_nets, $dest_nets,
-                   $ports, $sigs, $sensors);
+                   $ports, $sigs, $sensors, $store);
 ?>
     <p> <?php echo gettext("Policy succesfully inserted"); ?> </p>
     <p><a href="policy.php">



-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Os-sim-commits mailing list
Os-sim-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/os-sim-commits


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic