[geeklog-cvs] geeklog-1.3/public_html/admin event.php,1.38,1.39 group.php,1.25,1.26 link.php,1.32,1.33 mail.php,1.16,1.17
geeklog-cvs-admin at lists.geeklog.net
geeklog-cvs-admin at lists.geeklog.net
Thu Jun 19 16:01:45 EDT 2003
Update of /usr/cvs/geeklog/geeklog-1.3/public_html/admin
In directory internal.geeklog.net:/tmp/cvs-serv30512
Modified Files:
event.php group.php link.php mail.php
Log Message:
Added support for '_admin_block' and '_msg_block' template overrides.
Index: event.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/event.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** event.php 24 Apr 2003 15:50:33 -0000 1.38
--- event.php 19 Jun 2003 20:01:41 -0000 1.39
***************
*** 6,11 ****
// +---------------------------------------------------------------------------+
// | event.php |
- // | Geeklog event administration page. |
// | |
// +---------------------------------------------------------------------------+
// | Copyright (C) 2000-2003 by the following authors: |
--- 6,11 ----
// +---------------------------------------------------------------------------+
// | event.php |
// | |
+ // | Geeklog event administration page. |
// +---------------------------------------------------------------------------+
// | Copyright (C) 2000-2003 by the following authors: |
***************
*** 34,39 ****
// $Id$
! include('../lib-common.php');
! include('auth.inc.php');
// Uncomment the line below if you need to debug the HTTP variables being passed
--- 34,39 ----
// $Id$
! require_once ('../lib-common.php');
! require_once ('auth.inc.php');
// Uncomment the line below if you need to debug the HTTP variables being passed
***************
*** 47,53 ****
if (!SEC_hasRights('event.edit')) {
$display .= COM_siteHeader('menu');
! $display .= COM_startBlock($MESSAGE[30]);
$display .= $MESSAGE[35];
! $display .= COM_endBlock();
$display .= COM_siteFooter();
--- 47,54 ----
if (!SEC_hasRights('event.edit')) {
$display .= COM_siteHeader('menu');
! $display .= COM_startBlock ($MESSAGE[30], '',
! COM_getBlockTemplate ('_msg_block', 'header'));
$display .= $MESSAGE[35];
! $display .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
$display .= COM_siteFooter();
***************
*** 69,73 ****
function editevent($mode, $A)
{
! global $_TABLES, $LANG30, $LANG22, $_CONF, $LANG_ACCESS, $_USER, $LANG12, $_STATES;
$retval = '';
--- 70,74 ----
function editevent($mode, $A)
{
! global $_TABLES, $LANG30, $LANG22, $_CONF, $LANG_ACCESS, $_USER, $LANG12, $_STATES;
$retval = '';
***************
*** 84,90 ****
if ($access == 0 OR $access == 2) {
// Uh, oh! User doesn't have access to this object
! $retval .= COM_startBlock($LANG22[16]);
$retval .= $LANG22[17];
! $retval .= COM_endBlock();
return $retval;
}
--- 85,92 ----
if ($access == 0 OR $access == 2) {
// Uh, oh! User doesn't have access to this object
! $retval .= COM_startBlock ($LANG22[16], '',
! COM_getBlockTemplate ('_msg_block', 'header'));
$retval .= $LANG22[17];
! $retval .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
return $retval;
}
***************
*** 99,103 ****
}
! $retval .= COM_startBlock($LANG22[1]);
if ($A['eid'] == '') {
--- 101,106 ----
}
! $retval .= COM_startBlock($LANG22[1], '',
! COM_getBlockTemplate ('_admin_block', 'header'));
if ($A['eid'] == '') {
***************
*** 377,381 ****
$event_templates->parse('output', 'editor');
$retval .= $event_templates->finish($event_templates->get_var('output'));
! $retval .= COM_endBlock();
return $retval;
}
--- 380,385 ----
$event_templates->parse('output', 'editor');
$retval .= $event_templates->finish($event_templates->get_var('output'));
! $retval .= COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer'));
!
return $retval;
}
***************
*** 419,425 ****
if (($access < 3) || !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 submit or edi
--- 423,430 ----
if (($access < 3) || !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 submit or edi
***************
*** 520,524 ****
$retval = '';
! $retval .= COM_startBlock($LANG22[11]);
$event_templates = new Template($_CONF['path_layout'] . 'admin/event');
--- 525,530 ----
$retval = '';
! $retval .= COM_startBlock ($LANG22[11], '',
! COM_getBlockTemplate ('_admin_block', 'header'));
$event_templates = new Template($_CONF['path_layout'] . 'admin/event');
***************
*** 558,562 ****
$event_templates->parse('output', 'list');
$retval .= $event_templates->finish($event_templates->get_var('output'));
! $retval .= COM_endBlock();
return $retval;
}
--- 564,569 ----
$event_templates->parse('output', 'list');
$retval .= $event_templates->finish($event_templates->get_var('output'));
! $retval .= COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer'));
!
return $retval;
}
Index: group.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/group.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** group.php 8 Jun 2003 19:14:00 -0000 1.25
--- group.php 19 Jun 2003 20:01:41 -0000 1.26
***************
*** 6,11 ****
// +---------------------------------------------------------------------------+
// | group.php |
- // | Geeklog group administration page. |
// | |
// +---------------------------------------------------------------------------+
// | Copyright (C) 2000-2003 by the following authors: |
--- 6,11 ----
// +---------------------------------------------------------------------------+
// | group.php |
// | |
+ // | Geeklog group administration page. |
// +---------------------------------------------------------------------------+
// | Copyright (C) 2000-2003 by the following authors: |
***************
*** 61,69 ****
// Make sure user has rights to access this page
if (!SEC_hasRights('group.edit')) {
! $display .= COM_siteHeader("menu");
! $display .= COM_startBlock($MESSAGE[30]);
$display .= $MESSAGE[32];
! $display .= COM_endBlock();
! $display .= COM_siteFooter();
echo $display;
exit;
--- 61,70 ----
// Make sure user has rights to access this page
if (!SEC_hasRights('group.edit')) {
! $display .= COM_siteHeader ('menu');
! $display .= COM_startBlock ($MESSAGE[30], '',
! COM_getBlockTemplate ('_msg_block', 'header'));
$display .= $MESSAGE[32];
! $display .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
! $display .= COM_siteFooter ();
echo $display;
exit;
***************
*** 79,88 ****
function editgroup($grp_id = '')
{
! global $_TABLES, $_CONF, $_USER, $LANG_ACCESS;
$retval = '';
- $retval .= COM_startBlock($LANG_ACCESS['groupeditor']);
-
$group_templates = new Template($_CONF['path_layout'] . 'admin/group');
$group_templates->set_file('editor','groupeditor.thtml');
--- 80,87 ----
function editgroup($grp_id = '')
{
! global $_TABLES, $_CONF, $_USER, $LANG_ACCESS;
$retval = '';
$group_templates = new Template($_CONF['path_layout'] . 'admin/group');
$group_templates->set_file('editor','groupeditor.thtml');
***************
*** 100,105 ****
// Root root then bail...they can't change groups
if (!SEC_inGroup('Root') AND (DB_getItem($_TABLES['groups'],'grp_name',"grp_id = $grp_id") == "Root")) {
$retval .= $LANG_ACCESS['canteditroot'];
! $retval .= COM_endBlock();
return $retval;
}
--- 99,106 ----
// Root root then bail...they can't change groups
if (!SEC_inGroup('Root') AND (DB_getItem($_TABLES['groups'],'grp_name',"grp_id = $grp_id") == "Root")) {
+ $retval .= COM_startBlock ($LANG_ACCESS['groupeditor'], '',
+ COM_getBlockTemplate ('_msg_block', 'header'));
$retval .= $LANG_ACCESS['canteditroot'];
! $retval .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
return $retval;
}
***************
*** 113,116 ****
--- 114,120 ----
}
+ $retval .= COM_startBlock ($LANG_ACCESS['groupeditor'], '',
+ COM_getBlockTemplate ('_admin_block', 'header'));
+
if (!empty($grp_id)) {
if ($A['grp_gl_core'] == 0) {
***************
*** 127,131 ****
$group_templates->set_var('lang_groupname', $LANG_ACCESS['groupname']);
!
if ($A['grp_gl_core'] == 0) {
$group_templates->set_var('groupname_inputtype', 'text');
--- 131,135 ----
$group_templates->set_var('lang_groupname', $LANG_ACCESS['groupname']);
!
if ($A['grp_gl_core'] == 0) {
$group_templates->set_var('groupname_inputtype', 'text');
***************
*** 140,144 ****
$group_templates->set_var('group_description', $A['grp_descr']);
$group_templates->set_var('lang_securitygroups', $LANG_ACCESS['securitygroups']);
!
//$groups = SEC_getUserGroups('','',$grp_id);
if (!empty($grp_id)) {
--- 144,148 ----
$group_templates->set_var('group_description', $A['grp_descr']);
$group_templates->set_var('lang_securitygroups', $LANG_ACCESS['securitygroups']);
!
//$groups = SEC_getUserGroups('','',$grp_id);
if (!empty($grp_id)) {
***************
*** 198,202 ****
$group_templates->parse('output','editor');
$retval .= $group_templates->finish($group_templates->get_var('output'));
! $retval .= COM_endBlock();
return $retval;
}
--- 202,207 ----
$group_templates->parse('output','editor');
$retval .= $group_templates->finish($group_templates->get_var('output'));
! $retval .= COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer'));
!
return $retval;
}
***************
*** 397,406 ****
echo COM_refresh($_CONF['site_admin_url'] . '/group.php?msg=49');
} else {
! $retval .= COM_siteHeader('menu');
! $retval .= COM_startBlock($LANG_ACCESS['missingfields']);
$retval .= $LANG_ACCESS['missingfieldsmsg'];
! $retval .= COM_endBlock();
! $retval .= editgroup($grp_id);
! $retval .= COM_siteFooter();
return $retval;
}
--- 402,413 ----
echo COM_refresh($_CONF['site_admin_url'] . '/group.php?msg=49');
} else {
! $retval .= COM_siteHeader ('menu');
! $retval .= COM_startBlock ($LANG_ACCESS['missingfields'], '',
! COM_getBlockTemplate ('_msg_block', 'header'));
$retval .= $LANG_ACCESS['missingfieldsmsg'];
! $retval .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
! $retval .= editgroup ($grp_id);
! $retval .= COM_siteFooter ();
!
return $retval;
}
***************
*** 417,421 ****
global $_TABLES, $_CONF, $LANG_ACCESS;
! $retval .= COM_startBlock($LANG_ACCESS['groupmanager']);
$group_templates = new Template($_CONF['path_layout'] . 'admin/group');
--- 424,429 ----
global $_TABLES, $_CONF, $LANG_ACCESS;
! $retval .= COM_startBlock ($LANG_ACCESS['groupmanager'], '',
! COM_getBlockTemplate ('_admin_block', 'header'));
$group_templates = new Template($_CONF['path_layout'] . 'admin/group');
***************
*** 448,452 ****
$group_templates->parse('output', 'list');
$retval .= $group_templates->finish($group_templates->get_var('output'));
! $retval .= COM_endBlock();
return $retval;
--- 456,460 ----
$group_templates->parse('output', 'list');
$retval .= $group_templates->finish($group_templates->get_var('output'));
! $retval .= COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer'));
return $retval;
Index: link.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/link.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** link.php 11 Mar 2003 22:08:24 -0000 1.32
--- link.php 19 Jun 2003 20:01:41 -0000 1.33
***************
*** 35,40 ****
// $Id$
! include('../lib-common.php');
! include('auth.inc.php');
// Uncomment the line below if you need to debug the HTTP variables being passed
--- 35,40 ----
// $Id$
! require_once ('../lib-common.php');
! require_once ('auth.inc.php');
// Uncomment the line below if you need to debug the HTTP variables being passed
***************
*** 46,55 ****
if (!SEC_hasRights('link.edit')) {
! $display .= COM_siteHeader('menu');
! $display .= COM_startBlock($MESSAGE[30]);
$display .= $MESSAGE[34];
! $display .= COM_endBlock();
! $display .= COM_siteFooter();
! $display .= COM_errorLog("User {$_USER['username']} tried to illegally access the link administration screen",1);
echo $display;
exit;
--- 46,56 ----
if (!SEC_hasRights('link.edit')) {
! $display .= COM_siteHeader ('menu');
! $display .= COM_startBlock ($MESSAGE[30], '',
! COM_getBlockTemplate ('_msg_block', 'header'));
$display .= $MESSAGE[34];
! $display .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
! $display .= COM_siteFooter ();
! $display .= COM_errorLog("User {$_USER['username']} tried to illegally access the link administration screen",1);
echo $display;
exit;
***************
*** 65,69 ****
function editlink($mode, $lid = '')
{
! global $_TABLES, $LANG23, $_CONF, $_USER, $LANG_ACCESS;
$retval = '';
--- 66,70 ----
function editlink($mode, $lid = '')
{
! global $_TABLES, $LANG23, $_CONF, $_USER, $LANG_ACCESS;
$retval = '';
***************
*** 98,106 ****
$access = 3;
}
! $retval .= COM_startBlock($LANG23[1]);
$link_templates->set_var('link_id', $A['lid']);
if (!empty($lid) && SEC_hasRights('link.edit')) {
! $link_templates->set_var('delete_option',"<input type=\"submit\" value=\"$LANG23[23]\" name=\"mode\">");
}
$link_templates->set_var('lang_linktitle', $LANG23[3]);
--- 99,108 ----
$access = 3;
}
! $retval .= COM_startBlock ($LANG23[1], '',
! COM_getBlockTemplate ('_admin_block', 'header'));
$link_templates->set_var('link_id', $A['lid']);
if (!empty($lid) && SEC_hasRights('link.edit')) {
! $link_templates->set_var ('delete_option', '<input type="submit" value="' . $LANG23[23] . '" name="mode">');
}
$link_templates->set_var('lang_linktitle', $LANG23[3]);
***************
*** 165,169 ****
$retval .= $link_templates->finish($link_templates->get_var('output'));
! $retval .= COM_endBlock();
return $retval;
--- 167,171 ----
$retval .= $link_templates->finish($link_templates->get_var('output'));
! $retval .= COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer'));
return $retval;
***************
*** 230,238 ****
}
if (($access < 3) || !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 submit or edit link $lid",1);
echo $display;
--- 232,241 ----
}
if (($access < 3) || !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 submit or edit link $lid",1);
echo $display;
***************
*** 273,277 ****
$retavl .= '';
! $retval .= COM_startBlock($LANG23[11]);
$link_templates = new Template($_CONF['path_layout'] . 'admin/link');
--- 276,281 ----
$retavl .= '';
! $retval .= COM_startBlock ($LANG23[11], '',
! COM_getBlockTemplate ('_admin_block', 'header'));
$link_templates = new Template($_CONF['path_layout'] . 'admin/link');
***************
*** 310,314 ****
$retval .= $link_templates->finish($link_templates->get_var('output'));
! $retval .= COM_endBlock();
return $retval;
--- 314,318 ----
$retval .= $link_templates->finish($link_templates->get_var('output'));
! $retval .= COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer'));
return $retval;
Index: mail.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/mail.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** mail.php 30 May 2003 08:16:34 -0000 1.16
--- mail.php 19 Jun 2003 20:01:41 -0000 1.17
***************
*** 6,11 ****
// +---------------------------------------------------------------------------+
// | mail.php |
- // | Geeklog mail administration page. |
// | |
// +---------------------------------------------------------------------------+
// | Copyright (C) 2001,2002 by the following authors: |
--- 6,11 ----
// +---------------------------------------------------------------------------+
// | mail.php |
// | |
+ // | Geeklog mail administration page. |
// +---------------------------------------------------------------------------+
// | Copyright (C) 2001,2002 by the following authors: |
***************
*** 43,51 ****
// Make sure user has access to this page
if (!SEC_inGroup('Mail Admin')) {
! $retval .= COM_siteHeader('menu');
! $retval .= COM_startBlock($MESSAGE[30]);
$retval .= $MESSAGE[37];
! $retval .= COM_endBlock();
! $retval .= COM_siteFooter();
COM_errorLog("User {$_USER['username']} tried to illegally access the mail administration screen",1);
echo $retval;
--- 43,52 ----
// Make sure user has access to this page
if (!SEC_inGroup('Mail Admin')) {
! $retval .= COM_siteHeader ('menu');
! $retval .= COM_startBlock ($MESSAGE[30], '',
! COM_getBlockTemplate ('_msg_block', 'header'));
$retval .= $MESSAGE[37];
! $retval .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
! $retval .= COM_siteFooter ();
COM_errorLog("User {$_USER['username']} tried to illegally access the mail administration screen",1);
echo $retval;
***************
*** 61,65 ****
{
global $_CONF, $_USER, $_LANG31, $PHP_SELF, $LANG31, $_TABLES;
!
$retval = '';
--- 62,66 ----
{
global $_CONF, $_USER, $_LANG31, $PHP_SELF, $LANG31, $_TABLES;
!
$retval = '';
***************
*** 68,72 ****
$mail_templates->set_var('site_url', $_CONF['site_url']);
$mail_templates->set_var('site_admin_url', $_CONF['site_admin_url']);
! $mail_templates->set_var('startblock_email',COM_startBlock($LANG31[1]));
$mail_templates->set_var('php_self', $PHP_SELF);
$mail_templates->set_var('lang_note', $LANG31[19]);
--- 69,74 ----
$mail_templates->set_var('site_url', $_CONF['site_url']);
$mail_templates->set_var('site_admin_url', $_CONF['site_admin_url']);
! $mail_templates->set_var ('startblock_email', COM_startBlock ($LANG31[1],
! '', COM_getBlockTemplate ('_admin_block', 'header')));
$mail_templates->set_var('php_self', $PHP_SELF);
$mail_templates->set_var('lang_note', $LANG31[19]);
***************
*** 95,99 ****
$mail_templates->set_var('lang_ignoreusersettings', $LANG31[14]);
$mail_templates->set_var('lang_send', $LANG31[12]);
! $mail_templates->set_var('end_block', COM_endBlock());
$mail_templates->parse('output','form');
--- 97,101 ----
$mail_templates->set_var('lang_ignoreusersettings', $LANG31[14]);
$mail_templates->set_var('lang_send', $LANG31[12]);
! $mail_templates->set_var ('end_block', COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer')));
$mail_templates->parse('output','form');
***************
*** 130,149 ****
$headers .= "X-Priority: 1\r\n";
}
!
$headers .= "Return-Path: <{$vars['fraepost']}>\r\n"; // Return path for errors
! if (empty ($LANG_CHARSET)) {
! $charset = $_CONF['default_charset'];
! if (empty ($charset)) {
! $charset = "iso-8859-1";
! }
! }
! else {
! $charset = $LANG_CHARSET;
}
// If you want to send html mail
if (isset($vars['html'])) {
$headers .= "Content-Type: text/html; charset=$charset\r\n"; // Mime type
! }
! else {
$headers .= "Content-Type: text/plain; charset=$charset\r\n";
}
--- 132,150 ----
$headers .= "X-Priority: 1\r\n";
}
!
$headers .= "Return-Path: <{$vars['fraepost']}>\r\n"; // Return path for errors
! if (empty ($LANG_CHARSET)) {
! $charset = $_CONF['default_charset'];
! if (empty ($charset)) {
! $charset = "iso-8859-1";
}
+ } else {
+ $charset = $LANG_CHARSET;
+ }
+
// If you want to send html mail
if (isset($vars['html'])) {
$headers .= "Content-Type: text/html; charset=$charset\r\n"; // Mime type
! } else {
$headers .= "Content-Type: text/plain; charset=$charset\r\n";
}
***************
*** 186,190 ****
}
}
!
$failcount = count($failures);
$successcount = count($successes);
--- 187,191 ----
}
}
!
$failcount = count($failures);
$successcount = count($successes);
***************
*** 207,211 ****
$retval .= $LANG31[24];
}
! return $retval;
}
--- 208,213 ----
$retval .= $LANG31[24];
}
!
! return $retval;
}
More information about the geeklog-cvs
mailing list