[geeklog-cvs] Geeklog-1.x/sql/updates mysql_1.4.1_to_1.5.0.php, 1.55, 1.56

[Dirk Haun]

Update of /cvsroot/geeklog/Geeklog-1.x/sql/updates
In directory qs1489.pair.com:/tmp/cvs-serv87214/sql/updates

Modified Files:
	mysql_1.4.1_to_1.5.0.php 
Log Message:
Added Spam-X config to the configuration GUI


Index: mysql_1.4.1_to_1.5.0.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/sql/updates/mysql_1.4.1_to_1.5.0.php,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** mysql_1.4.1_to_1.5.0.php	26 Jan 2008 13:14:46 -0000	1.55
--- mysql_1.4.1_to_1.5.0.php	26 Jan 2008 17:17:42 -0000	1.56
***************
*** 297,303 ****
  function upgrade_StaticpagesPlugin()
  {
!     global $_CONF,$_TABLES;
  
!     require_once($_CONF['path_system'] . 'classes/config.class.php');
  
      $c = config::get_instance();
--- 297,303 ----
  function upgrade_StaticpagesPlugin()
  {
!     global $_CONF, $_TABLES;
  
!     require_once $_CONF['path_system'] . 'classes/config.class.php';
  
      $c = config::get_instance();
***************
*** 350,358 ****
  function upgrade_SpamXPlugin()
  {
!     global $_TABLES;
  
      $sql = "UPDATE {$_TABLES['plugins']} SET pi_version = '1.1.1', pi_gl_version = '1.5.0' WHERE pi_name = 'spamx'";
      $rst = DB_query($sql);
!     if (DB_error ()) {
          echo "There was an error upgrading the Spam-X plugin";
          return false;
--- 350,367 ----
  function upgrade_SpamXPlugin()
  {
!     global $_CONF, $_TABLES;
! 
!     require_once $_CONF['path_system'] . 'classes/config.class.php';
! 
!     $c = config::get_instance();
!     $c->add('logging', true, 'select', 0, 0, 1, 10, true, 'spamx');
!     $c->add('admin_override', false, 'select', 0, 0, 1, 20, true, 'spamx');
!     $c->add('timeout', 5, 'text', 0, 0, null, 30, true, 'spamx');
!     $c->add('notification_email', '', 'text', 0, 0, null, 40, false, 'spamx');
!     $c->add('action', 128, 'text', 0, 0, null, 50, false, 'spamx');
  
      $sql = "UPDATE {$_TABLES['plugins']} SET pi_version = '1.1.1', pi_gl_version = '1.5.0' WHERE pi_name = 'spamx'";
      $rst = DB_query($sql);
!     if (DB_error()) {
          echo "There was an error upgrading the Spam-X plugin";
          return false;