[geeklog-cvs] geeklog-1.3/public_html/admin database.php,1.7,1.8

[dhaun at geeklog.net]

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/admin
In directory internal.geeklog.net:/tmp/cvs-serv32386/public_html/admin

Modified Files:
	database.php 
Log Message:
Ensure that we're really displaying the last 10 backups (thanks to Alexander Schmacks fpr the fix), display total number of backup files, replaced $PHP_SELF with $_CONF['site_admin_url']/database.php since $PHP_SELF seems to cause problems in some environments.


Index: database.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/database.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** database.php	12 Jan 2003 09:42:38 -0000	1.7
--- database.php	27 Mar 2003 09:39:51 -0000	1.8
***************
*** 9,13 ****
  // |                                                                           |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000,2001 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs       - tony at tonybibbs.com                            |
--- 9,13 ----
  // |                                                                           |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2003 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs       - tony at tonybibbs.com                            |
***************
*** 103,146 ****
  
  if(is_writable($_CONF['backup_path'])) {
! 	$backups = array();
! 	$display .= COM_startBlock($LANG_DB_BACKUP['last_ten_backups']);
! 	$fd = opendir($_CONF['backup_path']);
! 	$index = 0;
! 	while ((false !== ($file = @readdir ($fd))) && ($index < 10)) {
! 	    if ($file <> '.' && $file <> '..' && $file <> 'CVS') {
! 	        $index++;
! 	        clearstatcache();
              $backups[] = $file;
      	}
! 	}
! 	if (is_array($backups) AND $index > 0) {
! 	    krsort($backups);
! 	    reset($backups);
!         $display .= '<table width="100%" border="0">' . LB;
!         $display .= '<tr><td><b>' . $LANG_DB_BACKUP['backup_file'] . '</b></td><td align="right"><b>' . $LANG_DB_BACKUP['size'] . '</b></td></tr>';
! 	    for ($i = 1; $i <= count($backups); $i++) {
! 			$backupfile = "{$_CONF['backup_path']}" .current($backups);
! 			$backupfilesize = filesize($backupfile);
! 	        $display .= '<tr><td>' . current($backups) . '</td><td align="right">' . $backupfilesize . ' <b>' . $LANG_DB_BACKUP['bytes'] . '</b></td></tr>' . LB;
! 	        next($backups);
! 	    }
!         $display .= '</table>' . LB;
! 	} 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="' . $PHP_SELF . '">';
! 	$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; 
!     
  ?>
--- 103,161 ----
  
  if(is_writable($_CONF['backup_path'])) {
!     $backups = array();
!     $display .= COM_startBlock($LANG_DB_BACKUP['last_ten_backups']);
!     $fd = opendir($_CONF['backup_path']);
!     $index = 0;
!     while ((false !== ($file = @readdir ($fd)))) {
!         if ($file <> '.' && $file <> '..' && $file <> 'CVS') {
!             $index++;
!             clearstatcache();
              $backups[] = $file;
      	}
!     }
!     if (is_array($backups) AND $index > 0) {
!         krsort($backups);
!         $backups = array_slice ($backups, 0, 10);
!         reset($backups);
! 
!         $database = new Template ($_CONF['path_layout'] . 'admin/database');
!         $database->set_file (array ('list' => 'listbackups.thtml',
!                                     'row' => 'listitem.thtml'));
!         $database->set_var ('site_url', $_CONF['site_url']);
!         $database->set_var ('layout_url', $_CONF['layout_url']);
!         $database->set_var ('lang_backupfile', $LANG_DB_BACKUP['backup_file']);
!         $database->set_var ('lang_backupsize', $LANG_DB_BACKUP['size']);
!         $database->set_var ('lang_bytes', $LANG_DB_BACKUP['bytes']);
! 
!         for ($i = 1; $i <= count ($backups); $i++) {
!             $backupfile = $_CONF['backup_path'] . current ($backups);
!             $backupfilesize = filesize ($backupfile);
!             $database->set_var ('backup_file', current ($backups));
!             $database->set_var ('backup_size', $backupfilesize);
!             $database->parse ('backup_item', 'row', true);
!             next($backups);
!         }
!         $database->set_var ('number_backups',
!                 sprintf ($LANG_DB_BACKUP['total_number'], $index));
!         $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; 
! 
  ?>