[geeklog-cvs] geeklog-1.3/public_html index.php,1.51,1.52 lib-common.php,1.253,1.254 usersettings.php,1.71,1.72
geeklog-cvs-admin at lists.geeklog.net
geeklog-cvs-admin at lists.geeklog.net
Sat Sep 6 17:53:44 EDT 2003
Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory geeklog_prod:/tmp/cvs-serv4702
Modified Files:
index.php lib-common.php usersettings.php
Log Message:
Fixed warnings
Index: index.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/index.php,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** index.php 1 Jul 2003 17:48:56 -0000 1.51
--- index.php 6 Sep 2003 21:53:42 -0000 1.52
***************
*** 72,77 ****
}
! $display .= COM_siteHeader() . COM_showMessage ($HTTP_GET_VARS['msg']);
!
--- 72,79 ----
}
! $display .= COM_siteHeader();
! if (isset ($HTTP_GET_VARS['msg'])) {
! $display .= COM_showMessage ($HTTP_GET_VARS['msg']);
! }
Index: lib-common.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/lib-common.php,v
retrieving revision 1.253
retrieving revision 1.254
diff -C2 -d -r1.253 -r1.254
*** lib-common.php 6 Sep 2003 15:41:44 -0000 1.253
--- lib-common.php 6 Sep 2003 21:53:42 -0000 1.254
***************
*** 1578,1581 ****
--- 1578,1583 ----
global $_TABLES, $HTTP_COOKIE_VARS, $REMOTE_ADDR, $_CONF;
+ $retval = '';
+
DB_query( "DELETE FROM {$_TABLES['pollvoters']} WHERE date < unix_timestamp() - {$_CONF['polladdresstime']}" );
***************
*** 4368,4371 ****
--- 4370,4375 ----
{
global $_CONF,$_TABLES,$LANG01;
+
+ $retval = '';
$expire_time = time() - $_CONF['whosonline_threshold'];
Index: usersettings.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/usersettings.php,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** usersettings.php 5 Sep 2003 17:18:15 -0000 1.71
--- usersettings.php 6 Sep 2003 21:53:42 -0000 1.72
***************
*** 54,61 ****
global $_TABLES, $_CONF, $LANG04, $_USER;
! // Call custom account form and edit function if enabled and exists
! if ($_CONF['custom_registration'] AND (function_exists(custom_userform))) {
return custom_userform('edit',$_USER['uid']);
! }
$result = DB_query("SELECT fullname,cookietimeout,email,homepage,sig,emailstories,about,pgpkey,photo FROM {$_TABLES['users']},{$_TABLES['userprefs']},{$_TABLES['userinfo']} WHERE {$_TABLES['users']}.uid = {$_USER['uid']} && {$_TABLES['userprefs']}.uid = {$_USER['uid']} && {$_TABLES['userinfo']}.uid = {$_USER['uid']}");
$A = DB_fetchArray($result);
--- 54,62 ----
global $_TABLES, $_CONF, $LANG04, $_USER;
! // Call custom account form and edit function if enabled and exists
! if ($_CONF['custom_registration'] AND (function_exists(custom_userform))) {
return custom_userform('edit',$_USER['uid']);
! }
!
$result = DB_query("SELECT fullname,cookietimeout,email,homepage,sig,emailstories,about,pgpkey,photo FROM {$_TABLES['users']},{$_TABLES['userprefs']},{$_TABLES['userinfo']} WHERE {$_TABLES['users']}.uid = {$_USER['uid']} && {$_TABLES['userprefs']}.uid = {$_USER['uid']} && {$_TABLES['userinfo']}.uid = {$_USER['uid']}");
$A = DB_fetchArray($result);
***************
*** 108,112 ****
$preferences->set_var ('fullname_value', $A['fullname']);
$preferences->set_var ('new_username_value', $_USER['username']);
! $preferences->set_var ('password_value', $A['passwd']);
if ($_CONF['allow_username_change'] == 1) {
$preferences->parse ('username_option', 'username', true);
--- 109,113 ----
$preferences->set_var ('fullname_value', $A['fullname']);
$preferences->set_var ('new_username_value', $_USER['username']);
! $preferences->set_var ('password_value', '');
if ($_CONF['allow_username_change'] == 1) {
$preferences->parse ('username_option', 'username', true);
***************
*** 126,129 ****
--- 127,131 ----
if ($_CONF['allow_user_photo'] == 1) {
+ $photo = '';
if (!empty ($A['photo'])) {
if (!empty ($A['fullname'])) {
***************
*** 506,510 ****
$result = DB_query ("SELECT DISTINCT uid FROM {$_TABLES['stories']}");
$nrows = DB_numRows ($result);
! unset ($where);
for ($i = 0; $i < $nrows; $i++) {
$W = DB_fetchArray ($result);
--- 508,512 ----
$result = DB_query ("SELECT DISTINCT uid FROM {$_TABLES['stories']}");
$nrows = DB_numRows ($result);
! $where = '';
for ($i = 0; $i < $nrows; $i++) {
$W = DB_fetchArray ($result);
***************
*** 540,544 ****
// boxes block
! $selectedblock = '';
if (strlen($A['boxes']) > 0) {
$blockresult = DB_query("SELECT bid FROM {$_TABLES['blocks']} WHERE bid NOT IN (" . str_replace(' ',',',$A['boxes']) . ")");
--- 542,546 ----
// boxes block
! $selectedblocks = '';
if (strlen($A['boxes']) > 0) {
$blockresult = DB_query("SELECT bid FROM {$_TABLES['blocks']} WHERE bid NOT IN (" . str_replace(' ',',',$A['boxes']) . ")");
***************
*** 734,738 ****
} else {
$curphoto = DB_getItem($_TABLES['users'],'photo',"uid = {$_USER['uid']}");
! if (!empty($curphoto) AND $A['delete_photo'] == 'on') {
$filetodelete = $_CONF['path_html'] . 'images/userphotos/' . $curphoto;
if (!unlink($filetodelete)) {
--- 736,741 ----
} else {
$curphoto = DB_getItem($_TABLES['users'],'photo',"uid = {$_USER['uid']}");
! if (!empty($curphoto) AND isset ($A['delete_photo']) AND
! $A['delete_photo'] == 'on') {
$filetodelete = $_CONF['path_html'] . 'images/userphotos/' . $curphoto;
if (!unlink($filetodelete)) {
***************
*** 788,797 ****
global $_TABLES, $_CONF, $_USER;
! if ($A['noicons'] == 'on') $A['noicons'] = 1;
! 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']) {
--- 791,824 ----
global $_TABLES, $_CONF, $_USER;
! if (isset ($A['noicons']) && ($A['noicons'] == 'on')) {
! $A['noicons'] = 1;
! } else {
! $A['noicons'] = 0;
! }
! if (isset ($A['willing']) && ($A['willing'] == 'on')) {
! $A['willing'] = 1;
! } else {
! $A['willing'] = 0;
! }
! if (isset ($A['noboxes']) && ($A['noboxes'] == 'on')) {
! $A['noboxes'] = 1;
! } else {
! $A['noboxes'] = 0;
! }
! if (isset ($A['emailfromadmin']) && ($A['emailfromadmin'] == 'on')) {
! $A['emailfromadmin'] = 1;
! } else {
! $A['emailfromadmin'] = 0;
! }
! if (isset ($A['emailfromuser']) && ($A['emailfromuser'] == 'on')) {
! $A['emailfromuser'] = 1;
! } else {
! $A['emailfromuser'] = 0;
! }
! if (isset ($A['showonline']) && ($A['showonline'] == 'on')) {
! $A['showonline'] = 1;
! } else {
! $A['showonline'] = 0;
! }
if ($A['maxstories'] < $_CONF['minnews']) {
***************
*** 809,812 ****
--- 836,840 ----
$ETIDS = @array_values($A['etids']);
+ $tids = '';
if (sizeof($TIDS) > 0) {
for ($i = 0; $i < sizeof($TIDS); $i++) {
***************
*** 814,817 ****
--- 842,846 ----
}
}
+ $aids = '';
if (sizeof($AIDS) > 0) {
for ($i = 0; $i < sizeof($AIDS); $i++) {
***************
*** 819,822 ****
--- 848,853 ----
}
}
+
+ $selectedblocks = '';
if (count($BOXES) > 0) {
for ($i = 1; $i <= count($BOXES); $i++) {
***************
*** 828,832 ****
}
$blockresult = DB_query("SELECT bid,name FROM {$_TABLES['blocks']} WHERE bid NOT IN ($boxes)");
- $selectedblocks = '';
for ($x = 1; $x <= DB_numRows($blockresult); $x++) {
$row = DB_fetchArray($blockresult);
--- 859,862 ----
***************
*** 845,848 ****
--- 875,881 ----
}
}
+ if (!isset ($A['tzid'])) {
+ $A['tzid'] = '';
+ }
// Save theme, when doing so, put in cookie so we can set the user's theme even when they aren't logged in
***************
*** 879,883 ****
case 'comments':
$display .= COM_siteHeader('menu');
! $display .= COM_showMessage($HTTP_GET_VARS['msg']);
$display .= editpreferences();
$display .= COM_siteFooter();
--- 912,918 ----
case 'comments':
$display .= COM_siteHeader('menu');
! if (isset ($HTTP_GET_VARS['msg'])) {
! $display .= COM_showMessage($HTTP_GET_VARS['msg']);
! }
$display .= editpreferences();
$display .= COM_siteFooter();
***************
*** 885,889 ****
case 'edit':
$display .= COM_siteHeader('menu');
! $display .= COM_showMessage($HTTP_GET_VARS['msg']);
$display .= edituser();
$display .= COM_siteFooter();
--- 920,926 ----
case 'edit':
$display .= COM_siteHeader('menu');
! if (isset ($HTTP_GET_VARS['msg'])) {
! $display .= COM_showMessage($HTTP_GET_VARS['msg']);
! }
$display .= edituser();
$display .= COM_siteFooter();
More information about the geeklog-cvs
mailing list