[geeklog-cvs] geeklog-1.3/public_html/admin block.php,1.61,1.62 event.php,1.50,1.51 link.php,1.43,1.44 poll.php,1.39,1.40 story.php,1.134,1.135 topic.php,1.46,1.47
dhaun at iowaoutdoors.org
dhaun at iowaoutdoors.org
Wed Sep 29 09:15:29 EDT 2004
Update of /var/cvs/geeklog-1.3/public_html/admin
In directory www:/tmp/cvs-serv15540
Modified Files:
block.php event.php link.php poll.php story.php topic.php
Log Message:
Before setting the default group, make sure the user is actually a member of that group (e.g. user has 'story.edit' permissions but is not a member of the 'Story Admin' group).
Index: poll.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/admin/poll.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** poll.php 25 Sep 2004 18:38:17 -0000 1.39
--- poll.php 29 Sep 2004 13:15:27 -0000 1.40
***************
*** 202,206 ****
function editpoll ($qid = '')
{
! global $_CONF, $_TABLES, $_USER, $LANG25, $LANG_ACCESS;
$retval = '';
--- 202,206 ----
function editpoll ($qid = '')
{
! global $_CONF, $_GROUPS, $_TABLES, $_USER, $LANG25, $LANG_ACCESS;
$retval = '';
***************
*** 240,245 ****
} else {
$Q['owner_id'] = $_USER['uid'];
! $Q['group_id'] = DB_getItem ($_TABLES['groups'], 'grp_id',
! "grp_name = 'Poll Admin'");
$Q['perm_owner'] = 3;
$Q['perm_group'] = 2;
--- 240,248 ----
} else {
$Q['owner_id'] = $_USER['uid'];
! if (isset ($_GROUPS['Poll Admin'])) {
! $Q['group_id'] = $_GROUPS['Poll Admin'];
! } else {
! $Q['group_id'] = $_GROUPS['Logged-in Users'];
! }
$Q['perm_owner'] = 3;
$Q['perm_group'] = 2;
Index: event.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/admin/event.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** event.php 4 Sep 2004 19:34:33 -0000 1.50
--- event.php 29 Sep 2004 13:15:27 -0000 1.51
***************
*** 76,80 ****
function editevent ($mode, $A, $msg = '')
{
! global $_CONF, $_TABLES, $_USER, $LANG12, $LANG22, $LANG30, $LANG_ACCESS, $_STATES;
$retval = '';
--- 76,81 ----
function editevent ($mode, $A, $msg = '')
{
! global $_CONF, $_GROUPS, $_TABLES, $_USER, $LANG12, $LANG22, $LANG30,
! $LANG_ACCESS, $_STATES;
$retval = '';
***************
*** 107,111 ****
} else {
$A['owner_id'] = $_USER['uid'];
! $A['group_id'] = DB_getItem($_TABLES['groups'],'grp_id',"grp_name = 'Event Admin'");
$A['perm_owner'] = 3;
$A['perm_group'] = 2;
--- 108,116 ----
} else {
$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;
$A['perm_group'] = 2;
Index: block.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/admin/block.php,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** block.php 11 Aug 2004 09:22:34 -0000 1.61
--- block.php 29 Sep 2004 13:15:27 -0000 1.62
***************
*** 162,166 ****
function editblock ($bid = '')
{
! global $_CONF, $_TABLES, $_USER, $LANG21, $LANG_ACCESS;
$retval = '';
--- 162,166 ----
function editblock ($bid = '')
{
! global $_CONF, $_GROUPS, $_TABLES, $_USER, $LANG21, $LANG_ACCESS;
$retval = '';
***************
*** 187,192 ****
$A['blockorder'] = 0;
$A['owner_id'] = $_USER['uid'];
! $A['group_id'] = DB_getItem ($_TABLES['groups'], 'grp_id',
! "grp_name = 'Block Admin'");
$A['perm_owner'] = 3;
$A['perm_group'] = 2;
--- 187,195 ----
$A['blockorder'] = 0;
$A['owner_id'] = $_USER['uid'];
! if (isset ($_GROUPS['Block Admin'])) {
! $A['group_id'] = $_GROUPS['Block Admin'];
! } else {
! $A['group_id'] = $_GROUPS['Logged-in Users'];
! }
$A['perm_owner'] = 3;
$A['perm_group'] = 2;
Index: story.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/admin/story.php,v
retrieving revision 1.134
retrieving revision 1.135
diff -C2 -d -r1.134 -r1.135
*** story.php 25 Sep 2004 18:38:17 -0000 1.134
--- story.php 29 Sep 2004 13:15:27 -0000 1.135
***************
*** 116,120 ****
function storyeditor($sid = '', $mode = '')
{
! global $_TABLES, $HTTP_POST_VARS, $_USER, $_CONF, $LANG24, $LANG_ACCESS;
$display = '';
--- 116,121 ----
function storyeditor($sid = '', $mode = '')
{
! global $_CONF, $_GROUPS, $_TABLES, $_USER, $LANG24, $LANG_ACCESS,
! $HTTP_POST_VARS;
$display = '';
***************
*** 178,183 ****
$A['featured'] = 0;
$A['owner_id'] = $_USER['uid'];
! $A['group_id'] = DB_getItem ($_TABLES['groups'], 'grp_id',
! "grp_name = 'Story Admin'");
$A['perm_owner'] = 3;
$A['perm_group'] = 2;
--- 179,187 ----
$A['featured'] = 0;
$A['owner_id'] = $_USER['uid'];
! if (isset ($_GROUPS['Story Admin'])) {
! $A['group_id'] = $_GROUPS['Story Admin'];
! } else {
! $A['group_id'] = $_GROUPS['Logged-in Users'];
! }
$A['perm_owner'] = 3;
$A['perm_group'] = 2;
***************
*** 506,510 ****
function liststories($page = 1)
{
! global $_TABLES, $LANG24, $_CONF, $LANG_ACCESS, $LANG09, $_USER, $_GROUPS,$HTTP_POST_VARS,$HTTP_GET_VARS;
$display = '';
--- 510,515 ----
function liststories($page = 1)
{
! global $_CONF, $_TABLES, $_USER, $LANG09, $LANG24, $LANG_ACCESS,
! $HTTP_POST_VARS, $HTTP_GET_VARS;
$display = '';
Index: topic.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/admin/topic.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** topic.php 28 Sep 2004 08:28:49 -0000 1.46
--- topic.php 29 Sep 2004 13:15:27 -0000 1.47
***************
*** 64,68 ****
function edittopic ($tid = '')
{
! global $_CONF, $_TABLES, $_USER, $LANG27, $LANG_ACCESS;
if (!empty($tid)) {
--- 64,68 ----
function edittopic ($tid = '')
{
! global $_CONF, $_GROUPS, $_TABLES, $_USER, $LANG27, $LANG_ACCESS;
if (!empty($tid)) {
***************
*** 87,92 ****
// this is the one instance where we default the group
// most topics should belong to the Topic Admin group
! // and the private flag should be turned OFF
! $A['group_id'] = DB_getItem($_TABLES['groups'],'grp_id',"grp_name = 'Topic Admin'");
$A['perm_owner'] = 3;
$A['perm_group'] = 2;
--- 87,95 ----
// this is the one instance where we default the group
// most topics should belong to the Topic Admin group
! if (isset ($_GROUPS['Topic Admin'])) {
! $A['group_id'] = $_GROUPS['Topic Admin'];
! } else {
! $A['group_id'] = $_GROUPS['Logged-in Users'];
! }
$A['perm_owner'] = 3;
$A['perm_group'] = 2;
Index: link.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/admin/link.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** link.php 26 Jul 2004 07:51:36 -0000 1.43
--- link.php 29 Sep 2004 13:15:27 -0000 1.44
***************
*** 70,74 ****
function editlink ($mode, $lid = '')
{
! global $_CONF, $_TABLES, $_USER, $LANG23, $LANG_ACCESS;
$retval = '';
--- 70,74 ----
function editlink ($mode, $lid = '')
{
! global $_CONF, $_GROUPS, $_TABLES, $_USER, $LANG23, $LANG_ACCESS;
$retval = '';
***************
*** 98,102 ****
$A['hits'] = 0;
$A['owner_id'] = $_USER['uid'];
! $A['group_id'] = DB_getItem($_TABLES['groups'],'grp_id',"grp_name = 'Link Admin'");
$A['perm_owner'] = 3;
$A['perm_group'] = 2;
--- 98,106 ----
$A['hits'] = 0;
$A['owner_id'] = $_USER['uid'];
! if (isset ($_GROUPS['Link Admin'])) {
! $A['group_id'] = $_GROUPS['Link Admin'];
! } else {
! $A['group_id'] = $_GROUPS['Logged-in Users'];
! }
$A['perm_owner'] = 3;
$A['perm_group'] = 2;
***************
*** 201,205 ****
function savelink ($lid, $category, $categorydd, $url, $description, $title, $hits, $owner_id, $group_id, $perm_owner, $perm_group, $perm_members, $perm_anon)
{
! global $_CONF, $_TABLES, $_USER, $LANG23, $MESSAGE;
// Convert array values to numeric permission values
--- 205,209 ----
function savelink ($lid, $category, $categorydd, $url, $description, $title, $hits, $owner_id, $group_id, $perm_owner, $perm_group, $perm_members, $perm_anon)
{
! global $_CONF, $_GROUPS, $_TABLES, $_USER, $LANG23, $MESSAGE;
// Convert array values to numeric permission values
***************
*** 218,227 ****
if (empty ($owner_id)) {
$owner_id = $_USER['uid'];
! $group_id = DB_getItem ($_TABLES['groups'], 'grp_id',
! "grp_name = 'Link Admin'");
$perm_owner = 3;
$perm_group = 2;
$perm_members = 2;
! $perm_anon = 2;
}
}
--- 222,234 ----
if (empty ($owner_id)) {
$owner_id = $_USER['uid'];
! if (isset ($_GROUPS['Link Admin'])) {
! $group_id = $_GROUPS['Link Admin'];
! } else {
! $group_id = $_GROUPS['Logged-in Users'];
! }
$perm_owner = 3;
$perm_group = 2;
$perm_members = 2;
! $perm_anon = 2;
}
}
More information about the geeklog-cvs
mailing list