[geeklog-cvs] geeklog-1.3/public_html/admin block.php,1.45,1.45.2.1 event.php,1.35,1.35.2.1 link.php,1.30,1.30.2.1 poll.php,1.28,1.28.2.1 topic.php,1.31,1.31.2.1
geeklog-cvs-admin at lists.geeklog.net
geeklog-cvs-admin at lists.geeklog.net
Fri May 23 07:49:30 EDT 2003
Update of /usr/cvs/geeklog/geeklog-1.3/public_html/admin
In directory internal.geeklog.net:/tmp/cvs-serv3761
Modified Files:
Tag: geeklog_1_3_7sr1_1
block.php event.php link.php poll.php topic.php
Log Message:
Conversion of permission arrays to numerical values has to happen before they are used ...
Index: block.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/block.php,v
retrieving revision 1.45
retrieving revision 1.45.2.1
diff -C2 -d -r1.45 -r1.45.2.1
*** block.php 10 Jan 2003 14:21:28 -0000 1.45
--- block.php 23 May 2003 11:49:27 -0000 1.45.2.1
***************
*** 321,324 ****
--- 321,327 ----
global $_TABLES, $_CONF, $LANG21, $LANG01, $MESSAGE, $HTTP_POST_VARS;
+ // Convert array values to numeric permission values
+ list($perm_owner,$perm_group,$perm_members,$perm_anon) = SEC_getPermissionValues($perm_owner,$perm_group,$perm_members,$perm_anon);
+
$access = 0;
if (DB_count ($_TABLES['blocks'], 'bid', $bid) > 0) {
***************
*** 391,396 ****
}
- // Convert array values to numeric permission values
- list($perm_owner,$perm_group,$perm_members,$perm_anon) = SEC_getPermissionValues($perm_owner,$perm_group,$perm_members,$perm_anon);
$title = addslashes (COM_stripslashes ($title));
DB_save($_TABLES['blocks'],'bid,name,title,help,type,blockorder,content,tid,rdfurl,rdfupdated,phpblockfn,onleft,owner_id,group_id,perm_owner,perm_group,perm_members,perm_anon,is_enabled',"$bid,'$name','$title','$help','$type','$blockorder','$content','$tid','$rdfurl','$rdfupdated','$phpblockfn',$onleft,$owner_id,$group_id,$perm_owner,$perm_group,$perm_members,$perm_anon,$is_enabled",$_CONF['site_admin_url'] . "/block.php?msg=11");
--- 394,397 ----
Index: event.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/event.php,v
retrieving revision 1.35
retrieving revision 1.35.2.1
diff -C2 -d -r1.35 -r1.35.2.1
*** event.php 10 Jan 2003 14:21:28 -0000 1.35
--- event.php 23 May 2003 11:49:27 -0000 1.35.2.1
***************
*** 400,404 ****
function saveevent($eid,$title,$event_type,$url,$allday,$start_month, $start_day, $start_year, $start_hour, $start_minute, $start_ampm, $end_month, $end_day, $end_year, $end_hour, $end_minute, $end_ampm, $location, $address1, $address2, $city, $state, $zipcode,$description,$owner_id,$group_id,$perm_owner,$perm_group,$perm_members,$perm_anon,$mode)
{
! global $_TABLES, $_CONF, $LANG22;
$access = 0;
--- 400,407 ----
function saveevent($eid,$title,$event_type,$url,$allday,$start_month, $start_day, $start_year, $start_hour, $start_minute, $start_ampm, $end_month, $end_day, $end_year, $end_hour, $end_minute, $end_ampm, $location, $address1, $address2, $city, $state, $zipcode,$description,$owner_id,$group_id,$perm_owner,$perm_group,$perm_members,$perm_anon,$mode)
{
! global $_TABLES, $_CONF, $LANG22;
!
! // Convert array values to numeric permission values
! list($perm_owner,$perm_group,$perm_members,$perm_anon) = SEC_getPermissionValues($perm_owner,$perm_group,$perm_members,$perm_anon);
$access = 0;
***************
*** 487,493 ****
DB_delete($_TABLES['eventsubmission'],'eid',$eid);
- // Convert array values to numeric permission values
- list($perm_owner,$perm_group,$perm_members,$perm_anon) = SEC_getPermissionValues($perm_owner,$perm_group,$perm_members,$perm_anon);
-
DB_save($_TABLES['events'],'eid,title,event_type,url,allday,datestart,dateend,timestart,timeend,location,address1,address2,city,state,zipcode,description,owner_id,group_id,perm_owner,perm_group,perm_members,perm_anon',"$eid,'$title','$event_type','$url',$allday,'$datestart','$dateend','$timestart','$timeend','$location','$address1','$address2','$city','$state','$zipcode','$description',$owner_id,$group_id,$perm_owner,$perm_group,$perm_members,$perm_anon");
if (DB_count ($_TABLES['personal_events'], 'eid', $eid) > 0) {
--- 490,493 ----
Index: link.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/link.php,v
retrieving revision 1.30
retrieving revision 1.30.2.1
diff -C2 -d -r1.30 -r1.30.2.1
*** link.php 10 Jan 2003 14:21:28 -0000 1.30
--- link.php 23 May 2003 11:49:27 -0000 1.30.2.1
***************
*** 193,196 ****
--- 193,201 ----
global $_TABLES, $_CONF, $LANG23, $MESSAGE, $_USER;
+ // Convert array values to numeric permission values
+ if (is_array($perm_owner) OR is_array($perm_group) OR is_array($perm_members) OR is_array($perm_anon)) {
+ list($perm_owner,$perm_group,$perm_members,$perm_anon) = SEC_getPermissionValues($perm_owner,$perm_group,$perm_members,$perm_anon);
+ }
+
// clean 'em up
$description = addslashes (COM_checkHTML (COM_checkWords ($description)));
***************
*** 240,247 ****
}
- // Convert array values to numeric permission values
- if (is_array($perm_owner) OR is_array($perm_group) OR is_array($perm_members) OR is_array($perm_anon)) {
- list($perm_owner,$perm_group,$perm_members,$perm_anon) = SEC_getPermissionValues($perm_owner,$perm_group,$perm_members,$perm_anon);
- }
DB_delete($_TABLES['linksubmission'],'lid',$lid);
DB_delete($_TABLES['links'],'lid',$lid);
--- 245,248 ----
Index: poll.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/poll.php,v
retrieving revision 1.28
retrieving revision 1.28.2.1
diff -C2 -d -r1.28 -r1.28.2.1
*** poll.php 10 Jan 2003 14:21:28 -0000 1.28
--- poll.php 23 May 2003 11:49:27 -0000 1.28.2.1
***************
*** 83,86 ****
--- 83,89 ----
global $_TABLES, $LANG25, $_CONF, $MESSAGE, $_POLL_VERBOSE;
+ // Convert array values to numeric permission values
+ list($perm_owner,$perm_group,$perm_members,$perm_anon) = SEC_getPermissionValues($perm_owner,$perm_group,$perm_members,$perm_anon);
+
$question = COM_stripslashes ($question);
for ($i = 0; $i < sizeof($A); $i++) {
***************
*** 117,123 ****
$voters = '0';
}
-
- // Convert array values to numeric permission values
- list($perm_owner,$perm_group,$perm_members,$perm_anon) = SEC_getPermissionValues($perm_owner,$perm_group,$perm_members,$perm_anon);
if ($_POLL_VERBOSE) {
--- 120,123 ----
Index: topic.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/topic.php,v
retrieving revision 1.31
retrieving revision 1.31.2.1
diff -C2 -d -r1.31 -r1.31.2.1
*** topic.php 10 Jan 2003 14:21:28 -0000 1.31
--- topic.php 23 May 2003 11:49:27 -0000 1.31.2.1
***************
*** 162,165 ****
--- 162,168 ----
global $_TABLES, $_CONF, $LANG27, $MESSAGE;
+ //Convert array values to numeric permission values
+ list($perm_owner,$perm_group,$perm_members,$perm_anon) = SEC_getPermissionValues($perm_owner,$perm_group,$perm_members,$perm_anon);
+
$access = 0;
if (DB_count ($_TABLES['topics'], 'tid', $tid) > 0) {
***************
*** 187,192 ****
}
$topic = addslashes ($topic);
- //Convert array values to numeric permission values
- list($perm_owner,$perm_group,$perm_members,$perm_anon) = SEC_getPermissionValues($perm_owner,$perm_group,$perm_members,$perm_anon);
DB_save($_TABLES['topics'],'tid, topic, imageurl, sortnum, limitnews, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon',"'$tid', '$topic', '$imageurl','$sortnum','$limitnews',$owner_id,$group_id,$perm_owner,$perm_group,$perm_members,$perm_anon",$_CONF['site_admin_url'] . "/topic.php?msg=13");
} else {
--- 190,193 ----
More information about the geeklog-cvs
mailing list