[geeklog-cvs] geeklog-1.3/public_html/admin block.php,1.50,1.51
geeklog-cvs-admin at lists.geeklog.net
geeklog-cvs-admin at lists.geeklog.net
Thu Jun 19 13:40:09 EDT 2003
Update of /usr/cvs/geeklog/geeklog-1.3/public_html/admin
In directory internal.geeklog.net:/tmp/cvs-serv26065
Modified Files:
block.php
Log Message:
Use '_admin_block' and '_msg_block' templates for blocks.
Index: block.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/block.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** block.php 7 Jun 2003 15:19:27 -0000 1.50
--- block.php 19 Jun 2003 17:40:06 -0000 1.51
***************
*** 45,52 ****
if (!SEC_hasrights('block.edit')) {
$display .= COM_siteHeader()
! . COM_startBlock($MESSAGE[30])
. $MESSAGE[31]
! . COM_endBlock()
! . COM_siteFooter();
echo $display;
exit;
--- 45,53 ----
if (!SEC_hasrights('block.edit')) {
$display .= COM_siteHeader()
! . COM_startBlock ($MESSAGE[30], '',
! COM_getBlockTemplate ('_msg_block', 'header'))
. $MESSAGE[31]
! . COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'))
! . COM_siteFooter ();
echo $display;
exit;
***************
*** 91,95 ****
$retval = '';
! $retval .= COM_startBlock($LANG21[3]);
$block_templates = new Template($_CONF['path_layout'] . 'admin/block');
--- 92,97 ----
$retval = '';
! $retval .= COM_startBlock ($LANG21[3], '',
! COM_getBlockTemplate ('_admin_block', 'header'));
$block_templates = new Template($_CONF['path_layout'] . 'admin/block');
***************
*** 141,145 ****
$block_templates->parse('output','editor');
$retval .= $block_templates->finish($block_templates->get_var('output'));
! $retval .= COM_endBlock();
return $retval;
--- 143,147 ----
$block_templates->parse('output','editor');
$retval .= $block_templates->finish($block_templates->get_var('output'));
! $retval .= COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer'));
return $retval;
***************
*** 164,170 ****
$access = SEC_hasAccess($A['owner_id'],$A['group_id'],$A['perm_owner'],$A['perm_group'],$A['perm_members'],$A['perm_anon']);
if ($access == 2 || $access == 0 || hasBlockTopicAccess ($A['tid']) < 3) {
! $retval .= COM_startBlock($LANG21[44])
! .$LANG21[45]
! .COM_endBlock();
return $retval;
--- 166,173 ----
$access = SEC_hasAccess($A['owner_id'],$A['group_id'],$A['perm_owner'],$A['perm_group'],$A['perm_members'],$A['perm_anon']);
if ($access == 2 || $access == 0 || hasBlockTopicAccess ($A['tid']) < 3) {
! $retval .= COM_startBlock ($LANG21[44], '',
! COM_getBlockTemplate ('_msg_block', 'header'))
! . $LANG21[45]
! . COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
return $retval;
***************
*** 193,197 ****
$block_templates->set_var('site_admin_url', $_CONF['site_admin_url']);
$block_templates->set_var('layout_url', $_CONF['layout_url']);
! $block_templates->set_var('start_block_editor', COM_startBlock($LANG21[3]));
if ($A['type'] != 'layout') {
--- 196,201 ----
$block_templates->set_var('site_admin_url', $_CONF['site_admin_url']);
$block_templates->set_var('layout_url', $_CONF['layout_url']);
! $block_templates->set_var('start_block_editor', COM_startBlock ($LANG21[3],
! '', COM_getBlockTemplate ('_admin_block', 'header')));
if ($A['type'] != 'layout') {
***************
*** 291,295 ****
$block_templates->set_var('lang_blockcontent', $LANG21[17]);
$block_templates->set_var('block_content', htmlspecialchars (stripslashes ($A['content'])));
! $block_templates->set_var('end_block', COM_endBlock());
$block_templates->parse('output', 'editor');
$retval .= $block_templates->finish($block_templates->get_var('output'));
--- 295,300 ----
$block_templates->set_var('lang_blockcontent', $LANG21[17]);
$block_templates->set_var('block_content', htmlspecialchars (stripslashes ($A['content'])));
! $block_templates->set_var ('end_block',
! COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer')));
$block_templates->parse('output', 'editor');
$retval .= $block_templates->finish($block_templates->get_var('output'));
***************
*** 340,346 ****
if (($access < 3) || !hasBlockTopicAccess ($tid) || !SEC_inGroup ($group_id)) {
$display .= COM_siteHeader('menu');
! $display .= COM_startBlock($MESSAGE[30]);
$display .= $MESSAGE[31];
! $display .= COM_endBlock();
$display .= COM_siteFooter();
COM_errorLog("User {$_USER['username']} tried to illegally create or edit block $bid",1);
--- 345,352 ----
if (($access < 3) || !hasBlockTopicAccess ($tid) || !SEC_inGroup ($group_id)) {
$display .= COM_siteHeader('menu');
! $display .= COM_startBlock ($MESSAGE[30], '',
! COM_getBlockTemplate ('_msg_block', 'header'));
$display .= $MESSAGE[31];
! $display .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
$display .= COM_siteFooter();
COM_errorLog("User {$_USER['username']} tried to illegally create or edit block $bid",1);
***************
*** 374,382 ****
if (!(stristr($phpblockfn,'phpblock_'))) {
$retval .= COM_siteHeader()
! .COM_startBlock($LANG21[37])
! .$LANG21[38]
! .COM_endBlock()
! .editblock($bid)
! .COM_siteFooter();
return $retval;
}
--- 380,390 ----
if (!(stristr($phpblockfn,'phpblock_'))) {
$retval .= COM_siteHeader()
! . COM_startBlock ($LANG21[37], '',
! COM_getBlockTemplate ('_msg_block', 'header'))
! . $LANG21[38]
! . COM_endBlock (COM_getBlockTemplate ('_msg_block',
! 'footer'))
! . editblock ($bid)
! . COM_siteFooter ();
return $retval;
}
***************
*** 406,410 ****
} else {
$retval .= COM_siteHeader()
! .COM_startBlock($LANG21[32]);
if ($type == 'portal') {
// Portal block is missing fields
--- 414,419 ----
} else {
$retval .= COM_siteHeader()
! . COM_startBlock ($LANG21[32], '',
! COM_getBlockTemplate ('_msg_block', 'header'));
if ($type == 'portal') {
// Portal block is missing fields
***************
*** 423,429 ****
$retval .= $LANG21[36];
}
! $retval .= COM_endBlock()
! .editblock($bid)
! .COM_siteFooter();
}
--- 432,438 ----
$retval .= $LANG21[36];
}
! $retval .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'))
! . editblock ($bid)
! . COM_siteFooter ();
}
***************
*** 444,448 ****
$block_templates->set_file(array('list'=>'listblocks.thtml', 'row'=>'listitem.thtml'));
! $retval .= COM_startBlock($LANG21[19]);
$block_templates->set_var('site_url', $_CONF['site_url']);
$block_templates->set_var('site_admin_url', $_CONF['site_admin_url']);
--- 453,458 ----
$block_templates->set_file(array('list'=>'listblocks.thtml', 'row'=>'listitem.thtml'));
! $retval .= COM_startBlock ($LANG21[19], '',
! COM_getBlockTemplate ('_admin_block', 'header'));
$block_templates->set_var('site_url', $_CONF['site_url']);
$block_templates->set_var('site_admin_url', $_CONF['site_admin_url']);
***************
*** 498,502 ****
$block_templates->parse('output','list');
$retval .= $block_templates->finish($block_templates->get_var('output'));
! $retval .= COM_endBlock();
return $retval;
--- 508,512 ----
$block_templates->parse('output','list');
$retval .= $block_templates->finish($block_templates->get_var('output'));
! $retval .= COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer'));
return $retval;
More information about the geeklog-cvs
mailing list