[geeklog-cvs] Geeklog-1.x/public_html/admin/plugins/spamx install.php, 1.22, 1.23

[Dirk Haun]

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin/plugins/spamx
In directory qs1489.pair.com:/tmp/cvs-serv51673/public_html/admin/plugins/spamx

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


Index: install.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/plugins/spamx/install.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** install.php	26 Jan 2008 20:06:07 -0000	1.22
--- install.php	2 Feb 2008 20:03:06 -0000	1.23
***************
*** 51,54 ****
--- 51,56 ----
  $pi_url          = 'http://www.pigstye.net/gplugs/staticpages/index.php/spamx';
  
+ $base_path = $_CONF['path'] . 'plugins/' . $pi_name . '/';
+ 
  // name of the Admin group
  $pi_admin        = $pi_name . ' Admin';
***************
*** 92,110 ****
  function plugin_load_configuration()
  {
!     global $_CONF, $pi_name;
  
      require_once $_CONF['path_system'] . 'classes/config.class.php';
  
!     $c = config::get_instance();
!     $c->initConfig();
!     if (!$c->group_exists($pi_name)) {
!         $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');
!     }
! 
!     return true;
  }
  
--- 94,103 ----
  function plugin_load_configuration()
  {
!     global $_CONF, $base_path;
  
      require_once $_CONF['path_system'] . 'classes/config.class.php';
+     require_once $base_path . 'install_defaults.php';
  
!     return plugin_initconfig_spamx();
  }