[geeklog-cvs] geeklog-1.3/public_html/admin database.php,1.11,1.12
geeklog-cvs-admin at lists.geeklog.net
geeklog-cvs-admin at lists.geeklog.net
Thu Jun 19 13:37:40 EDT 2003
Update of /usr/cvs/geeklog/geeklog-1.3/public_html/admin
In directory internal.geeklog.net:/tmp/cvs-serv25947
Modified Files:
database.php
Log Message:
Use '_admin_block' and '_msg_block' templates fro blocks,
fixed display problems with error messages (extra footer).
Index: database.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/database.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** database.php 17 Jun 2003 09:40:15 -0000 1.11
--- database.php 19 Jun 2003 17:37:37 -0000 1.12
***************
*** 13,16 ****
--- 13,17 ----
// | Authors: Tony Bibbs - tony at tonybibbs.com |
// | Blaine Lang - langmail at sympatico.ca |
+ // | Dirk Haun - dirk at haun-online.de |
// +---------------------------------------------------------------------------+
// | |
***************
*** 47,55 ****
// If user isn't a root user or if the backup feature is disabled, bail.
! if (!SEC_inGroup('Root') OR $_CONF['allow_mysqldump'] == 0) {
! $display .= COM_startBlock($MESSAGE[30]);
$display .= $MESSAGE[46];
! $display .= COM_endBlock();
! $display .= COM_siteFooter();
COM_errorLog("User {$_USER['username']} tried to illegally access the database backup screen",1);
echo $display;
--- 48,57 ----
// If user isn't a root user or if the backup feature is disabled, bail.
! if (!SEC_inGroup ('Root') OR $_CONF['allow_mysqldump'] == 0) {
! $display .= COM_startBlock($MESSAGE[30], '',
! COM_getBlockTemplate ('_msg_block', 'header'));
$display .= $MESSAGE[46];
! $display .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
! $display .= COM_siteFooter ();
COM_errorLog("User {$_USER['username']} tried to illegally access the database backup screen",1);
echo $display;
***************
*** 81,109 ****
if (file_exists ($backupfile) && filesize ($backupfile) > 0) {
$timestamp = strftime ($_CONF['daytime']);
! $display .= COM_startBlock ($MESSAGE[40] . ' - ' . $timestamp)
! . '<img src="' . $_CONF['layout_url']
! . '/images/sysmessage.gif" border="0" align="top" '
! . 'alt="">' . $LANG_DB_BACKUP['backup_successful']
! . '<br><br>' . COM_endBlock ();
} else {
! $display .= COM_startBlock($LANG08[06]);
! $display .= $LANG_DB_BACKUP['zero_size'];
! $display .= COM_endBlock();
! $display .= COM_siteFooter();
! COM_errorLog("Backup Filesize was 0 bytes",1);
! }
} else {
! $display .= COM_startBlock($LANG08[06]);
! $display .= $LANG_DB_BACKUP['not_found'];
! $display .= COM_endBlock();
! $display .= COM_siteFooter();
! COM_errorLog("Backup Error: Bad path or mysqldump does not exist",1);
}
} else {
! $display .= COM_startBlock($MESSAGE[30]);
! $display .= $LANG_DB_BACKUP['path_not_found'];
! $display .= COM_endBlock();
! $display .= COM_siteFooter();
! COM_errorLog($_CONF['backup_path'] . " does not exist or is not a directory",1);
}
}
--- 83,114 ----
if (file_exists ($backupfile) && filesize ($backupfile) > 0) {
$timestamp = strftime ($_CONF['daytime']);
! $display .= COM_startBlock ($MESSAGE[40] . ' - ' . $timestamp,
! '', COM_getBlockTemplate ('_msg_block', 'header'))
! . '<img src="' . $_CONF['layout_url'] . '/images/'
! . 'sysmessage.gif" border="0" align="top" alt="">'
! . $LANG_DB_BACKUP['backup_successful'] . '<br><br>'
! . COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
} else {
! $display .= COM_startBlock ($LANG08[06], '',
! COM_getBlockTemplate ('_msg_block', 'header'));
! $display .= $LANG_DB_BACKUP['zero_size'];
! $display .= COM_endBlock (COM_getBlockTemplate ('_msg_block',
! 'footer'));
! COM_errorLog ("Backup Filesize was 0 bytes", 1);
! }
} else {
! $display .= COM_startBlock ($LANG08[06], '',
! COM_getBlockTemplate ('_msg_block', 'header'));
! $display .= $LANG_DB_BACKUP['not_found'];
! $display .= COM_endBlock (COM_getBlockTemplate ('_msg_block',
! 'footer'));
! COM_errorLog("Backup Error: Bad path or mysqldump does not exist",1);
}
} else {
! $display .= COM_startBlock ($MESSAGE[30], '',
! COM_getBlockTemplate ('_msg_block', 'header'));
! $display .= $LANG_DB_BACKUP['path_not_found'];
! $display .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
! COM_errorLog($_CONF['backup_path'] . " does not exist or is not a directory",1);
}
}
***************
*** 113,117 ****
if(is_writable($_CONF['backup_path'])) {
$backups = array();
! $display .= COM_startBlock($LANG_DB_BACKUP['last_ten_backups']);
$fd = opendir($_CONF['backup_path']);
$index = 0;
--- 118,123 ----
if(is_writable($_CONF['backup_path'])) {
$backups = array();
! $display .= COM_startBlock ($LANG_DB_BACKUP['last_ten_backups'], '',
! COM_getBlockTemplate ('_admin_block', 'header'));
$fd = opendir($_CONF['backup_path']);
$index = 0;
***************
*** 150,169 ****
$display .= $database->parse ('output', 'list');
} else {
! $display .= $LANG_DB_BACKUP['no_backups'];
}
- $display .= COM_endBlock();
// Show backup form
$display .= $LANG_DB_BACKUP['db_explanation'];
! $display .= '<form name="dobackup" method="post" action="' . $_CONF['site_admin_url'] . '/database.php">';
! $display .= '<input type="submit" name="mode" value="' . $LANG_DB_BACKUP['do_backup'] . '"></form>';
! $display .= COM_siteFooter();
} else {
! $display .= COM_startBlock($LANG08[06]);
$display .= $LANG_DB_BACKUP['no_access'];
! COM_errorLog($_CONF['backup_path'] . " is not accessible.",1);
! $display .= COM_endBlock();
! $display .= COM_siteFooter();
}
echo $display;
--- 156,178 ----
$display .= $database->parse ('output', 'list');
} else {
! $display .= '<p>' . $LANG_DB_BACKUP['no_backups'] . '</p>';
}
// Show backup form
$display .= $LANG_DB_BACKUP['db_explanation'];
! $display .= '<form name="dobackup" method="POST" action="'
! . $_CONF['site_admin_url'] . '/database.php">';
! $display .= '<input type="submit" name="mode" value="'
! . $LANG_DB_BACKUP['do_backup'] . '"></form>';
!
! $display .= COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer'));
} else {
! $display .= COM_startBlock ($LANG08[06], '',
! COM_getBlockTemplate ('_msg_block', 'header'));
$display .= $LANG_DB_BACKUP['no_access'];
! COM_errorLog ($_CONF['backup_path'] . ' is not accessible.', 1);
! $display .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
}
+ $display .= COM_siteFooter ();
echo $display;
More information about the geeklog-cvs
mailing list