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

[Dirk Haun]

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

Modified Files:
	mysql_1.4.1_to_1.5.0.php 
Log Message:
Have the config data for the Spam-X plugin in only one place


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.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** mysql_1.4.1_to_1.5.0.php	2 Feb 2008 16:36:34 -0000	1.60
--- mysql_1.4.1_to_1.5.0.php	2 Feb 2008 20:03:07 -0000	1.61
***************
*** 377,386 ****
      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'";
--- 377,393 ----
      require_once $_CONF['path_system'] . 'classes/config.class.php';
  
!     $plugin_path = $_CONF['path'] . 'plugins/spamx/';
!     require_once $plugin_path . 'install_defaults.php';
! 
!     if (file_exists($plugin_path . 'config.php')) {
!         global $_SPX_CONF;
! 
!         require_once $plugin_path . 'config.php';
!     }
! 
!     if (!plugin_initconfig_spamx()) {
!         echo 'There was an error upgrading the Spam-X plugin';
!         return false;
!     }
  
      $sql = "UPDATE {$_TABLES['plugins']} SET pi_version = '1.1.1', pi_gl_version = '1.5.0' WHERE pi_name = 'spamx'";