[geeklog-cvs] geeklog-1.3/sql/updates mysql_1.3.9_to_1.3.10.php,1.20,1.21

[dhaun at iowaoutdoors.org]

Update of /var/cvs/geeklog-1.3/sql/updates
In directory www:/tmp/cvs-serv11075/updates

Modified Files:
	mysql_1.3.9_to_1.3.10.php 
Log Message:
Rewrote SpamX plugin install / upgrade to be more forgiving with existing installs.


Index: mysql_1.3.9_to_1.3.10.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/sql/updates/mysql_1.3.9_to_1.3.10.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** mysql_1.3.9_to_1.3.10.php	24 Sep 2004 10:08:03 -0000	1.20
--- mysql_1.3.9_to_1.3.10.php	28 Sep 2004 07:47:02 -0000	1.21
***************
*** 180,204 ****
      $_SPX_DATA[] = "INSERT INTO {$_TABLES['spamx']} VALUES ('Examine','BlackList')";
      $_SPX_DATA[] = "INSERT INTO {$_TABLES['spamx']} VALUES ('Examine','MTBlackList')";
-     $_SPX_DATA[] = "INSERT INTO {$_TABLES['spamx']} VALUES ('Personal','zaraz.com')";
  
!     $spxversion = get_SPX_ver ();
!     if ($spxversion == 0) { // plugin not installed yet
          DB_query ($_SPX_ADMIN); // add SpamX Admin group
          $group_id = DB_insertId ();
! 
          DB_query ($_SPX_FEAT); // add 'spamx.admin' feature
          $feat_id = DB_insertId ();
          // add feature to spamx admin group
          DB_query ("INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES ($feat_id, $group_id)");
! 
          // make Root group a member of the SpamX Admin group
          DB_query ("INSERT INTO {$_TABLES['group_assignments']} VALUES ($group_id, NULL, 1)");
-     } else if ($spxversion == 1) { // version 1.0 already installed
-         // delete plugin entry so that we can update it below
-         DB_delete ($_TABLES['plugins'], 'pi_name', 'spamx');
      }
  
      if (($spxversion == 0) || ($spxversion == 1)) {
!         DB_query ($_SPX_PLUGIN); // add entry to 'plugins' table
  
          // create 'spamx' table
--- 180,210 ----
      $_SPX_DATA[] = "INSERT INTO {$_TABLES['spamx']} VALUES ('Examine','BlackList')";
      $_SPX_DATA[] = "INSERT INTO {$_TABLES['spamx']} VALUES ('Examine','MTBlackList')";
  
!     $group_id = DB_getItem ($_TABLES['groups'], 'grp_id',
!                             "grp_name = 'spamx Admin'");
!     if ($group_id <= 0) {
          DB_query ($_SPX_ADMIN); // add SpamX Admin group
          $group_id = DB_insertId ();
!     }
!     $feat_id = DB_getItem ($_TABLES['features'], 'ft_id',
!                            "ft_name = 'spamx.admin'");
!     if ($feat_id <= 0) {
          DB_query ($_SPX_FEAT); // add 'spamx.admin' feature
          $feat_id = DB_insertId ();
+     }
+     if (DB_getItem ($_TABLES['access'], 'acc_grp_id', "acc_ft_id = $feat_id")
+         != $group_id) {
          // add feature to spamx admin group
          DB_query ("INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES ($feat_id, $group_id)");
!     }
!     if (DB_getItem ($_TABLES['group_assignments'], 'ug_main_grp_id', "ug_uid = NULL AND ug_grp_id = 1") != $group_id) {
          // make Root group a member of the SpamX Admin group
          DB_query ("INSERT INTO {$_TABLES['group_assignments']} VALUES ($group_id, NULL, 1)");
      }
  
+     $spxversion = get_SPX_Ver ();
      if (($spxversion == 0) || ($spxversion == 1)) {
!         // delete plugin entry so that we can update it below
!         DB_delete ($_TABLES['plugins'], 'pi_name', 'spamx');
  
          // create 'spamx' table
***************
*** 211,216 ****
--- 217,225 ----
              DB_query ($data);
          }
+ 
+         DB_query ($_SPX_PLUGIN); // add entry to 'plugins' table
      }
  
+ 
      return true;
  }