diff -c snort-acid-orig/acid_db.inc snort-acid/acid_db.inc
*** snort-acid-orig/acid_db.inc	Thu Jan  9 10:04:07 2003
--- snort-acid/acid_db.inc	Wed Sep 26 23:58:34 2007
***************
*** 81,87 ****
       } 
  
       /* Set the database schema version number */
!      $sql = "SELECT vseq FROM schema"; 
       if ($this->DB_type == "mssql") $sql = "SELECT vseq FROM [schema]";
       $result = $this->DB->Execute($sql);
       if ( $this->acidErrorMessage != "" )
--- 81,87 ----
       } 
  
       /* Set the database schema version number */
!      $sql = "SELECT vseq FROM snort.schema"; 
       if ($this->DB_type == "mssql") $sql = "SELECT vseq FROM [schema]";
       $result = $this->DB->Execute($sql);
       if ( $this->acidErrorMessage != "" )
***************
*** 150,156 ****
       } 
  
       /* Set the database schema version number */
!      $sql = "SELECT vseq FROM schema"; 
       if ($this->DB_type == "mssql") $sql = "SELECT vseq FROM [schema]";
       $result = $this->DB->Execute($sql);
       if ( $this->acidErrorMessage() != "" )
--- 150,156 ----
       } 
  
       /* Set the database schema version number */
!      $sql = "SELECT vseq FROM snort.schema"; 
       if ($this->DB_type == "mssql") $sql = "SELECT vseq FROM [schema]";
       $result = $this->DB->Execute($sql);
       if ( $this->acidErrorMessage() != "" )
diff -c snort-acid-orig/acid_graph_form.php snort-acid/acid_graph_form.php
*** snort-acid-orig/acid_graph_form.php	Thu Jan  9 10:04:07 2003
--- snort-acid/acid_graph_form.php	Wed Sep 26 09:24:30 2007
***************
*** 100,111 ****
          </SELECT>
          <SELECT NAME="chart_begin_year">
          <OPTION VALUE=" " '.chk_select($chart_begin_year, " ").'>{year}
!         <OPTION VALUE="1999" '.chk_select($chart_begin_year, "1999").'>1999
!         <OPTION VALUE="2000" '.chk_select($chart_begin_year, "2000").'>2000
!         <OPTION VALUE="2001" '.chk_select($chart_begin_year, "2001").'>2001
!         <OPTION VALUE="2002" '.chk_select($chart_begin_year, "2002").'>2002
!         <OPTION VALUE="2003" '.chk_select($chart_begin_year, "2003").'>2003
!         <OPTION VALUE="2004" '.chk_select($chart_begin_year, "2004").'>2004
          </SELECT>';
  
    echo '<br><b>Chart End:</B>&nbsp;&nbsp;&nbsp;&nbsp;
--- 100,107 ----
          </SELECT>
          <SELECT NAME="chart_begin_year">
          <OPTION VALUE=" " '.chk_select($chart_begin_year, " ").'>{year}
!         <OPTION VALUE="2007" '.chk_select($chart_begin_year, "2007").'>2007
!         <OPTION VALUE="2008" '.chk_select($chart_begin_year, "2008").'>2008
          </SELECT>';
  
    echo '<br><b>Chart End:</B>&nbsp;&nbsp;&nbsp;&nbsp;
***************
*** 138,149 ****
          </SELECT>
          <SELECT NAME="chart_end_year">
          <OPTION VALUE=" " '.chk_select($chart_end_year, " ").'>{year}
!         <OPTION VALUE="1999" '.chk_select($chart_end_year, "1999").'>1999
!         <OPTION VALUE="2000" '.chk_select($chart_end_year, "2000").'>2000
!         <OPTION VALUE="2001" '.chk_select($chart_end_year, "2001").'>2001
!         <OPTION VALUE="2002" '.chk_select($chart_end_year, "2002").'>2002
!         <OPTION VALUE="2003" '.chk_select($chart_end_year, "2003").'>2003
!         <OPTION VALUE="2004" '.chk_select($chart_end_year, "2004").'>2004
          </SELECT>';
  
    echo '<INPUT TYPE="submit" NAME="submit" VALUE="Graph Alerts"><BR>
--- 134,141 ----
          </SELECT>
          <SELECT NAME="chart_end_year">
          <OPTION VALUE=" " '.chk_select($chart_end_year, " ").'>{year}
!         <OPTION VALUE="2007" '.chk_select($chart_end_year, "2007").'>2007
!         <OPTION VALUE="2008" '.chk_select($chart_end_year, "2008").'>2008
          </SELECT>';
  
    echo '<INPUT TYPE="submit" NAME="submit" VALUE="Graph Alerts"><BR>
