[geeklog-cvs] geeklog-1.3/public_html calendar.php,1.29,1.30 comment.php,1.43,1.44 index.php,1.49,1.50 links.php,1.25,1.26 pollbooth.php,1.19,1.20 profiles.php,1.23,1.24 stats.php,1.23,1.24 submit.php,1.53,1.54 users.php,1.65,1.66 usersettings.php,1.65,1.66
geeklog-cvs-admin at lists.geeklog.net
geeklog-cvs-admin at lists.geeklog.net
Wed Jun 25 04:39:05 EDT 2003
Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory internal.geeklog.net:/tmp/cvs-serv10448/public_html
Modified Files:
calendar.php comment.php index.php links.php pollbooth.php
profiles.php stats.php submit.php users.php usersettings.php
Log Message:
More '_msg_block' overrides.
Index: calendar.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/calendar.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** calendar.php 16 Jun 2003 09:36:24 -0000 1.29
--- calendar.php 25 Jun 2003 08:39:02 -0000 1.30
***************
*** 40,44 ****
(($_CONF['loginrequired'] == 1) || ($_CONF['calendarloginrequired'] == 1))) {
$display = COM_siteHeader('');
! $display .= COM_startBlock($LANG_LOGIN[1]);
$login = new Template($_CONF['path_layout'] . 'submit');
$login->set_file (array ('login'=>'submitloginrequired.thtml'));
--- 40,45 ----
(($_CONF['loginrequired'] == 1) || ($_CONF['calendarloginrequired'] == 1))) {
$display = COM_siteHeader('');
! $display .= COM_startBlock ($LANG_LOGIN[1], '',
! COM_getBlockTemplate ('_msg_block', 'header'));
$login = new Template($_CONF['path_layout'] . 'submit');
$login->set_file (array ('login'=>'submitloginrequired.thtml'));
***************
*** 49,53 ****
$login->parse ('output', 'login');
$display .= $login->finish ($login->get_var('output'));
! $display .= COM_endBlock();
$display .= COM_siteFooter();
echo $display;
--- 50,54 ----
$login->parse ('output', 'login');
$display .= $login->finish ($login->get_var('output'));
! $display .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
$display .= COM_siteFooter();
echo $display;
Index: comment.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/comment.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** comment.php 11 May 2003 18:28:55 -0000 1.43
--- comment.php 25 Jun 2003 08:39:02 -0000 1.44
***************
*** 85,89 ****
if (empty($_USER['username']) &&
(($_CONF['loginrequired'] == 1) || ($_CONF['commentsloginrequired'] == 1))) {
! $retval .= COM_startBlock($LANG_LOGIN[1]);
$loginreq = new Template($_CONF['path_layout'] . 'submit');
$loginreq->set_file('loginreq', 'submitloginrequired.thtml');
--- 85,90 ----
if (empty($_USER['username']) &&
(($_CONF['loginrequired'] == 1) || ($_CONF['commentsloginrequired'] == 1))) {
! $retval .= COM_startBlock ($LANG_LOGIN[1], '',
! COM_getBlockTemplate ('_msg_block', 'header'));
$loginreq = new Template($_CONF['path_layout'] . 'submit');
$loginreq->set_file('loginreq', 'submitloginrequired.thtml');
***************
*** 94,98 ****
$loginreq->parse('errormsg', 'loginreq');
$retval .= $loginreq->finish($loginreq->get_var('errormsg'));
! $retval .= COM_endBlock();
return $retval;
} else {
--- 95,99 ----
$loginreq->parse('errormsg', 'loginreq');
$retval .= $loginreq->finish($loginreq->get_var('errormsg'));
! $retval .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
return $retval;
} else {
***************
*** 102,110 ****
if ($last > 0) {
! $retval .= COM_startBlock($LANG12[26])
. $LANG03[7]
. $last
. $LANG03[8]
! . COM_endBlock();
} else {
if ($postmode == 'html') {
--- 103,112 ----
if ($last > 0) {
! $retval .= COM_startBlock ($LANG12[26], '',
! COM_getBlockTemplate ('_msg_block', 'header'))
. $LANG03[7]
. $last
. $LANG03[8]
! . COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
} else {
if ($postmode == 'html') {
***************
*** 148,154 ****
$retval .= $start->finish( $start->parse( 'output', 'startcomment' ));
} else if ($mode == $LANG03[14]) {
! $retval .= COM_startBlock($LANG03[17])
. $LANG03[12]
! . COM_endBlock();
$mode = 'error';
}
--- 150,157 ----
$retval .= $start->finish( $start->parse( 'output', 'startcomment' ));
} else if ($mode == $LANG03[14]) {
! $retval .= COM_startBlock ($LANG03[17], '',
! COM_getBlockTemplate ('_msg_block', 'header'))
. $LANG03[12]
! . COM_endBlock(COM_getBlockTemplate ('_msg_block', 'footer'));
$mode = 'error';
}
Index: index.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/index.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** index.php 30 May 2003 12:23:49 -0000 1.49
--- index.php 25 Jun 2003 08:39:02 -0000 1.50
***************
*** 199,208 ****
$display .= COM_printPageNavigation($base_url,$page, $num_pages);
} else { // no stories to display
! $display .= COM_startBlock($LANG05[1]) . $LANG05[2];
if (!empty($topic)) {
$topicname = DB_getItem ($_TABLES['topics'], 'topic', "tid='{$topic}'");
$display .= sprintf ($LANG05[3], $topicname);
}
! $display .= COM_endBlock();
$display .= PLG_showCenterblock (3, $page, $topic); // bottom blocks
--- 199,209 ----
$display .= COM_printPageNavigation($base_url,$page, $num_pages);
} else { // no stories to display
! $display .= COM_startBlock ($LANG05[1], '',
! COM_getBlockTemplate ('_msg_block', 'header')) . $LANG05[2];
if (!empty($topic)) {
$topicname = DB_getItem ($_TABLES['topics'], 'topic', "tid='{$topic}'");
$display .= sprintf ($LANG05[3], $topicname);
}
! $display .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
$display .= PLG_showCenterblock (3, $page, $topic); // bottom blocks
Index: links.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/links.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** links.php 2 Dec 2002 17:52:25 -0000 1.25
--- links.php 25 Jun 2003 08:39:02 -0000 1.26
***************
*** 42,46 ****
if (empty ($_USER['username']) &&
(($_CONF['loginrequired'] == 1) || ($_CONF['linksloginrequired'] == 1))) {
! $display .= COM_startBlock($LANG_LOGIN[1]);
$login = new Template($_CONF['path_layout'] . 'submit');
$login->set_file (array ('login'=>'submitloginrequired.thtml'));
--- 42,47 ----
if (empty ($_USER['username']) &&
(($_CONF['loginrequired'] == 1) || ($_CONF['linksloginrequired'] == 1))) {
! $display .= COM_startBlock ($LANG_LOGIN[1], '',
! COM_getBlockTemplate ('_msg_block', 'header'));
$login = new Template($_CONF['path_layout'] . 'submit');
$login->set_file (array ('login'=>'submitloginrequired.thtml'));
***************
*** 51,54 ****
--- 52,56 ----
$login->parse ('output', 'login');
$display .= $login->finish ($login->get_var('output'));
+ $display .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
} else {
$display .= COM_startBlock($LANG06[1]);
***************
*** 206,211 ****
$linklist->parse('output', 'linklist');
$display .= $linklist->finish($linklist->get_var('output'));
}
! $display .= COM_endBlock() . COM_siteFooter();
echo $display;
--- 208,214 ----
$linklist->parse('output', 'linklist');
$display .= $linklist->finish($linklist->get_var('output'));
+ $display .= COM_endBlock ();
}
! $display .= COM_siteFooter();
echo $display;
Index: pollbooth.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/pollbooth.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** pollbooth.php 14 May 2003 10:48:52 -0000 1.19
--- pollbooth.php 25 Jun 2003 08:39:02 -0000 1.20
***************
*** 58,66 ****
// This always does an insert so no need to provide key_field and key_value args
DB_save($_TABLES['pollvoters'],'ipaddress,date,qid',"'$REMOTE_ADDR'," . time() . ",'$qid'");
! $retval .= COM_startBlock($LANG07[1])
. $LANG07[2] . ' "'
. DB_getItem ($_TABLES['pollquestions'], 'question', "qid = '{$qid}'")
. '"'
! . COM_endBlock()
. COM_pollResults($qid);
--- 58,67 ----
// This always does an insert so no need to provide key_field and key_value args
DB_save($_TABLES['pollvoters'],'ipaddress,date,qid',"'$REMOTE_ADDR'," . time() . ",'$qid'");
! $retval .= COM_startBlock ($LANG07[1], '',
! COM_getBlockTemplate ('_msg_block', 'header'))
. $LANG07[2] . ' "'
. DB_getItem ($_TABLES['pollquestions'], 'question', "qid = '{$qid}'")
. '"'
! . COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'))
. COM_pollResults($qid);
***************
*** 82,86 ****
if (empty ($_USER['username']) &&
(($_CONF['loginrequired'] == 1) || ($_CONF['pollsloginrequired'] == 1))) {
! $retval = COM_startBlock($LANG_LOGIN[1]);
$login = new Template($_CONF['path_layout'] . 'submit');
$login->set_file (array ('login'=>'submitloginrequired.thtml'));
--- 83,88 ----
if (empty ($_USER['username']) &&
(($_CONF['loginrequired'] == 1) || ($_CONF['pollsloginrequired'] == 1))) {
! $retval = COM_startBlock ($LANG_LOGIN[1], '',
! COM_getBlockTemplate ('_msg_block', 'header'));
$login = new Template($_CONF['path_layout'] . 'submit');
$login->set_file (array ('login'=>'submitloginrequired.thtml'));
***************
*** 91,94 ****
--- 93,97 ----
$login->parse ('output', 'login');
$retval .= $login->finish ($login->get_var('output'));
+ $retval .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
} else {
$sql = "SELECT qid,question,voters FROM {$_TABLES['pollquestions']}"
***************
*** 118,123 ****
$retval .= $LANG10[17];
}
}
- $retval .= COM_endBlock();
return $retval;
--- 121,126 ----
$retval .= $LANG10[17];
}
+ $retval .= COM_endBlock();
}
return $retval;
Index: profiles.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/profiles.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** profiles.php 22 Jun 2003 22:07:42 -0000 1.23
--- profiles.php 25 Jun 2003 08:39:02 -0000 1.24
***************
*** 115,119 ****
if (empty ($_USER['username']) &&
(($_CONF['loginrequired'] == 1) || ($_CONF['emailuserloginrequired'] == 1))) {
! $retval = COM_startBlock($LANG_LOGIN[1]);
$login = new Template($_CONF['path_layout'] . 'submit');
$login->set_file (array ('login'=>'submitloginrequired.thtml'));
--- 115,120 ----
if (empty ($_USER['username']) &&
(($_CONF['loginrequired'] == 1) || ($_CONF['emailuserloginrequired'] == 1))) {
! $retval = COM_startBlock ($LANG_LOGIN[1], '',
! COM_getBlockTemplate ('_msg_block', 'header'));
$login = new Template($_CONF['path_layout'] . 'submit');
$login->set_file (array ('login'=>'submitloginrequired.thtml'));
***************
*** 124,128 ****
$login->parse ('output', 'login');
$retval .= $login->finish ($login->get_var('output'));
! $retval .= COM_endBlock();
} else {
$result = DB_query ("SELECT emailfromadmin,emailfromuser FROM {$_TABLES['userprefs']} WHERE uid = '$uid'");
--- 125,129 ----
$login->parse ('output', 'login');
$retval .= $login->finish ($login->get_var('output'));
! $retval .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
} else {
$result = DB_query ("SELECT emailfromadmin,emailfromuser FROM {$_TABLES['userprefs']} WHERE uid = '$uid'");
***************
*** 241,245 ****
if (empty($_USER['username']) &&
(($_CONF['loginrequired'] == 1) || ($_CONF['emailstoryloginrequired'] == 1))) {
! $retval = COM_startBlock($LANG_LOGIN[1]);
$login = new Template($_CONF['path_layout'] . 'submit');
$login->set_file (array ('login'=>'submitloginrequired.thtml'));
--- 242,247 ----
if (empty($_USER['username']) &&
(($_CONF['loginrequired'] == 1) || ($_CONF['emailstoryloginrequired'] == 1))) {
! $retval = COM_startBlock ($LANG_LOGIN[1], '',
! COM_getBlockTemplate ('_msg_block', 'header'));
$login = new Template($_CONF['path_layout'] . 'submit');
$login->set_file (array ('login'=>'submitloginrequired.thtml'));
***************
*** 250,254 ****
$login->parse ('output', 'login');
$retval .= $login->finish ($login->get_var('output'));
! $retval .= COM_endBlock();
return $retval;
--- 252,256 ----
$login->parse ('output', 'login');
$retval .= $login->finish ($login->get_var('output'));
! $retval .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
return $retval;
Index: stats.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/stats.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** stats.php 14 May 2003 10:48:52 -0000 1.23
--- stats.php 25 Jun 2003 08:39:02 -0000 1.24
***************
*** 39,43 ****
(($_CONF['loginrequired'] == 1) || ($_CONF['statsloginrequired'] == 1))) {
$display = COM_siteHeader('');
! $display .= COM_startBlock($LANG_LOGIN[1]);
$login = new Template($_CONF['path_layout'] . 'submit');
$login->set_file (array ('login'=>'submitloginrequired.thtml'));
--- 39,44 ----
(($_CONF['loginrequired'] == 1) || ($_CONF['statsloginrequired'] == 1))) {
$display = COM_siteHeader('');
! $display .= COM_startBlock ($LANG_LOGIN[1], '',
! COM_getBlockTemplate ('_msg_block', 'header'));
$login = new Template($_CONF['path_layout'] . 'submit');
$login->set_file (array ('login'=>'submitloginrequired.thtml'));
***************
*** 48,52 ****
$login->parse ('output', 'login');
$display .= $login->finish ($login->get_var('output'));
! $display .= COM_endBlock();
$display .= COM_siteFooter();
echo $display;
--- 49,53 ----
$login->parse ('output', 'login');
$display .= $login->finish ($login->get_var('output'));
! $display .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
$display .= COM_siteFooter();
echo $display;
Index: submit.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/submit.php,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** submit.php 28 May 2003 11:03:50 -0000 1.53
--- submit.php 25 Jun 2003 08:39:02 -0000 1.54
***************
*** 64,76 ****
if ($last > 0) {
! $retval .= COM_startBlock($LANG12[26])
. $LANG12[30]
. $last
. $LANG12[31]
! . COM_endBlock();
} else {
if (empty ($_USER['username']) &&
(($_CONF['loginrequired'] == 1) || ($_CONF['submitloginrequired'] == 1))) {
! $retval .= COM_startBlock($LANG_LOGIN[1]);
$loginreq = new Template($_CONF['path_layout'] . 'submit');
$loginreq->set_file('loginreq', 'submitloginrequired.thtml');
--- 64,78 ----
if ($last > 0) {
! $retval .= COM_startBlock ($LANG12[26], '',
! COM_getBlockTemplate ('_msg_block', 'header'))
. $LANG12[30]
. $last
. $LANG12[31]
! . COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
} else {
if (empty ($_USER['username']) &&
(($_CONF['loginrequired'] == 1) || ($_CONF['submitloginrequired'] == 1))) {
! $retval .= COM_startBlock ($LANG_LOGIN[1], '',
! COM_getBlockTemplate ('_msg_block', 'header'));
$loginreq = new Template($_CONF['path_layout'] . 'submit');
$loginreq->set_file('loginreq', 'submitloginrequired.thtml');
***************
*** 81,85 ****
$loginreq->parse('errormsg', 'loginreq');
$retval .= $loginreq->finish($loginreq->get_var('errormsg'));
! $retval .= COM_endBlock();
return $retval;
} else {
--- 83,87 ----
$loginreq->parse('errormsg', 'loginreq');
$retval .= $loginreq->finish($loginreq->get_var('errormsg'));
! $retval .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
return $retval;
} else {
***************
*** 87,91 ****
. $LANG12[9]
. COM_endBlock();
!
switch ($type) {
case 'link':
--- 89,93 ----
. $LANG12[9]
. COM_endBlock();
!
switch ($type) {
case 'link':
***************
*** 523,529 ****
$A['category'] = $A['categorydd'];
} else if ($A['categorydd'] != $LANG12[18]) {
! $retval .= COM_startBlock($LANG12[20])
. $LANG12[21]
! . COM_endBlock()
. submissionform($type);
--- 525,532 ----
$A['category'] = $A['categorydd'];
} else if ($A['categorydd'] != $LANG12[18]) {
! $retval .= COM_startBlock ($LANG12[20], '',
! COM_getBlockTemplate ('_msg_block', 'header'))
. $LANG12[21]
! . COM_endBlock(COM_getBlockTemplate('_msg_block', 'footer'))
. submissionform($type);
***************
*** 565,571 ****
}
} else {
! $retval .= COM_startBlock($LANG12[22])
. $LANG12[23]
! . COM_endBlock()
. submissionform($type);
--- 568,575 ----
}
} else {
! $retval .= COM_startBlock ($LANG12[22], '',
! COM_getBlockTemplate ('_msg_block', 'header'))
. $LANG12[23]
! . COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'))
. submissionform($type);
***************
*** 656,662 ****
} else {
! $retval .= COM_startBlock($LANG12[22])
. $LANG12[23]
! . COM_endBlock()
. submissionform($type);
--- 660,667 ----
} else {
! $retval .= COM_startBlock ($LANG12[22], '',
! COM_getBlockTemplate ('_msg_block', 'header'))
. $LANG12[23]
! . COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'))
. submissionform($type);
***************
*** 713,719 ****
}
} else {
! $retval .= COM_startBlock($LANG12[22])
. $LANG12[23]
! . COM_endBlock()
. submissionform($type);
--- 718,725 ----
}
} else {
! $retval .= COM_startBlock ($LANG12[22], '',
! COM_getBlockTemplate ('_msg_block', 'header'))
. $LANG12[23]
! . COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'))
. submissionform($type);
Index: users.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/users.php,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** users.php 21 May 2003 16:35:22 -0000 1.65
--- users.php 25 Jun 2003 08:39:02 -0000 1.66
***************
*** 70,74 ****
if (empty ($_USER['username']) &&
(($_CONF['loginrequired'] == 1) || ($_CONF['profileloginrequired'] == 1))) {
! $retval .= COM_startBlock($LANG_LOGIN[1]);
$login = new Template($_CONF['path_layout'] . 'submit');
$login->set_file (array ('login'=>'submitloginrequired.thtml'));
--- 70,75 ----
if (empty ($_USER['username']) &&
(($_CONF['loginrequired'] == 1) || ($_CONF['profileloginrequired'] == 1))) {
! $retval .= COM_startBlock ($LANG_LOGIN[1], '',
! COM_getBlockTemplate ('_msg_block', 'header'));
$login = new Template($_CONF['path_layout'] . 'submit');
$login->set_file (array ('login'=>'submitloginrequired.thtml'));
***************
*** 79,83 ****
$login->parse ('output', 'login');
$retval .= $login->finish ($login->get_var('output'));
! $retval .= COM_endBlock();
return $retval;
--- 80,84 ----
$login->parse ('output', 'login');
$retval .= $login->finish ($login->get_var('output'));
! $retval .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
return $retval;
***************
*** 586,592 ****
$retval = '';
! if (!empty($msg)) {
! $retval .= COM_startBlock($LANG04[21]) . $msg . COM_endBlock();
! }
$user_templates = new Template($_CONF['path_layout'] . 'users');
$user_templates->set_file('regform','registrationform.thtml');
--- 587,596 ----
$retval = '';
! if (!empty ($msg)) {
! $retval .= COM_startBlock ($LANG04[21], '',
! COM_getBlockTemplate ('_msg_block', 'header'))
! . $msg
! . COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
! }
$user_templates = new Template($_CONF['path_layout'] . 'users');
$user_templates->set_file('regform','registrationform.thtml');
***************
*** 601,604 ****
--- 605,609 ----
$user_templates->parse('output', 'regform');
$retval .= $user_templates->finish($user_templates->get_var('output'));
+
return $retval;
}
***************
*** 646,650 ****
if (!empty ($msg)) {
! $retval .= COM_startBlock ($LANG04[21]) . $msg . COM_endBlock ();
}
--- 651,658 ----
if (!empty ($msg)) {
! $retval .= COM_startBlock ($LANG04[21], '',
! COM_getBlockTemplate ('_msg_block', 'header'))
! . $msg
! . COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
}
***************
*** 710,716 ****
$last = COM_checkSpeedlimit ('password');
if ($last > 0) {
! $display .= COM_startBlock ($LANG12[26])
. sprintf ($LANG04[93], $last, $_CONF['passwordspeedlimit'])
! . COM_endBlock ();
} else {
$display .= getpasswordform ();
--- 718,725 ----
$last = COM_checkSpeedlimit ('password');
if ($last > 0) {
! $display .= COM_startBlock ($LANG12[26], '',
! COM_getBlockTemplate ('_msg_block', 'header'))
. sprintf ($LANG04[93], $last, $_CONF['passwordspeedlimit'])
! . COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
} else {
$display .= getpasswordform ();
***************
*** 777,783 ****
if ($last > 0) {
$display .= COM_siteHeader ('menu')
! . COM_startBlock ($LANG12[26])
. sprintf ($LANG04[93], $last, $_CONF['passwordspeedlimit'])
! . COM_endBlock ()
. COM_siteFooter ();
} else {
--- 786,793 ----
if ($last > 0) {
$display .= COM_siteHeader ('menu')
! . COM_startBlock ($LANG12[26], '',
! COM_getBlockTemplate ('_msg_block', 'header'))
. sprintf ($LANG04[93], $last, $_CONF['passwordspeedlimit'])
! . COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'))
. COM_siteFooter ();
} else {
Index: usersettings.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/usersettings.php,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** usersettings.php 23 Jun 2003 16:36:15 -0000 1.65
--- usersettings.php 25 Jun 2003 08:39:02 -0000 1.66
***************
*** 201,207 ****
$retval .= COM_siteHeader ('menu');
! $retval .= COM_startBlock ($LANG04[97]);
$retval .= $LANG04[98];
! $retval .= COM_endBlock ();
$retval .= $confirm->finish ($confirm->parse ('output', 'deleteaccount'));
$retval .= COM_siteFooter ();
--- 201,208 ----
$retval .= COM_siteHeader ('menu');
! $retval .= COM_startBlock ($LANG04[97], '',
! COM_getBlockTemplate ('_msg_block', 'header'));
$retval .= $LANG04[98];
! $retval .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
$retval .= $confirm->finish ($confirm->parse ('output', 'deleteaccount'));
$retval .= COM_siteFooter ();
More information about the geeklog-cvs
mailing list