[geeklog-cvs] geeklog-1.3/public_html/admin/plugins/staticpages index.php,1.34,1.35
dhaun at iowaoutdoors.org
dhaun at iowaoutdoors.org
Mon Aug 2 14:38:55 EDT 2004
Update of /var/cvs/geeklog-1.3/public_html/admin/plugins/staticpages
In directory www:/tmp/cvs-serv30101/public_html/admin/plugins/staticpages
Modified Files:
index.php
Log Message:
Allow static page block templates to be overridden.
Index: index.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/admin/plugins/staticpages/index.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** index.php 11 Jul 2004 19:07:29 -0000 1.34
--- index.php 2 Aug 2004 18:38:52 -0000 1.35
***************
*** 3,7 ****
/* Reminder: always indent with 4 spaces (no tabs). */
// +---------------------------------------------------------------------------+
! // | Static Pages Geeklog Plugin 1.4 |
// +---------------------------------------------------------------------------+
// | index.php |
--- 3,7 ----
/* Reminder: always indent with 4 spaces (no tabs). */
// +---------------------------------------------------------------------------+
! // | Static Pages Geeklog Plugin 1.4.1 |
// +---------------------------------------------------------------------------+
// | index.php |
***************
*** 35,48 ****
// $Id$
! require_once('../../../lib-common.php');
! require_once('../../auth.inc.php');
! if (!SEC_hasRights('staticpages.edit')) {
! $display = COM_siteHeader('menu');
! $display .= COM_startBlock($LANG_STATIC['access_denied']);
$display .= $LANG_STATIC['access_denied_msg'];
! $display .= COM_endBlock();
! $display .= COM_siteFooter();
! COM_accessLog("User {$_USER['username']} tried to illegally access the static pages administration screen.");
echo $display;
exit;
--- 35,49 ----
// $Id$
! require_once ('../../../lib-common.php');
! require_once ('../../auth.inc.php');
! if (!SEC_hasRights ('staticpages.edit')) {
! $display = COM_siteHeader ('menu');
! $display .= COM_startBlock ($LANG_STATIC['access_denied'], '',
! COM_getBlockTemplate ('_msg_block', 'header'));
$display .= $LANG_STATIC['access_denied_msg'];
! $display .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
! $display .= COM_siteFooter ();
! COM_accessLog ("User {$_USER['username']} tried to illegally access the static pages administration screen.");
echo $display;
exit;
***************
*** 53,63 ****
* Displays the static page form
*
! * @A array Data to display
! * @error string Error message to display
*
*/
function form ($A, $error = false)
{
! global $_TABLES, $PHP_SELF, $_CONF, $HTTP_POST_VARS, $_USER, $LANG_STATIC, $_SP_CONF, $LANG_ACCESS, $mode, $sp_id;
if (!empty($sp_id) && $mode=='edit') {
--- 54,64 ----
* Displays the static page form
*
! * @param array $A Data to display
! * @param string $error Error message to display
*
*/
function form ($A, $error = false)
{
! global $_CONF, $_TABLES, $_USER, $HTTP_POST_VARS, $LANG_STATIC, $_SP_CONF, $LANG_ACCESS, $mode, $sp_id;
if (!empty($sp_id) && $mode=='edit') {
***************
*** 76,86 ****
if (empty ($A['owner_id'])) {
! $error = COM_startBlock($LANG_ACCESS['accessdenied']);
$error .= $LANG_STATIC['deny_msg'];
! $error .= COM_endBlock();
}
if ($error) {
! $retval .= $error . "<br><br>";
} else {
$sp_template = new Template($_CONF['path'] . 'plugins/staticpages/templates/admin');
--- 77,88 ----
if (empty ($A['owner_id'])) {
! $error = COM_startBlock ($LANG_ACCESS['accessdenied'], '',
! COM_getBlockTemplate ('_msg_block', 'header'));
$error .= $LANG_STATIC['deny_msg'];
! $error .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
}
if ($error) {
! $retval .= $error . '<br><br>';
} else {
$sp_template = new Template($_CONF['path'] . 'plugins/staticpages/templates/admin');
***************
*** 117,125 ****
$sp_template->set_var('lang_permissions', $LANG_ACCESS['permissions']);
$sp_template->set_var('lang_perm_key', $LANG_ACCESS['permissionskey']);
- $sp_template->set_var('permissions_editor', SEC_getPermissionsHTML($A['perm_owner'],$A['perm_group'],$A['perm_members'],$A['perm_anon']));
$sp_template->set_var('permissions_msg', $LANG_ACCESS['permmsg']);
$sp_template->set_var('site_url', $_CONF['site_url']);
$sp_template->set_var('site_admin_url', $_CONF['site_admin_url']);
! $sp_template->set_var('start_block_editor', COM_startBlock($LANG_STATIC['staticpageeditor']));
$sp_template->set_var('lang_save', $LANG_STATIC['save']);
$sp_template->set_var('lang_cancel', $LANG_STATIC['cancel']);
--- 119,128 ----
$sp_template->set_var('lang_permissions', $LANG_ACCESS['permissions']);
$sp_template->set_var('lang_perm_key', $LANG_ACCESS['permissionskey']);
$sp_template->set_var('permissions_msg', $LANG_ACCESS['permmsg']);
$sp_template->set_var('site_url', $_CONF['site_url']);
$sp_template->set_var('site_admin_url', $_CONF['site_admin_url']);
! $sp_template->set_var('start_block_editor',
! COM_startBlock($LANG_STATIC['staticpageeditor']), '',
! COM_getBlockTemplate ('_admin_block', 'header'));
$sp_template->set_var('lang_save', $LANG_STATIC['save']);
$sp_template->set_var('lang_cancel', $LANG_STATIC['cancel']);
***************
*** 132,136 ****
}
$sp_template->set_var('lang_writtenby', $LANG_STATIC['writtenby']);
! $sp_template->set_var('username', DB_getItem($_TABLES['users'],'username',"uid = {$A["sp_uid"]}"));
$sp_template->set_var ('lang_url', $LANG_STATIC['url']);
$sp_template->set_var ('lang_id', $LANG_STATIC['id']);
--- 135,139 ----
}
$sp_template->set_var('lang_writtenby', $LANG_STATIC['writtenby']);
! $sp_template->set_var('username', DB_getItem($_TABLES['users'],'username',"uid = {$A['sp_uid']}"));
$sp_template->set_var ('lang_url', $LANG_STATIC['url']);
$sp_template->set_var ('lang_id', $LANG_STATIC['id']);
***************
*** 258,277 ****
$sp_template->set_var('lang_leftrightblocks', $LANG_STATIC['leftrightblocks']);
if ($A['sp_format'] == 'noblocks') {
! $sp_template->set_var('noblock_selected', 'selected="SELECTED"');
} else {
$sp_template->set_var('noblock_selected', '');
}
if ($A['sp_format'] == 'leftblocks') {
! $sp_template->set_var('leftblocks_selected', 'selected="SELECTED"');
} else {
$sp_template->set_var('leftblocks_selected', '');
}
if ($A['sp_format'] == 'blankpage') {
! $sp_template->set_var('blankpage_selected', 'selected="SELECTED"');
} else {
$sp_template->set_var('blankpage_selected', '');
}
if (($A['sp_format'] == 'allblocks') OR empty($A['sp_format'])) {
! $sp_template->set_var('allblocks_selected', 'selected="SELECTED"');
} else {
$sp_template->set_var('allblocks_selected', '');
--- 261,280 ----
$sp_template->set_var('lang_leftrightblocks', $LANG_STATIC['leftrightblocks']);
if ($A['sp_format'] == 'noblocks') {
! $sp_template->set_var('noblock_selected', 'selected="selected"');
} else {
$sp_template->set_var('noblock_selected', '');
}
if ($A['sp_format'] == 'leftblocks') {
! $sp_template->set_var('leftblocks_selected', 'selected="selected"');
} else {
$sp_template->set_var('leftblocks_selected', '');
}
if ($A['sp_format'] == 'blankpage') {
! $sp_template->set_var('blankpage_selected', 'selected="selected"');
} else {
$sp_template->set_var('blankpage_selected', '');
}
if (($A['sp_format'] == 'allblocks') OR empty($A['sp_format'])) {
! $sp_template->set_var('allblocks_selected', 'selected="selected"');
} else {
$sp_template->set_var('allblocks_selected', '');
***************
*** 291,295 ****
$sp_template->set_var('sp_hits', $A['sp_hits']);
}
! $sp_template->set_var('end_block', COM_endblock());
$retval .= $sp_template->parse('output','form');
}
--- 294,299 ----
$sp_template->set_var('sp_hits', $A['sp_hits']);
}
! $sp_template->set_var('end_block',
! COM_endBlock (COM_getBlockTemplate ('_admin_block', 'header')));
$retval .= $sp_template->parse('output','form');
}
***************
*** 350,354 ****
$sp_templates->set_var('site_url', $_CONF['site_url']);
$sp_templates->set_var('site_admin_url', $_CONF['site_admin_url']);
! $sp_templates->set_var('start_block_list', COM_startBlock($LANG_STATIC['staticpagelist']));
$sp_templates->set_var('new_page_url', COM_buildURL($_CONF['site_admin_url'] . '/plugins/staticpages/index.php?mode=edit'));
$sp_templates->set_var('lang_newpage', $LANG_STATIC['newpage']);
--- 354,358 ----
$sp_templates->set_var('site_url', $_CONF['site_url']);
$sp_templates->set_var('site_admin_url', $_CONF['site_admin_url']);
! $sp_templates->set_var('start_block_list', COM_startBlock($LANG_STATIC['staticpagelist']), '', COM_getBlockTemplate ('_admin_block', 'header'));
$sp_templates->set_var('new_page_url', COM_buildURL($_CONF['site_admin_url'] . '/plugins/staticpages/index.php?mode=edit'));
$sp_templates->set_var('lang_newpage', $LANG_STATIC['newpage']);
***************
*** 437,441 ****
$sp_templates->set_var ('google_paging', '');
}
! $sp_templates->set_var ('end_block', COM_endBlock ());
$retval .= $sp_templates->parse('output', 'list');
--- 441,446 ----
$sp_templates->set_var ('google_paging', '');
}
! $sp_templates->set_var ('end_block',
! COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer')));
$retval .= $sp_templates->parse('output', 'list');
***************
*** 500,504 ****
echo $retval;
} elseif (!empty ($sp_title) && !empty ($sp_content)) {
! $date = date ("Y-m-d H:i:s", $unixdate);
if (empty ($sp_hits)) $sp_hits = 0;
--- 505,509 ----
echo $retval;
} elseif (!empty ($sp_title) && !empty ($sp_content)) {
! $date = date ('Y-m-d H:i:s', $unixdate);
if (empty ($sp_hits)) $sp_hits = 0;
***************
*** 589,596 ****
} else if (($mode == $LANG_STATIC['save']) && !empty ($LANG_STATIC['save'])) {
if (!empty ($sp_id)) {
! submitstaticpage ($sp_id, $sp_uid, $sp_title, $sp_content, $unixdate,
! $sp_hits, $sp_format, $sp_onmenu, $sp_label, $owner_id, $group_id,
! $perm_owner, $perm_group, $perm_members, $perm_anon, $sp_php,
! $sp_nf, $sp_old_id, $sp_centerblock, $sp_tid, $sp_where, $sp_inblock);
} else {
$display = COM_refresh ($_CONF['site_admin_url'] . '/index.php');
--- 594,608 ----
} else if (($mode == $LANG_STATIC['save']) && !empty ($LANG_STATIC['save'])) {
if (!empty ($sp_id)) {
! submitstaticpage ($sp_id, $HTTP_POST_VARS['sp_uid'],
! $HTTP_POST_VARS['sp_title'], $HTTP_POST_VARS['sp_content'],
! $HTTP_POST_VARS['unixdate'], $HTTP_POST_VARS['sp_hits'],
! $HTTP_POST_VARS['sp_format'], $HTTP_POST_VARS['sp_onmenu'],
! $HTTP_POST_VARS['sp_label'], $HTTP_POST_VARS['owner_id'],
! $HTTP_POST_VARS['group_id'], $HTTP_POST_VARS['perm_owner'],
! $HTTP_POST_VARS['perm_group'], $HTTP_POST_VARS['perm_members'],
! $HTTP_POST_VARS['perm_anon'], $HTTP_POST_VARS['sp_php'],
! $HTTP_POST_VARS['sp_nf'], $HTTP_POST_VARS['sp_old_id'],
! $HTTP_POST_VARS['sp_centerblock'], $HTTP_POST_VARS['sp_tid'],
! $HTTP_POST_VARS['sp_where'], $HTTP_POST_VARS['sp_inblock']);
} else {
$display = COM_refresh ($_CONF['site_admin_url'] . '/index.php');
More information about the geeklog-cvs
mailing list