[geeklog-cvs] geeklog-1.3/public_html/admin auth.inc.php,1.16,1.17 database.php,1.12,1.13 event.php,1.40,1.41 group.php,1.28,1.29 link.php,1.34,1.35 mail.php,1.18,1.19 moderation.php,1.42,1.43 plugins.php,1.34,1.35 poll.php,1.33,1.34 syndication.php,1.1,1.2 user.php,1.61,1.62
geeklog-cvs-admin at lists.geeklog.net
geeklog-cvs-admin at lists.geeklog.net
Mon Sep 1 15:01:09 EDT 2003
Update of /usr/cvs/geeklog/geeklog-1.3/public_html/admin
In directory geeklog_prod:/tmp/cvs-serv28005/public_html/admin
Modified Files:
auth.inc.php database.php event.php group.php link.php
mail.php moderation.php plugins.php poll.php syndication.php
user.php
Log Message:
Fixed warnings
Index: auth.inc.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/auth.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** auth.inc.php 8 May 2003 17:23:10 -0000 1.16
--- auth.inc.php 1 Sep 2003 19:01:05 -0000 1.17
***************
*** 43,46 ****
--- 43,48 ----
}
+ $display = '';
+
if (!empty($passwd) && $mypasswd == md5($passwd)) {
$userdata = SESS_getUserData($loginname);
Index: database.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/database.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** database.php 19 Jun 2003 17:37:37 -0000 1.12
--- database.php 1 Sep 2003 19:01:05 -0000 1.13
***************
*** 61,65 ****
// Perform the backup if asked
! if ($mode == $LANG_DB_BACKUP['do_backup']) {
if (is_dir ($_CONF['backup_path'])) {
$curdatetime = date ("Y_m_d");
--- 61,66 ----
// Perform the backup if asked
! if (isset ($HTTP_POST_VARS['mode']) &&
! ($HTTP_POST_VARS['mode'] == $LANG_DB_BACKUP['do_backup'])) {
if (is_dir ($_CONF['backup_path'])) {
$curdatetime = date ("Y_m_d");
Index: event.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/event.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** event.php 12 Aug 2003 10:49:24 -0000 1.40
--- event.php 1 Sep 2003 19:01:05 -0000 1.41
***************
*** 117,120 ****
--- 117,121 ----
$types = explode(',',$_CONF['event_types']);
asort ($types);
+ $catdd = '';
for ($i = 1; $i <= count($types); $i++) {
$catdd .= '<option value="' . current($types) . '"';
***************
*** 152,158 ****
if ($start_hour > 12) {
$start_hour = $start_hour - 12;
- $ampm = 'pm';
- }
- if ($ampm == 'pm') {
$event_templates->set_var('startpm_selected','selected="SELECTED"');
} else {
--- 153,156 ----
***************
*** 609,613 ****
} else { // 'cancel' or no mode at all
$display .= COM_siteHeader('menu');
! $display .= COM_showMessage($msg);
$display .= listevents();
$display .= COM_siteFooter();
--- 607,613 ----
} else { // 'cancel' or no mode at all
$display .= COM_siteHeader('menu');
! if (isset ($msg)) {
! $display .= COM_showMessage($msg);
! }
$display .= listevents();
$display .= COM_siteFooter();
Index: group.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/group.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** group.php 28 Jun 2003 11:24:45 -0000 1.28
--- group.php 1 Sep 2003 19:01:05 -0000 1.29
***************
*** 146,149 ****
--- 146,150 ----
//$groups = SEC_getUserGroups('','',$grp_id);
+ $selected = '';
if (!empty($grp_id)) {
$tmp = DB_query("SELECT ug_main_grp_id FROM {$_TABLES['group_assignments']} WHERE ug_grp_id = $grp_id");
***************
*** 361,365 ****
function savegroup($grp_id,$grp_name,$grp_descr,$grp_gl_core,$features,$groups)
{
! global $_TABLES, $_CONF, $LANG_ACCESS;
if (!empty($grp_name) && !empty($grp_descr)) {
--- 362,366 ----
function savegroup($grp_id,$grp_name,$grp_descr,$grp_gl_core,$features,$groups)
{
! global $_TABLES, $_CONF, $LANG_ACCESS, $VERBOSE;
if (!empty($grp_name) && !empty($grp_descr)) {
***************
*** 426,430 ****
global $_TABLES, $_CONF, $LANG_ACCESS;
! $retval .= COM_startBlock ($LANG_ACCESS['groupmanager'], '',
COM_getBlockTemplate ('_admin_block', 'header'));
--- 427,431 ----
global $_TABLES, $_CONF, $LANG_ACCESS;
! $retval = COM_startBlock ($LANG_ACCESS['groupmanager'], '',
COM_getBlockTemplate ('_admin_block', 'header'));
***************
*** 604,608 ****
else { // 'cancel' or no mode at all
$display .= COM_siteHeader('menu');
! $display .= COM_showMessage($msg);
$display .= listgroups();
$display .= COM_siteFooter();
--- 605,611 ----
else { // 'cancel' or no mode at all
$display .= COM_siteHeader('menu');
! if (isset ($msg)) {
! $display .= COM_showMessage($msg);
! }
$display .= listgroups();
$display .= COM_siteFooter();
Index: link.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/link.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** link.php 21 Jun 2003 08:57:13 -0000 1.34
--- link.php 1 Sep 2003 19:01:05 -0000 1.35
***************
*** 137,145 ****
// user access info
! $link_templates->set_var('lang_accessrights', $LANG_ACCESS[accessrights]);
! $link_templates->set_var('lang_owner', $LANG_ACCESS[owner]);
$link_templates->set_var('owner_username', DB_getItem($_TABLES['users'],'username',"uid = {$A['owner_id']}"));
$link_templates->set_var('link_ownerid', $A['owner_id']);
! $link_templates->set_var('lang_group', $LANG_ACCESS[group]);
$usergroups = SEC_getUserGroups();
--- 137,145 ----
// user access info
! $link_templates->set_var('lang_accessrights', $LANG_ACCESS['accessrights']);
! $link_templates->set_var('lang_owner', $LANG_ACCESS['owner']);
$link_templates->set_var('owner_username', DB_getItem($_TABLES['users'],'username',"uid = {$A['owner_id']}"));
$link_templates->set_var('link_ownerid', $A['owner_id']);
! $link_templates->set_var('lang_group', $LANG_ACCESS['group']);
$usergroups = SEC_getUserGroups();
***************
*** 161,168 ****
}
$link_templates->set_var('group_dropdown', $groupdd);
! $link_templates->set_var('lang_permissions', $LANG_ACCESS[permissions]);
! $link_templates->set_var('lang_permissionskey', $LANG_ACCESS[permissionskey]);
$link_templates->set_var('permissions_editor', SEC_getPermissionsHTML($A['perm_owner'],$A['perm_group'],$A['perm_members'],$A['perm_anon']));
! $link_templates->set_var('lang_lockmsg', $LANG_ACCESS[lockmsg]);
$link_templates->parse('output', 'editor');
$retval .= $link_templates->finish($link_templates->get_var('output'));
--- 161,168 ----
}
$link_templates->set_var('group_dropdown', $groupdd);
! $link_templates->set_var('lang_permissions', $LANG_ACCESS['permissions']);
! $link_templates->set_var('lang_permissionskey', $LANG_ACCESS['permissionskey']);
$link_templates->set_var('permissions_editor', SEC_getPermissionsHTML($A['perm_owner'],$A['perm_group'],$A['perm_members'],$A['perm_anon']));
! $link_templates->set_var('lang_lockmsg', $LANG_ACCESS['permmsg']);
$link_templates->parse('output', 'editor');
$retval .= $link_templates->finish($link_templates->get_var('output'));
***************
*** 273,279 ****
function listlinks()
{
! global $_TABLES, $LANG23, $LANG_ACCESS, $_CONF;
! $retavl .= '';
$retval .= COM_startBlock ($LANG23[11], '',
--- 273,279 ----
function listlinks()
{
! global $_CONF, $_TABLES, $LANG23, $LANG_ACCESS;
! $retval = '';
$retval .= COM_startBlock ($LANG23[11], '',
***************
*** 289,293 ****
$link_templates->set_var('lang_instructions', $LANG23[12]);
$link_templates->set_var('lang_linktitle', $LANG23[13]);
! $link_templates->set_var('lang_access', $LANG_ACCESS[access]);
$link_templates->set_var('lang_linkcategory', $LANG23[14]);
$link_templates->set_var('lang_linkurl', $LANG23[15]);
--- 289,293 ----
$link_templates->set_var('lang_instructions', $LANG23[12]);
$link_templates->set_var('lang_linktitle', $LANG23[13]);
! $link_templates->set_var('lang_access', $LANG_ACCESS['access']);
$link_templates->set_var('lang_linkcategory', $LANG23[14]);
$link_templates->set_var('lang_linkurl', $LANG23[15]);
***************
*** 343,347 ****
} else { // 'cancel' or no mode at all
$display .= COM_siteHeader('menu');
! $display .= COM_showMessage($msg);
$display .= listlinks();
$display .= COM_siteFooter();
--- 343,349 ----
} else { // 'cancel' or no mode at all
$display .= COM_siteHeader('menu');
! if (isset ($msg)) {
! $display .= COM_showMessage($msg);
! }
$display .= listlinks();
$display .= COM_siteFooter();
Index: mail.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/mail.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** mail.php 1 Sep 2003 12:53:06 -0000 1.18
--- mail.php 1 Sep 2003 19:01:06 -0000 1.19
***************
*** 177,181 ****
$failcount = count($failures);
$successcount = count($successes);
! $mailresult .= str_replace('<successcount>',$successcount,$LANG31[20]);
$retval .= str_replace('<failcount>',$failcount,$mailresult);
$retval .= "<h2>{$LANG31[21]}</h2>";
--- 177,181 ----
$failcount = count($failures);
$successcount = count($successes);
! $mailresult = str_replace('<successcount>',$successcount,$LANG31[20]);
$retval .= str_replace('<failcount>',$failcount,$mailresult);
$retval .= "<h2>{$LANG31[21]}</h2>";
***************
*** 203,207 ****
$display .= COM_siteHeader();
! if ($mail == 'mail') {
$display .= send_messages($HTTP_POST_VARS);
} else {
--- 203,207 ----
$display .= COM_siteHeader();
! if (isset ($HTTP_POST_VARS['mail']) && ($HTTP_POST_VARS['mail'] == 'mail')) {
$display .= send_messages($HTTP_POST_VARS);
} else {
Index: moderation.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/moderation.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** moderation.php 12 Aug 2003 21:10:05 -0000 1.42
--- moderation.php 1 Sep 2003 19:01:06 -0000 1.43
***************
*** 382,386 ****
global $_TABLES, $_CONF, $LANG24, $LANG29;
! $retval .= COM_startBlock ($LANG29[35] . ' (' . $LANG24[34] . ')', '',
COM_getBlockTemplate ('_admin_block', 'header'));
--- 382,386 ----
global $_TABLES, $_CONF, $LANG24, $LANG29;
! $retval = COM_startBlock ($LANG29[35] . ' (' . $LANG24[34] . ')', '',
COM_getBlockTemplate ('_admin_block', 'header'));
***************
*** 642,649 ****
$display = '';
$display .= COM_siteHeader();
! $display .= COM_showMessage($msg);
! switch ($mode) {
! case 'moderation':
if ($type == 'user') {
$display .= moderateusers($id,$action,$count);
--- 642,650 ----
$display = '';
$display .= COM_siteHeader();
! if (isset ($msg)) {
! $display .= COM_showMessage($msg);
! }
! if (isset ($HTTP_POST_VARS['mode']) && ($HTTP_POST_VARS['mode'] == 'moderation')) {
if ($type == 'user') {
$display .= moderateusers($id,$action,$count);
***************
*** 651,658 ****
$display .= moderation($id,$action,$type,$count);
}
! break;
! default:
$display .= commandcontrol();
- break;
}
--- 652,657 ----
$display .= moderation($id,$action,$type,$count);
}
! } else {
$display .= commandcontrol();
}
Index: plugins.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/plugins.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** plugins.php 5 Jul 2003 16:37:58 -0000 1.34
--- plugins.php 1 Sep 2003 19:01:06 -0000 1.35
***************
*** 375,379 ****
} else { // 'cancel' or no mode at all
$display .= COM_siteHeader('menu');
! $display .= COM_showMessage($msg);
$display .= listplugins($page);
$display .= COM_siteFooter();
--- 375,381 ----
} else { // 'cancel' or no mode at all
$display .= COM_siteHeader('menu');
! if (isset ($msg)) {
! $display .= COM_showMessage($msg);
! }
$display .= listplugins($page);
$display .= COM_siteFooter();
Index: poll.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/poll.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** poll.php 14 Jul 2003 17:02:42 -0000 1.33
--- poll.php 1 Sep 2003 19:01:06 -0000 1.34
***************
*** 198,202 ****
global $_TABLES, $LANG25, $_CONF, $_USER, $LANG_ACCESS;
! $retval .= '';
$poll_templates = new Template($_CONF['path_layout'] . 'admin/poll');
--- 198,202 ----
global $_TABLES, $LANG25, $_CONF, $_USER, $LANG_ACCESS;
! $retval = '';
$poll_templates = new Template($_CONF['path_layout'] . 'admin/poll');
***************
*** 406,410 ****
} else { // 'cancel' or no mode at all
$display .= COM_siteHeader('menu');
! $display .= COM_showMessage($msg);
$display .= listpoll();
$display .= COM_siteFooter();
--- 406,412 ----
} else { // 'cancel' or no mode at all
$display .= COM_siteHeader('menu');
! if (isset ($msg)) {
! $display .= COM_showMessage($msg);
! }
$display .= listpoll();
$display .= COM_siteFooter();
Index: syndication.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/syndication.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** syndication.php 12 Aug 2003 21:10:05 -0000 1.1
--- syndication.php 1 Sep 2003 19:01:06 -0000 1.2
***************
*** 507,513 ****
else
{
! $display .= COM_siteHeader ('menu')
! . COM_showMessage ($http_input_vars['msg'])
! . listfeeds ()
. COM_siteFooter ();
}
--- 507,515 ----
else
{
! $display .= COM_siteHeader ('menu');
! if (isset ($http_input_vars['msg'])) {
! $display .= COM_showMessage ($http_input_vars['msg']);
! }
! $display .= listfeeds ()
. COM_siteFooter ();
}
Index: user.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/user.php,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** user.php 1 Sep 2003 12:53:06 -0000 1.61
--- user.php 1 Sep 2003 19:01:06 -0000 1.62
***************
*** 212,215 ****
--- 212,217 ----
global $_TABLES, $_CONF, $LANG28, $_USER_VERBOSE, $_USER;
+ $retval = '';
+
if ($_USER_VERBOSE) COM_errorLog("**** entering saveusers****",1);
if ($_USER_VERBOSE) COM_errorLog("group size at beginning = " . sizeof($groups),1);
***************
*** 627,631 ****
} else { // 'cancel' or no mode at all
$display .= COM_siteHeader('menu');
! $display .= COM_showMessage($msg);
if (empty($offset)) {
$offset = 0;
--- 629,635 ----
} else { // 'cancel' or no mode at all
$display .= COM_siteHeader('menu');
! if (isset ($msg)) {
! $display .= COM_showMessage($msg);
! }
if (empty($offset)) {
$offset = 0;
More information about the geeklog-cvs
mailing list