[geeklog-cvs] geeklog-1.3/public_html/admin block.php,1.62,1.63 event.php,1.51,1.52 link.php,1.44,1.45 poll.php,1.40,1.41 story.php,1.135,1.136 topic.php,1.47,1.48

[dhaun at iowaoutdoors.org]

Update of /var/cvs/geeklog-1.3/public_html/admin
In directory www:/tmp/cvs-serv32050/public_html/admin

Modified Files:
	block.php event.php link.php poll.php story.php topic.php 
Log Message:
When setting the default group and the user is not a member of one of the standard Admin groups, find a matching group and use that one instead.


Index: poll.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/admin/poll.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** poll.php	29 Sep 2004 13:15:27 -0000	1.40
--- poll.php	29 Sep 2004 17:43:43 -0000	1.41
***************
*** 243,247 ****
              $Q['group_id'] = $_GROUPS['Poll Admin'];
          } else {
!             $Q['group_id'] = $_GROUPS['Logged-in Users'];
          }
          $Q['perm_owner'] = 3;
--- 243,247 ----
              $Q['group_id'] = $_GROUPS['Poll Admin'];
          } else {
!             $Q['group_id'] = SEC_getFeatureGroup ('poll.edit');
          }
          $Q['perm_owner'] = 3;

Index: event.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/admin/event.php,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** event.php	29 Sep 2004 13:15:27 -0000	1.51
--- event.php	29 Sep 2004 17:43:43 -0000	1.52
***************
*** 109,115 ****
          $A['owner_id'] = $_USER['uid'];
          if (isset ($_GROUPS['Event Admin'])) {
!             $A['group_id'] = $_GROUPS['Topic Admin'];
          } else {
!             $A['group_id'] = $_GROUPS['Logged-in Users'];
          }
          $A['perm_owner'] = 3;
--- 109,115 ----
          $A['owner_id'] = $_USER['uid'];
          if (isset ($_GROUPS['Event Admin'])) {
!             $A['group_id'] = $_GROUPS['Event Admin'];
          } else {
!             $A['group_id'] = SEC_getFeatureGroup ('event.edit');
          }
          $A['perm_owner'] = 3;

Index: block.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/admin/block.php,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** block.php	29 Sep 2004 13:15:27 -0000	1.62
--- block.php	29 Sep 2004 17:43:43 -0000	1.63
***************
*** 190,194 ****
              $A['group_id'] = $_GROUPS['Block Admin'];
          } else {
!             $A['group_id'] = $_GROUPS['Logged-in Users'];
          }
          $A['perm_owner'] = 3;
--- 190,194 ----
              $A['group_id'] = $_GROUPS['Block Admin'];
          } else {
!             $A['group_id'] = SEC_getFeatureGroup ('block.edit');
          }
          $A['perm_owner'] = 3;

Index: story.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/admin/story.php,v
retrieving revision 1.135
retrieving revision 1.136
diff -C2 -d -r1.135 -r1.136
*** story.php	29 Sep 2004 13:15:27 -0000	1.135
--- story.php	29 Sep 2004 17:43:43 -0000	1.136
***************
*** 182,186 ****
              $A['group_id'] = $_GROUPS['Story Admin'];
          } else {
!             $A['group_id'] = $_GROUPS['Logged-in Users'];
          }
          $A['perm_owner'] = 3;
--- 182,186 ----
              $A['group_id'] = $_GROUPS['Story Admin'];
          } else {
!             $A['group_id'] = SEC_getFeatureGroup ('story.edit');
          }
          $A['perm_owner'] = 3;

Index: topic.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/admin/topic.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** topic.php	29 Sep 2004 13:15:27 -0000	1.47
--- topic.php	29 Sep 2004 17:43:43 -0000	1.48
***************
*** 90,94 ****
              $A['group_id'] = $_GROUPS['Topic Admin'];
          } else {
!             $A['group_id'] = $_GROUPS['Logged-in Users'];
          }
          $A['perm_owner'] = 3;
--- 90,94 ----
              $A['group_id'] = $_GROUPS['Topic Admin'];
          } else {
!             $A['group_id'] = SEC_getFeatureGroup ('topic.edit');
          }
          $A['perm_owner'] = 3;

Index: link.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/admin/link.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** link.php	29 Sep 2004 13:15:27 -0000	1.44
--- link.php	29 Sep 2004 17:43:43 -0000	1.45
***************
*** 101,105 ****
              $A['group_id'] = $_GROUPS['Link Admin'];
          } else {
!             $A['group_id'] = $_GROUPS['Logged-in Users'];
          }
          $A['perm_owner'] = 3;
--- 101,105 ----
              $A['group_id'] = $_GROUPS['Link Admin'];
          } else {
!             $A['group_id'] = SEC_getFeatureGroup ('link.edit');
          }
          $A['perm_owner'] = 3;
***************
*** 225,229 ****
                  $group_id = $_GROUPS['Link Admin'];
              } else {
!                 $group_id = $_GROUPS['Logged-in Users'];
              }
              $perm_owner = 3;
--- 225,229 ----
                  $group_id = $_GROUPS['Link Admin'];
              } else {
!                 $group_id = SEC_getFeatureGroup ('link.edit');
              }
              $perm_owner = 3;