[geeklog-cvs] geeklog-1.3/public_html pollbooth.php,1.18,1.19 stats.php,1.22,1.23 users.php,1.62,1.63 usersettings.php,1.57,1.58
geeklog-cvs-admin at lists.geeklog.net
geeklog-cvs-admin at lists.geeklog.net
Wed May 14 06:48:55 EDT 2003
Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory internal.geeklog.net:/tmp/cvs-serv15512
Modified Files:
pollbooth.php stats.php users.php usersettings.php
Log Message:
Use COM_getPermSQL(), now that we have it ...
Index: pollbooth.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/pollbooth.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** pollbooth.php 8 May 2003 17:23:10 -0000 1.18
--- pollbooth.php 14 May 2003 10:48:52 -0000 1.19
***************
*** 92,110 ****
$retval .= $login->finish ($login->get_var('output'));
} else {
! $sql = "SELECT qid,question,voters FROM {$_TABLES['pollquestions']} WHERE ";
! if (!empty ($_USER['uid'])) {
! $groupList = '';
! if (!empty ($_USER['uid'])) {
! foreach ($_GROUPS as $grp) {
! $groupList .= $grp . ',';
! }
! $groupList = substr ($groupList, 0, -1);
! }
! $sql .= "(owner_id = {$_USER['uid']} AND perm_owner >= 2) OR ";
! $sql .= "(group_id IN ($groupList) AND perm_group >= 2) OR ";
! $sql .= "(perm_members >= 2) OR ";
! }
! $sql .= "(perm_anon >= 2)";
!
$result = DB_query($sql);
$nrows = DB_numRows($result);
--- 92,97 ----
$retval .= $login->finish ($login->get_var('output'));
} else {
! $sql = "SELECT qid,question,voters FROM {$_TABLES['pollquestions']}"
! . COM_getPermSQL ();
$result = DB_query($sql);
$nrows = DB_numRows($result);
Index: stats.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/stats.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** stats.php 19 Jan 2003 17:22:26 -0000 1.22
--- stats.php 14 May 2003 10:48:52 -0000 1.23
***************
*** 65,83 ****
'statrow'=>'singlestat.thtml'));
- $groupList = '';
- if (!empty ($_USER['uid'])) {
- foreach ($_GROUPS as $grp) {
- $groupList .= $grp . ',';
- }
- $groupList = substr ($groupList, 0, -1);
- }
- $permsql = '';
- if (!empty ($_USER['uid'])) {
- $permsql .= "(owner_id = {$_USER['uid']} AND perm_owner >= 2) OR "
- . "(group_id IN ($groupList) AND perm_group >= 2) OR "
- . "(perm_members >= 2) OR ";
- }
- $permsql .= "(perm_anon >= 2)";
-
// Overall Site Statistics
--- 65,68 ----
***************
*** 88,92 ****
$id = array('draft_flag','date');
$values = array('0','NOW()');
! $result = DB_query("SELECT count(*) AS count,SUM(comments) as ccount FROM {$_TABLES['stories']} WHERE (draft_flag = 0) AND (date <= NOW()) AND ({$permsql})");
$A = DB_fetchArray($result);
$total_stories = $A['count'];
--- 73,77 ----
$id = array('draft_flag','date');
$values = array('0','NOW()');
! $result = DB_query("SELECT count(*) AS count,SUM(comments) as ccount FROM {$_TABLES['stories']} WHERE (draft_flag = 0) AND (date <= NOW())" . COM_getPermSQL ('AND'));
$A = DB_fetchArray($result);
$total_stories = $A['count'];
***************
*** 99,106 ****
$stat_templates->set_var('total_comments',$comments);
! $result = DB_query ("SELECT count(*) AS count FROM {$_TABLES['pollquestions']} WHERE ({$permsql})");
$A = DB_fetchArray($result);
$total_polls = $A['count'];
! $result = DB_query ("SELECT qid FROM {$_TABLES['pollquestions']} WHERE ({$permsql})");
$nrows = DB_numRows ($result);
if ($nrows > 0) {
--- 84,91 ----
$stat_templates->set_var('total_comments',$comments);
! $result = DB_query ("SELECT count(*) AS count FROM {$_TABLES['pollquestions']}" . COM_getPermSQL ());
$A = DB_fetchArray($result);
$total_polls = $A['count'];
! $result = DB_query ("SELECT qid FROM {$_TABLES['pollquestions']}" . COM_getPermSQL ());
$nrows = DB_numRows ($result);
if ($nrows > 0) {
***************
*** 123,127 ****
$stat_templates->set_var('total_answers', $total_answers);
! $result = DB_query ("SELECT count(*) AS count,SUM(hits) AS clicks FROM {$_TABLES['links']} WHERE ({$permsql})");
$A = DB_fetchArray($result);
$total_links = $A['count'];
--- 108,112 ----
$stat_templates->set_var('total_answers', $total_answers);
! $result = DB_query ("SELECT count(*) AS count,SUM(hits) AS clicks FROM {$_TABLES['links']}" . COM_getPermSQL ());
$A = DB_fetchArray($result);
$total_links = $A['count'];
***************
*** 134,138 ****
$stat_templates->set_var('total_clicks',$total_clicks);
! $result = DB_query ("SELECT count(*) AS count FROM {$_TABLES['events']} WHERE ({$permsql})");
$A = DB_fetchArray($result);
$total_events = $A['count'];
--- 119,123 ----
$stat_templates->set_var('total_clicks',$total_clicks);
! $result = DB_query ("SELECT count(*) AS count FROM {$_TABLES['events']}" . COM_getPermSQL ());
$A = DB_fetchArray($result);
$total_events = $A['count'];
***************
*** 151,155 ****
// Detailed story statistics
! $result = DB_query("SELECT sid,title,hits FROM {$_TABLES["stories"]} WHERE (draft_flag = 0) AND (date <= NOW()) AND (Hits > 0) AND ({$permsql}) ORDER BY Hits desc LIMIT 10");
$nrows = DB_numRows($result);
--- 136,140 ----
// Detailed story statistics
! $result = DB_query("SELECT sid,title,hits FROM {$_TABLES["stories"]} WHERE (draft_flag = 0) AND (date <= NOW()) AND (Hits > 0)" . COM_getPermSQL ('AND') . " ORDER BY Hits desc LIMIT 10");
$nrows = DB_numRows($result);
***************
*** 176,180 ****
// Top Ten Commented Stories
! $result = DB_query("SELECT sid,title,comments from {$_TABLES['stories']} WHERE (draft_flag = 0) AND (date <= NOW()) AND (comments > 0) AND ({$permsql}) ORDER BY comments desc LIMIT 10");
$nrows = DB_numRows($result);
$display .= COM_startBlock($LANG10[11]);
--- 161,165 ----
// Top Ten Commented Stories
! $result = DB_query("SELECT sid,title,comments from {$_TABLES['stories']} WHERE (draft_flag = 0) AND (date <= NOW()) AND (comments > 0)" . COM_getPermSQL ('AND') . " ORDER BY comments desc LIMIT 10");
$nrows = DB_numRows($result);
$display .= COM_startBlock($LANG10[11]);
***************
*** 199,203 ****
// Top Ten Emailed Stories
! $result = DB_query("SELECT sid,title,numemails FROM {$_TABLES["stories"]} WHERE (numemails > 0) AND (draft_flag = 0) AND (date <= NOW()) AND ({$permsql}) ORDER BY numemails desc LIMIT 10");
$nrows = DB_numRows($result);
$display .= COM_startBlock($LANG10[22]);
--- 184,188 ----
// Top Ten Emailed Stories
! $result = DB_query("SELECT sid,title,numemails FROM {$_TABLES["stories"]} WHERE (numemails > 0) AND (draft_flag = 0) AND (date <= NOW())" . COM_getPermSQL ('AND') . " ORDER BY numemails desc LIMIT 10");
$nrows = DB_numRows($result);
$display .= COM_startBlock($LANG10[22]);
***************
*** 223,227 ****
// Top Ten Polls
! $result = DB_query("SELECT qid,question,voters from {$_TABLES['pollquestions']} WHERE (voters > 0) AND ({$permsql}) ORDER BY voters desc LIMIT 10");
$nrows = DB_numRows($result);
$display .= COM_startBlock($LANG10[14]);
--- 208,212 ----
// Top Ten Polls
! $result = DB_query("SELECT qid,question,voters from {$_TABLES['pollquestions']} WHERE (voters > 0)" . COM_getPermSQL ('AND') . " ORDER BY voters desc LIMIT 10");
$nrows = DB_numRows($result);
$display .= COM_startBlock($LANG10[14]);
***************
*** 247,251 ****
// Top Ten Links
! $result = DB_query("SELECT lid,url,title,hits from {$_TABLES['links']} WHERE (hits > 0) AND ({$permsql}) ORDER BY hits desc LIMIT 10");
$nrows = DB_numRows($result);
$display .= COM_startBlock($LANG10[18]);
--- 232,236 ----
// Top Ten Links
! $result = DB_query("SELECT lid,url,title,hits from {$_TABLES['links']} WHERE (hits > 0)" . COM_getPermSQL ('AND') . " ORDER BY hits desc LIMIT 10");
$nrows = DB_numRows($result);
$display .= COM_startBlock($LANG10[18]);
Index: users.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/users.php,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** users.php 8 May 2003 17:23:10 -0000 1.62
--- users.php 14 May 2003 10:48:52 -0000 1.63
***************
*** 133,148 ****
// list of last 10 stories by this user
! $groupList = '';
! $sql = "SELECT sid,title,UNIX_TIMESTAMP(date) AS unixdate FROM {$_TABLES['stories']} WHERE (uid = $user) AND (draft_flag = 0) AND (date <= NOW()) AND (";
! if (!empty ($_USER['uid'])) {
! foreach ($_GROUPS as $grp) {
! $groupList .= $grp . ',';
! }
! $groupList = substr ($groupList, 0, -1);
! $sql .= "(owner_id = {$_USER['uid']} AND perm_owner >= 2) OR ";
! $sql .= "(group_id IN ($groupList) AND perm_group >= 2) OR ";
! $sql .= "(perm_members >= 2) OR ";
! }
! $sql .= "(perm_anon >= 2)) ORDER BY unixdate DESC LIMIT 10";
$result = DB_query($sql);
$nrows = DB_numRows($result);
--- 133,138 ----
// list of last 10 stories by this user
! $sql = "SELECT sid,title,UNIX_TIMESTAMP(date) AS unixdate FROM {$_TABLES['stories']} WHERE (uid = $user) AND (draft_flag = 0) AND (date <= NOW())" . COM_getPermSQL ('AND');
! $sql .= " ORDER BY unixdate DESC LIMIT 10";
$result = DB_query($sql);
$nrows = DB_numRows($result);
***************
*** 166,176 ****
// list of last 10 comments by this user
// first, get a list of all stories the current visitor has access to
! $sql = "SELECT sid FROM {$_TABLES['stories']} WHERE (draft_flag = 0) AND (date <= NOW()) AND (";
! if (!empty ($_USER['uid'])) {
! $sql .= "(owner_id = {$_USER['uid']} AND perm_owner >= 2) OR ";
! $sql .= "(group_id IN ($groupList) AND perm_group >= 2) OR ";
! $sql .= "(perm_members >= 2) OR ";
! }
! $sql .= "(perm_anon >= 2))";
$result = DB_query($sql);
$numsids = DB_numRows($result);
--- 156,160 ----
// list of last 10 comments by this user
// first, get a list of all stories the current visitor has access to
! $sql = "SELECT sid FROM {$_TABLES['stories']} WHERE (draft_flag = 0) AND (date <= NOW())" . COM_getPermSQL ('AND');
$result = DB_query($sql);
$numsids = DB_numRows($result);
***************
*** 181,191 ****
}
// add all polls the current visitor has access to
! $sql = "SELECT qid FROM {$_TABLES['pollquestions']} WHERE ";
! if (!empty ($_USER['uid'])) {
! $sql .= "(owner_id = {$_USER['uid']} AND perm_owner >= 2) OR ";
! $sql .= "(group_id IN ($groupList) AND perm_group >= 2) OR ";
! $sql .= "(perm_members >= 2) OR ";
! }
! $sql .= "(perm_anon >= 2)";
$result = DB_query($sql);
$numqids = DB_numRows($result);
--- 165,169 ----
}
// add all polls the current visitor has access to
! $sql = "SELECT qid FROM {$_TABLES['pollquestions']}" . COM_getPermSQL ();
$result = DB_query($sql);
$numqids = DB_numRows($result);
***************
*** 244,254 ****
// posting stats for this user
$user_templates->set_var ('lang_number_stories', $LANG04[84]);
! $sql = "SELECT count(*) AS count FROM {$_TABLES['stories']} WHERE (uid = $user) AND (draft_flag = 0) AND (date <= NOW()) AND (";
! if (!empty ($_USER['uid'])) {
! $sql .= "(owner_id = {$_USER['uid']} AND perm_owner >= 2) OR ";
! $sql .= "(group_id IN ($groupList) AND perm_group >= 2) OR ";
! $sql .= "(perm_members >= 2) OR ";
! }
! $sql .= "(perm_anon >= 2))";
$result = DB_query($sql);
$N = DB_fetchArray ($result);
--- 222,226 ----
// posting stats for this user
$user_templates->set_var ('lang_number_stories', $LANG04[84]);
! $sql = "SELECT count(*) AS count FROM {$_TABLES['stories']} WHERE (uid = $user) AND (draft_flag = 0) AND (date <= NOW())" . COM_getPermSQL ('AND');
$result = DB_query($sql);
$N = DB_fetchArray ($result);
Index: usersettings.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/usersettings.php,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** usersettings.php 8 May 2003 17:23:10 -0000 1.57
--- usersettings.php 14 May 2003 10:48:52 -0000 1.58
***************
*** 361,380 ****
// excluded items block
! $groupList = '';
! if (!empty ($_USER['uid'])) {
! foreach ($_GROUPS as $grp) {
! $groupList .= $grp . ',';
! }
! $groupList = substr ($groupList, 0, -1);
! }
!
! $permissions = '';
! if (!empty ($_USER['uid'])) {
! $permissions .= "(owner_id = {$_USER['uid']} AND perm_owner >= 2) OR ";
! $permissions .= "(group_id IN ($groupList) AND perm_group >= 2) OR ";
! $permissions .= "(perm_members >= 2) OR ";
! }
! $permissions .= "(perm_anon >= 2)";
!
$preferences->set_var ('exclude_topic_checklist',
COM_checkList($_TABLES['topics'],'tid,topic',$permissions,$A['tids']));
--- 361,365 ----
// excluded items block
! $permissions = COM_getPermSQL ('');
$preferences->set_var ('exclude_topic_checklist',
COM_checkList($_TABLES['topics'],'tid,topic',$permissions,$A['tids']));
***************
*** 426,430 ****
}
}
! $whereblock = "(" . $permissions . ") AND ((type != 'layout' AND type != 'gldefault' AND is_enabled = 1) OR (type = 'gldefault' AND is_enabled = 1 AND name IN ('whats_new_block','poll_block','events_block','older_stories'))) ORDER BY onleft desc,blockorder,title";
$preferences->set_var ('boxes_checklist', COM_checkList ($_TABLES['blocks'],
'bid,title,blockorder', $whereblock, $selectedblocks));
--- 411,419 ----
}
}
! $whereblock = '';
! if (!empty ($permissions)) {
! $whereblock .= $permissions . ' AND ';
! }
! $whereblock = "((type != 'layout' AND type != 'gldefault' AND is_enabled = 1) OR (type = 'gldefault' AND is_enabled = 1 AND name IN ('whats_new_block','poll_block','events_block','older_stories'))) ORDER BY onleft desc,blockorder,title";
$preferences->set_var ('boxes_checklist', COM_checkList ($_TABLES['blocks'],
'bid,title,blockorder', $whereblock, $selectedblocks));
More information about the geeklog-cvs
mailing list