[geeklog-cvs] geeklog-1.3/public_html lib-common.php,1.230,1.231 profiles.php,1.22,1.23 usersettings.php,1.62,1.63
geeklog-cvs-admin at lists.geeklog.net
geeklog-cvs-admin at lists.geeklog.net
Sun Jun 22 18:07:44 EDT 2003
Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory internal.geeklog.net:/tmp/cvs-serv17235/public_html
Modified Files:
lib-common.php profiles.php usersettings.php
Log Message:
Added a "Privacy Options" block to the Preferences which let the user chose not to receive emails (from Admins and/or other users) and show up in the Who's Online block.
Index: lib-common.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/lib-common.php,v
retrieving revision 1.230
retrieving revision 1.231
diff -C2 -d -r1.230 -r1.231
*** lib-common.php 21 Jun 2003 20:43:09 -0000 1.230
--- lib-common.php 22 Jun 2003 22:07:42 -0000 1.231
***************
*** 4442,4463 ****
$expire_time = time() - $_CONF['whosonline_threshold'];
! $result = DB_query( "SELECT DISTINCT {$_TABLES['sessions']}.uid, username,photo FROM {$_TABLES['sessions']},{$_TABLES['users']} WHERE {$_TABLES['users']}.uid = {$_TABLES['sessions']}.uid AND start_time >= $expire_time AND {$_TABLES['sessions']}.uid <> 1 ORDER BY username" );
$nrows = DB_numRows( $result );
for( $i = 1; $i <= $nrows; $i++ )
{
$A = DB_fetchArray( $result );
- $retval .= '<a href="' . $_CONF['site_url'] . '/users.php?mode=profile&uid=' . $A['uid'] . '">' . $A['username'] . '</a>';
! if( !empty( $A['photo'] ) AND $_CONF['allow_user_photo'] == 1)
! {
! $retval .= ' <a href="' . $_CONF['site_url'] . '/users.php?mode=profile&uid=' . $A['uid'] . '"><img src="' . $_CONF['layout_url'] . '/images/smallcamera.gif" border="0" alt=""></a>';
! }
! $retval .= '<br>';
}
! $num_anon = DB_query( "SELECT DISTINCT uid,remote_ip FROM {$_TABLES['sessions']} WHERE uid = 1" );
! $num_anon = DB_numRows( $num_anon );
if( $num_anon > 0 )
--- 4442,4477 ----
$expire_time = time() - $_CONF['whosonline_threshold'];
! $result = DB_query( "SELECT DISTINCT {$_TABLES['sessions']}.uid, username,photo,showonline FROM {$_TABLES['sessions']},{$_TABLES['users']},{$_TABLES['userprefs']} WHERE {$_TABLES['users']}.uid = {$_TABLES['sessions']}.uid AND {$_TABLES['users']}.uid = {$_TABLES['userprefs']}.uid AND start_time >= $expire_time AND {$_TABLES['sessions']}.uid <> 1 ORDER BY username" );
$nrows = DB_numRows( $result );
+ $num_anon = 0;
+
for( $i = 1; $i <= $nrows; $i++ )
{
$A = DB_fetchArray( $result );
! if( $A['showonline'] == 1 ) {
! $retval .= '<a href="' . $_CONF['site_url']
! . '/users.php?mode=profile&uid=' . $A['uid'] . '">'
! . $A['username'] . '</a>';
!
! if( !empty( $A['photo'] ) AND $_CONF['allow_user_photo'] == 1)
! {
! $retval .= ' <a href="' . $_CONF['site_url']
! . '/users.php?mode=profile&uid=' . $A['uid']
! . '"><img src="' . $_CONF['layout_url']
! . '/images/smallcamera.gif" border="0" alt=""></a>';
! }
! $retval .= '<br>';
!
! } else {
! // this user does not want to show up in Who's Online
! $num_anon++; // count as anonymous
! }
}
! $result = DB_query( "SELECT DISTINCT uid,remote_ip FROM {$_TABLES['sessions']} WHERE uid = 1" );
! $num_anon += DB_numRows( $result );
if( $num_anon > 0 )
Index: profiles.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/profiles.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** profiles.php 30 May 2003 08:16:34 -0000 1.22
--- profiles.php 22 Jun 2003 22:07:42 -0000 1.23
***************
*** 125,152 ****
$retval .= $login->finish ($login->get_var('output'));
$retval .= COM_endBlock();
! }
! else {
! $result = DB_query ("SELECT username FROM {$_TABLES['users']} WHERE uid = $uid");
! $A = DB_fetchArray ($result);
! $retval = COM_startBlock ($LANG08[10] . ' ' . $A['username']);
! $mail_template = new Template ($_CONF['path_layout'] . 'profiles');
! $mail_template->set_file ('form', 'contactuserform.thtml');
! $mail_template->set_var ('site_url', $_CONF['site_url']);
! $mail_template->set_var ('lang_description', $LANG08[26]);
! $mail_template->set_var ('lang_username', $LANG08[11]);
! $mail_template->set_var ('username', $_USER['username']);
! $mail_template->set_var ('lang_useremail', $LANG08[12]);
! $mail_template->set_var ('useremail', $_USER['email']);
! $mail_template->set_var ('lang_subject', $LANG08[13]);
! $mail_template->set_var ('subject', $subject);
! $mail_template->set_var ('lang_message', $LANG08[14]);
! $mail_template->set_var ('message', $message);
! $mail_template->set_var ('lang_nohtml', $LANG08[15]);
! $mail_template->set_var ('lang_submit', $LANG08[16]);
! $mail_template->set_var ('uid', $uid);
! $mail_template->parse ('output', 'form');
! $retval .= $mail_template->finish ($mail_template->get_var ('output'));
! $retval .= COM_endBlock ();
}
--- 125,169 ----
$retval .= $login->finish ($login->get_var('output'));
$retval .= COM_endBlock();
! } else {
! $result = DB_query ("SELECT emailfromadmin,emailfromuser FROM {$_TABLES['userprefs']} WHERE uid = '$uid'");
! $P = DB_fetchArray ($result);
! if (SEC_inGroup ('Root') || SEC_hasRights ('user.mail')) {
! $isAdmin = true;
! } else {
! $isAdmin = false;
! }
! if ((($P['emailfromadmin'] == 1) && $isAdmin) ||
! (($P['emailfromuser'] == 1) && !$isAdmin)) {
! $username = DB_getItem ($_TABLES['users'], 'username',
! "uid = '$uid'");
! $retval = COM_startBlock ($LANG08[10] . ' ' . $username);
! $mail_template = new Template ($_CONF['path_layout'] . 'profiles');
! $mail_template->set_file ('form', 'contactuserform.thtml');
! $mail_template->set_var ('site_url', $_CONF['site_url']);
! $mail_template->set_var ('lang_description', $LANG08[26]);
! $mail_template->set_var ('lang_username', $LANG08[11]);
! $mail_template->set_var ('username', $_USER['username']);
! $mail_template->set_var ('lang_useremail', $LANG08[12]);
! $mail_template->set_var ('useremail', $_USER['email']);
! $mail_template->set_var ('lang_subject', $LANG08[13]);
! $mail_template->set_var ('subject', $subject);
! $mail_template->set_var ('lang_message', $LANG08[14]);
! $mail_template->set_var ('message', $message);
! $mail_template->set_var ('lang_nohtml', $LANG08[15]);
! $mail_template->set_var ('lang_submit', $LANG08[16]);
! $mail_template->set_var ('uid', $uid);
! $mail_template->parse ('output', 'form');
! $retval .= $mail_template->finish ($mail_template->get_var ('output'));
! $retval .= COM_endBlock ();
! } else {
! $username = DB_getItem ($_TABLES['users'], 'username',
! "uid = '$uid'");
! $retval = COM_startBlock ($LANG08[10] . ' ' . $username, '',
! COM_getBlockTemplate ('_msg_block', 'header'));
! $retval .= $LANG08[35];
! $retval .= COM_endBlock (COM_getBlockTemplate ('_msg_block',
! 'footer'));
! }
}
Index: usersettings.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/usersettings.php,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** usersettings.php 12 Jun 2003 19:45:08 -0000 1.62
--- usersettings.php 22 Jun 2003 22:07:42 -0000 1.63
***************
*** 293,297 ****
global $_TABLES, $_CONF, $LANG04, $_USER, $_GROUPS;
! $result = DB_query("SELECT noicons,willing,dfid,tzid,noboxes,maxstories,tids,aids,boxes FROM {$_TABLES['userprefs']},{$_TABLES['userindex']} WHERE {$_TABLES['userindex']}.uid = {$_USER['uid']} AND {$_TABLES['userprefs']}.uid = {$_USER['uid']}");
$A = DB_fetchArray($result);
--- 293,297 ----
global $_TABLES, $_CONF, $LANG04, $_USER, $_GROUPS;
! $result = DB_query("SELECT noicons,willing,dfid,tzid,noboxes,maxstories,tids,aids,boxes,emailfromadmin,emailfromuser,showonline FROM {$_TABLES['userprefs']},{$_TABLES['userindex']} WHERE {$_TABLES['userindex']}.uid = {$_USER['uid']} AND {$_TABLES['userprefs']}.uid = {$_USER['uid']}");
$A = DB_fetchArray($result);
***************
*** 313,317 ****
'comment' => 'commentblock.thtml',
'language' => 'language.thtml',
! 'theme' => 'theme.thtml'
));
$preferences->set_var ('site_url', $_CONF['site_url']);
--- 313,318 ----
'comment' => 'commentblock.thtml',
'language' => 'language.thtml',
! 'theme' => 'theme.thtml',
! 'privacy' => 'privacyblock.thtml'
));
$preferences->set_var ('site_url', $_CONF['site_url']);
***************
*** 337,341 ****
$preferences->set_var ('lang_excludeditems', $LANG04[54]);
$preferences->set_var ('lang_topics', $LANG04[48]);
- $preferences->set_var ('lang_authors', $LANG04[56]);
$preferences->set_var ('lang_emailedtopics', $LANG04[76]);
$preferences->set_var ('lang_boxes', $LANG04[55]);
--- 338,341 ----
***************
*** 346,349 ****
--- 346,355 ----
$preferences->set_var ('lang_commentlimit', $LANG04[59]);
$preferences->set_var ('lang_commentlimit_text', $LANG04[62]);
+ $preferences->set_var ('lang_emailfromadmin', $LANG04[100]);
+ $preferences->set_var ('lang_emailfromadmin_text', $LANG04[101]);
+ $preferences->set_var ('lang_emailfromuser', $LANG04[102]);
+ $preferences->set_var ('lang_emailfromuser_text', $LANG04[103]);
+ $preferences->set_var ('lang_showonline', $LANG04[104]);
+ $preferences->set_var ('lang_showonline_text', $LANG04[105]);
$preferences->set_var ('lang_submit', $LANG04[9]);
***************
*** 358,362 ****
$preferences->set_var ('start_block_comment',
COM_startBlock ($LANG04[64] . ' ' . $_USER['username']));
! $preferences->set_var ('end_block', COM_endBlock ());
$preferences->set_var ('display_headline',
--- 364,371 ----
$preferences->set_var ('start_block_comment',
COM_startBlock ($LANG04[64] . ' ' . $_USER['username']));
! $preferences->set_var ('end_block_comment', COM_endBlock ());
! $preferences->set_var ('start_block_privacy',
! COM_startBlock ($LANG04[99] . ' ' . $_USER['username']));
! $preferences->set_var ('end_block_privacy', COM_endBlock ());
$preferences->set_var ('display_headline',
***************
*** 370,373 ****
--- 379,384 ----
$preferences->set_var ('comment_headline',
$LANG04[64] . ' ' . $_USER['username']);
+ $preferences->set_var ('privacy_headline',
+ $LANG04[99] . ' ' . $_USER['username']);
// display preferences block
***************
*** 464,467 ****
--- 475,496 ----
$preferences->parse ('display_block', 'display', true);
+ // privacy options block
+ if ($A['emailfromadmin'] == 1) {
+ $preferences->set_var ('emailfromadmin_checked', 'checked="checked"');
+ } else {
+ $preferences->set_var ('emailfromadmin_checked', '');
+ }
+ if ($A['emailfromuser'] == 1) {
+ $preferences->set_var ('emailfromuser_checked', 'checked="checked"');
+ } else {
+ $preferences->set_var ('emailfromuser_checked', '');
+ }
+ if ($A['showonline'] == 1) {
+ $preferences->set_var ('showonline_checked', 'checked="checked"');
+ } else {
+ $preferences->set_var ('showonline_checked', '');
+ }
+ $preferences->parse ('privacy_block', 'privacy', true);
+
// excluded items block
$permissions = COM_getPermSQL ('');
***************
*** 469,473 ****
COM_checkList($_TABLES['topics'],'tid,topic',$permissions,$A['tids']));
! if ($_CONF['contributedbyline'] == 1) {
$result = DB_query ("SELECT DISTINCT uid FROM {$_TABLES['stories']}");
$nrows = DB_numRows ($result);
--- 498,503 ----
COM_checkList($_TABLES['topics'],'tid,topic',$permissions,$A['tids']));
! if (($_CONF['contributedbyline'] == 1) &&
! ($_CONF['hide_author_exclusion'] == 0)) {
$result = DB_query ("SELECT DISTINCT uid FROM {$_TABLES['stories']}");
$nrows = DB_numRows ($result);
***************
*** 478,484 ****
--- 508,516 ----
}
$where .= "uid = '1'";
+ $preferences->set_var ('lang_authors', $LANG04[56]);
$preferences->set_var ('exclude_author_checklist',
COM_checkList($_TABLES['users'],'uid,username',$where,$A['aids']));
} else {
+ $preferences->set_var ('lang_authors', '');
$preferences->set_var ('exclude_author_checklist', '');
}
***************
*** 728,732 ****
DB_query("UPDATE {$_TABLES['users']} SET fullname='{$A["fullname"]}',email='{$A["email"]}',homepage='{$A["homepage"]}',sig='{$A["sig"]}',cookietimeout={$A["cooktime"]},photo='$filename' WHERE uid={$_USER['uid']}");
! DB_query("UPDATE {$_TABLES['userprefs']} SET emailstories='{$A["emailstories"]}' WHERE uid={$_USER['uid']}");
DB_query("UPDATE {$_TABLES['userinfo']} SET pgpkey='" . $A["pgpkey"] . "',about='{$A["about"]}' WHERE uid={$_USER['uid']}");
--- 760,764 ----
DB_query("UPDATE {$_TABLES['users']} SET fullname='{$A["fullname"]}',email='{$A["email"]}',homepage='{$A["homepage"]}',sig='{$A["sig"]}',cookietimeout={$A["cooktime"]},photo='$filename' WHERE uid={$_USER['uid']}");
! DB_query("UPDATE {$_TABLES['userprefs']} SET emailstories='{$A["emailstories"]}',emailfromadmin='{$A['emailfromadmin']}',emailfromuser='{$A['emailfromuser']}',notonline='{$A['notonline']}' WHERE uid={$_USER['uid']}");
DB_query("UPDATE {$_TABLES['userinfo']} SET pgpkey='" . $A["pgpkey"] . "',about='{$A["about"]}' WHERE uid={$_USER['uid']}");
***************
*** 753,756 ****
--- 785,791 ----
if ($A["willing"] == 'on') $A["willing"] = 1;
if ($A['noboxes'] == 'on') $A['noboxes'] = 1;
+ if ($A['emailfromadmin'] == 'on') $A['emailfromadmin'] = 1;
+ if ($A['emailfromuser'] == 'on') $A['emailfromuser'] = 1;
+ if ($A['showonline'] == 'on') $A['showonline'] = 1;
if ($A['maxstories'] < $_CONF['minnews']) {
***************
*** 814,818 ****
$_CONF['cookiesecure']);
! DB_query("UPDATE {$_TABLES['userprefs']} SET noicons='{$A['noicons']}', willing='{$A["willing"]}', dfid='{$A["dfid"]}', tzid='{$A["tzid"]}' WHERE uid='{$_USER['uid']}'");
if (empty ($etids)) {
--- 849,853 ----
$_CONF['cookiesecure']);
! DB_query("UPDATE {$_TABLES['userprefs']} SET noicons='{$A['noicons']}', willing='{$A["willing"]}', dfid='{$A["dfid"]}', tzid='{$A["tzid"]}', emailfromadmin='{$A['emailfromadmin']}', emailfromuser='{$A['emailfromuser']}', showonline='{$A['showonline']}' WHERE uid='{$_USER['uid']}'");
if (empty ($etids)) {
More information about the geeklog-cvs
mailing list