[geeklog-cvs] geeklog-1.3/plugins/spamx functions.inc,1.1,1.2

[dhaun at iowaoutdoors.org]

Update of /var/cvs/geeklog-1.3/plugins/spamx
In directory www:/tmp/cvs-serv5593

Modified Files:
	functions.inc 
Log Message:
Fixed uninstall: Drop the gl_spamx table.


Index: functions.inc
===================================================================
RCS file: /var/cvs/geeklog-1.3/plugins/spamx/functions.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** functions.inc	3 Sep 2004 19:59:55 -0000	1.1
--- functions.inc	16 Sep 2004 08:08:32 -0000	1.2
***************
*** 99,104 ****
      $retval = array();
      if (SEC_hasRights('spamx.admin')) {
!         $retval = array('spamx',$_CONF['site_admin_url'] . '/plugins/spamx/index.php',$_CONF['site_url'] . '/spamx/images/spamx.gif');
      }
      return $retval;
  }
--- 99,107 ----
      $retval = array();
      if (SEC_hasRights('spamx.admin')) {
!         $retval = array('spamx',
!                         $_CONF['site_admin_url'] . '/plugins/spamx/index.php',
!                         $_CONF['site_admin_url'] . '/plugins/spamx/images/spamx.gif');
      }
+ 
      return $retval;
  }
***************
*** 119,139 ****
  
      if (SEC_hasRights('spamx.admin')) {
!         return array('spamx', $_CONF['site_admin_url'] . '/plugins/spamx/index.php', 0);
      }
  }
  
- /**
- * Returns the user option for this plugin
- *
- * Adds the plugin to the user menu
- *
- * Universal Plugin:  modify/uncomment use it
- *
- * @return   array   Array containing (plugin name, plugin user url, 0)
- *
- */
- function plugin_getuseroption_spamx() 
- {
- }
  
  /**
--- 122,130 ----
  
      if (SEC_hasRights('spamx.admin')) {
!         return array('spamx',
!                      $_CONF['site_admin_url'] . '/plugins/spamx/index.php', 0);
      }
  }
  
  
  /**
***************
*** 312,321 ****
      global $_TABLES, $LANG_SX00;
  
!     // The spamxs need to be changed to the name of your plugin
!     //
!     $pi_name='spamx';
!     $FEATURES = array ( 'spamx.admin', 'spamx.view');
!     $TABLES = array ('table1','table2');
!     
      // Check and see if plugin is still enabled - if so display warning and exit
      if ($installCheck != '' && DB_getItem($_TABLES['plugins'],'pi_enabled', 'pi_name = "' .$pi_name. '"')) {
--- 303,310 ----
      global $_TABLES, $LANG_SX00;
  
!     $pi_name     = 'spamx';
!     $FEATURES    = array ('spamx.admin', 'spamx.view');
!     $admin_group = 'spamx Admin';
! 
      // Check and see if plugin is still enabled - if so display warning and exit
      if ($installCheck != '' && DB_getItem($_TABLES['plugins'],'pi_enabled', 'pi_name = "' .$pi_name. '"')) {
***************
*** 328,332 ****
  		exit;
  	}
!     	
  	// Ok to proceed and delete plugin
  
--- 317,321 ----
  		exit;
  	}
! 
  	// Ok to proceed and delete plugin
  
***************
*** 336,341 ****
  
      // Remove Security for this plugin
!     $grp_id = DB_getItem($_TABLES['vars'], 'value', "name = '{$pi_name}_gid'");
!     
      COM_errorLog("Removing $pi_name Admin Group", 1);
      DB_query("DELETE FROM {$_TABLES['groups']} WHERE grp_id = $grp_id",1);
--- 325,330 ----
  
      // Remove Security for this plugin
!     $grp_id = DB_getItem ($_TABLES['groups'], 'grp_id', "grp_name = '{$admin_group}'");
! 
      COM_errorLog("Removing $pi_name Admin Group", 1);
      DB_query("DELETE FROM {$_TABLES['groups']} WHERE grp_id = $grp_id",1);
***************
*** 343,347 ****
      COM_errorLog("Removing root users from admin of $pi_name");
      DB_query("DELETE FROM {$_TABLES['group_assignments']} WHERE ug_main_grp_id = $grp_id",1);
!     
      // Remove all the associated features -- access rights
      foreach ($FEATURES as $feature) {
--- 332,336 ----
      COM_errorLog("Removing root users from admin of $pi_name");
      DB_query("DELETE FROM {$_TABLES['group_assignments']} WHERE ug_main_grp_id = $grp_id",1);
! 
      // Remove all the associated features -- access rights
      foreach ($FEATURES as $feature) {
***************
*** 351,358 ****
          DB_query("DELETE FROM {$_TABLES['features']} WHERE ft_id = $feat_id",1);
      }
!         
      COM_errorLog('...success',1);
      return true;
  }
  
! ?>
\ No newline at end of file
--- 340,350 ----
          DB_query("DELETE FROM {$_TABLES['features']} WHERE ft_id = $feat_id",1);
      }
!  
!     COM_errorLog ('Dropping ' . $_TABLES['spamx'] . ' table.', 1);
!     DB_query ("DROP TABLE {$_TABLES['spamx']}");
! 
      COM_errorLog('...success',1);
      return true;
  }
  
! ?>