[geeklog-cvs] geeklog-1.3/public_html lib-common.php,1.228,1.229
geeklog-cvs-admin at lists.geeklog.net
geeklog-cvs-admin at lists.geeklog.net
Sat Jun 21 08:55:54 EDT 2003
Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory internal.geeklog.net:/tmp/cvs-serv25692
Modified Files:
lib-common.php
Log Message:
Added support for the '_msg_block' template override in COM_showMessage and COM_errorLog.
Index: lib-common.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/lib-common.php,v
retrieving revision 1.228
retrieving revision 1.229
diff -C2 -d -r1.228 -r1.229
*** lib-common.php 19 Jun 2003 11:00:29 -0000 1.228
--- lib-common.php 21 Jun 2003 12:55:51 -0000 1.229
***************
*** 6,11 ****
// +---------------------------------------------------------------------------+
// | lib-common.php |
- // | Geeklog common library. |
// | |
// +---------------------------------------------------------------------------+
// | Copyright (C) 2000-2003 by the following authors: |
--- 6,11 ----
// +---------------------------------------------------------------------------+
// | lib-common.php |
// | |
+ // | Geeklog common library. |
// +---------------------------------------------------------------------------+
// | Copyright (C) 2000-2003 by the following authors: |
***************
*** 62,65 ****
--- 62,68 ----
* Configuration Include: You should ONLY have to modify this line.
* Leave the rest of this file intact!
+ *
+ * Make sure to include the name of the config file,
+ * i.e. the path should end in .../config.php
*/
***************
*** 1542,1546 ****
case 2:
! $retval .= COM_startBlock( $LANG01[55] . ' ' . $timestamp ) . nl2br( $logentry ) . COM_endBlock();
break;
--- 1545,1553 ----
case 2:
! $retval .= COM_startBlock( $LANG01[55] . ' ' . $timestamp, '',
! COM_getBlockTemplate( '_msg_block', 'header' ))
! . nl2br( $logentry )
! . COM_endBlock( COM_getBlockTemplate( '_msg_block',
! 'footer' ));
break;
***************
*** 1555,1559 ****
{
fputs( $file, "$timestamp - $logentry \n" );
! $retval .= COM_startBlock( $LANG01[34] . ' - ' . $timestamp ) . nl2br( $logentry ) . COM_endBlock();
}
break;
--- 1562,1571 ----
{
fputs( $file, "$timestamp - $logentry \n" );
! $retval .= COM_startBlock( $LANG01[34] . ' - ' . $timestamp,
! '', COM_getBlockTemplate( '_msg_block',
! 'header' ))
! . nl2br( $logentry )
! . COM_endBlock( COM_getBlockTemplate( '_msg_block',
! 'footer' ));
}
break;
***************
*** 2088,2092 ****
}
! $retval .= COM_startBlock( $title, $help, COM_getBlockTemplate( 'user_block', 'header' ));
if( $_CONF['personalcalendars'] == 1 )
--- 2100,2105 ----
}
! $retval .= COM_startBlock( $title, $help,
! COM_getBlockTemplate( 'user_block', 'header' ));
if( $_CONF['personalcalendars'] == 1 )
***************
*** 2178,2182 ****
else
{
! $retval .= COM_startBlock( $LANG01[47], $help, COM_getBlockTemplate( 'user_block', 'header' ));
$login = new Template( $_CONF['path_layout'] );
--- 2191,2196 ----
else
{
! $retval .= COM_startBlock( $LANG01[47], $help,
! COM_getBlockTemplate( 'user_block', 'header' ));
$login = new Template( $_CONF['path_layout'] );
***************
*** 2265,2269 ****
$retval .= COM_startBlock( $title, $help,
! COM_getBlockTemplate( 'admin_block', 'header' ));
if( SEC_isModerator() )
--- 2279,2283 ----
$retval .= COM_startBlock( $title, $help,
! COM_getBlockTemplate( 'admin_block', 'header' ));
if( SEC_isModerator() )
***************
*** 3216,3220 ****
case 'section_block':
! $retval .= COM_startBlock( $title,$help, COM_getBlockTemplate( $name, 'header' ))
. COM_showTopics( $topic )
. COM_endBlock( COM_getBlockTemplate( $name, 'footer' ));
--- 3230,3235 ----
case 'section_block':
! $retval .= COM_startBlock( $title, $help,
! COM_getBlockTemplate( $name, 'header' ))
. COM_showTopics( $topic )
. COM_endBlock( COM_getBlockTemplate( $name, 'footer' ));
***************
*** 3374,3379 ****
}
! $retval .= COM_startBlock( $A['title'], $A['help'], COM_getBlockTemplate( $A['name'], 'header' )) . $blockcontent . LB
! . COM_endBlock( COM_getBlockTemplate( $A['name'], 'footer' ));
}
}
--- 3389,3396 ----
}
! $retval .= COM_startBlock( $A['title'], $A['help'],
! COM_getBlockTemplate( $A['name'], 'header' ))
! . $blockcontent . LB
! . COM_endBlock( COM_getBlockTemplate( $A['name'], 'footer' ));
}
}
***************
*** 3661,3665 ****
}
! $retval .= COM_startBlock( $title, '', COM_getBlockTemplate( 'events_block', 'header' ));
$eventSql = 'SELECT eid,title,url,datestart,dateend,group_id,owner_id,perm_owner,perm_group,perm_members,perm_anon '
--- 3678,3683 ----
}
! $retval .= COM_startBlock( $title, '',
! COM_getBlockTemplate( 'events_block', 'header' ));
$eventSql = 'SELECT eid,title,url,datestart,dateend,group_id,owner_id,perm_owner,perm_group,perm_members,perm_anon '
***************
*** 3984,3988 ****
global $_TABLES, $_CONF, $LANG01, $_USER, $_GROUPS, $page, $newstories;
! $retval .= COM_startBlock( $title, $help, COM_getBlockTemplate( 'whats_new_block', 'header' ));
if( $_CONF['hidenewstories'] == 0 )
--- 4002,4007 ----
global $_TABLES, $_CONF, $LANG01, $_USER, $_GROUPS, $page, $newstories;
! $retval .= COM_startBlock( $title, $help,
! COM_getBlockTemplate( 'whats_new_block', 'header' ));
if( $_CONF['hidenewstories'] == 0 )
***************
*** 4233,4239 ****
{
$timestamp = strftime( $_CONF['daytime'] );
! $retval .= COM_startBlock( $MESSAGE[40] . ' - ' . $timestamp )
! . '<img src="' . $_CONF['layout_url'] . '/images/sysmessage.gif" border="0" align="top" alt="">'
! . $MESSAGE[$msg] . '<BR><BR>' . COM_endBlock();
}
--- 4252,4261 ----
{
$timestamp = strftime( $_CONF['daytime'] );
! $retval .= COM_startBlock( $MESSAGE[40] . ' - ' . $timestamp, '',
! COM_getBlockTemplate( '_msg_block', 'header' ))
! . '<img src="' . $_CONF['layout_url']
! . '/images/sysmessage.gif" border="0" align="top" alt="">'
! . $MESSAGE[$msg] . '<br><br>'
! . COM_endBlock( COM_getBlockTemplate( '_msg_block', 'footer' ));
}
More information about the geeklog-cvs
mailing list