diff -c snort-acid-orig/acid_stat_time.php snort-acid/acid_stat_time.php
*** snort-acid-orig/acid_stat_time.php	Thu Jan  9 10:04:07 2003
--- snort-acid/acid_stat_time.php	Wed Sep 26 09:25:09 2007
***************
*** 186,197 ****
        echo '<INPUT TYPE="text" NAME="time['.$i.'][1]" SIZE=2 VALUE="'.$time[$i][1].'"> &nbsp;'."\n";
        echo '<SELECT NAME="time['.$i.'][2]">
               <OPTION VALUE=" "    '.chk_select($time[$i][2]," ").'>{ year }
!              <OPTION VALUE="1999" '.chk_select($time[$i][2],"1999").'>1999
!              <OPTION VALUE="2000" '.chk_select($time[$i][2],"2000").'>2000
!              <OPTION VALUE="2001" '.chk_select($time[$i][2],"2001").'>2001
!              <OPTION VALUE="2002" '.chk_select($time[$i][2],"2002").'>2002
!              <OPTION VALUE="2003" '.chk_select($time[$i][2],"2003").'>2003
!              <OPTION VALUE="2004" '.chk_select($time[$i][2],"2003").'>2004
              </SELECT>';
  
        if ( $i == 0 ) echo '&nbsp; -- &nbsp;&nbsp;';
--- 186,193 ----
        echo '<INPUT TYPE="text" NAME="time['.$i.'][1]" SIZE=2 VALUE="'.$time[$i][1].'"> &nbsp;'."\n";
        echo '<SELECT NAME="time['.$i.'][2]">
               <OPTION VALUE=" "    '.chk_select($time[$i][2]," ").'>{ year }
!              <OPTION VALUE="2007" '.chk_select($time[$i][2],"2007").'>2007
!              <OPTION VALUE="2008" '.chk_select($time[$i][2],"2008").'>2008
              </SELECT>';
  
        if ( $i == 0 ) echo '&nbsp; -- &nbsp;&nbsp;';
diff -c snort-acid-orig/acid_state_citems.inc snort-acid/acid_state_citems.inc
*** snort-acid-orig/acid_state_citems.inc	Thu Jan  9 10:04:07 2003
--- snort-acid/acid_state_citems.inc	Wed Sep 26 09:25:59 2007
***************
*** 732,743 ****
           echo '                               <OPTION VALUE="12" '.chk_select($this->criteria[$i][2],"12").'>Dec</SELECT>';
           echo '<INPUT TYPE="text" NAME="time['.$i.'][3]" SIZE=2 VALUE="'.$this->criteria[$i][3].'">';
           echo '<SELECT NAME="time['.$i.'][4]"><OPTION VALUE=" "    '.chk_select($this->criteria[$i][4]," ").'>{ year }';
!          echo '                               <OPTION VALUE="1999" '.chk_select($this->criteria[$i][4],"1999").'>1999';
!          echo '                               <OPTION VALUE="2000" '.chk_select($this->criteria[$i][4],"2000").'>2000';
!          echo '                               <OPTION VALUE="2001" '.chk_select($this->criteria[$i][4],"2001").'>2001';
!          echo '                               <OPTION VALUE="2002" '.chk_select($this->criteria[$i][4],"2002").'>2002';
!          echo '                               <OPTION VALUE="2003" '.chk_select($this->criteria[$i][4],"2003").'>2003';
!          echo '                               <OPTION VALUE="2004" '.chk_select($this->criteria[$i][4],"2004").'>2004</SELECT>';
  
           echo '<INPUT TYPE="text" NAME="time['.$i.'][5]" SIZE=2 VALUE="'.$this->criteria[$i][5].'"><B>:</B>';
           echo '<INPUT TYPE="text" NAME="time['.$i.'][6]" SIZE=2 VALUE="'.$this->criteria[$i][6].'"><B>:</B>';
--- 732,740 ----
           echo '                               <OPTION VALUE="12" '.chk_select($this->criteria[$i][2],"12").'>Dec</SELECT>';
           echo '<INPUT TYPE="text" NAME="time['.$i.'][3]" SIZE=2 VALUE="'.$this->criteria[$i][3].'">';
           echo '<SELECT NAME="time['.$i.'][4]"><OPTION VALUE=" "    '.chk_select($this->criteria[$i][4]," ").'>{ year }';
!          echo '                               <OPTION VALUE="2007" '.chk_select($this->criteria[$i][4],"2007").'>2007';
!          echo '                               <OPTION VALUE="2008" '.chk_select($this->criteria[$i][4],"2008").'>2008';
!          echo '</SELECT>';
  
           echo '<INPUT TYPE="text" NAME="time['.$i.'][5]" SIZE=2 VALUE="'.$this->criteria[$i][5].'"><B>:</B>';
           echo '<INPUT TYPE="text" NAME="time['.$i.'][6]" SIZE=2 VALUE="'.$this->criteria[$i][6].'"><B>:</B>';