From: Joe Z. <jz...@us...> - 2010-02-25 20:11:54
|
Update of /cvsroot/bobs/bobs In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv27283/bobs Modified Files: admin.php chgadminpwd.php excludes.php systemcheck.php Log Message: Show hostname on heading. Index: admin.php =================================================================== RCS file: /cvsroot/bobs/bobs/admin.php,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- admin.php 1 Jun 2004 06:18:37 -0000 1.28 +++ admin.php 25 Feb 2010 20:11:45 -0000 1.29 @@ -135,6 +135,8 @@ // Tell rfasttemplate the template file name $t->assign('HEADER', implode("", file('inc/header.pinc'))); // Load the page header + $hostname = gethostname(); + $t->assign('HOSTNAME', $hostname); // Host hame for heading $t->assign('PHPSELF', $_SERVER['PHP_SELF']); // Replace PHPSELF with the current URL $t->assign('ERRMSG', ""); // Initialize error message if (isset($_POST['password'])) { // Password must have been wrong @@ -156,6 +158,8 @@ $t->define(array('admin_help' => 'admin_help.thtml')); // Tell rfasttemplate the template file name $t->assign('HEADER', implode("", file('inc/header.pinc'))); + $hostname = gethostname(); + $t->assign('HOSTNAME', $hostname); // Host hame for heading $t->assign('ADMINHELP', implode("", file('winc/adminhelp.html'))); $t->parse('ADMIN_HELP', 'admin_help'); // Prepare the final output $t->FastPrint(); // and send it to stdout. @@ -211,6 +215,8 @@ $t->define(array('select_server' => 'select_server.thtml')); // Tell rfasttemplate the template file name $t->assign('HEADER', implode("", file('inc/header.pinc'))); + $hostname = gethostname(); + $t->assign('HOSTNAME', $hostname); // Host hame for heading // Load the page header $t->assign('PHPSELF', $PHPSELF); // Replace PHPSELF with the current URL $t->assign('ERRMSG', $errmsg); // Error message (if any) @@ -341,6 +347,8 @@ // Tell rfasttemplate the template file name $t->assign('HEADER', implode("", file('inc/header.pinc'))); // Load the page header + $hostname = gethostname(); + $t->assign('HOSTNAME', $hostname); // Host hame for heading $t->assign('PHPSELF', "$PHPSELF"); // Replace PHPSELF with the current URL $t->assign('ERRMSG', $errmsg); // Error message $t->assign('BORDER', "$tableborder"); // Helpful to debug table layout @@ -512,6 +520,8 @@ // same file as 'confirm_server template $t->assign('HEADER', implode("", file('inc/header.pinc'))); // Load the page header + $hostname = gethostname(); + $t->assign('HOSTNAME', $hostname); // Host hame for heading $t->assign('BORDER', "$tableborder"); // Helpful to debug table layout $t->assign('MODE', "$mode"); // Helpful to debug table layout @@ -605,6 +615,8 @@ // Tell rfasttemplate the template file name $t->assign('HEADER', implode("", file('inc/header.pinc'))); // Load the page header + $hostname = gethostname(); + $t->assign('HOSTNAME', $hostname); // Host hame for heading $t->assign('PHPSELF', "$PHPSELF"); // Replace PHPSELF with the current URL $t->assign('SERVER', $server); $t->assign('SHARE', $share); Index: chgadminpwd.php =================================================================== RCS file: /cvsroot/bobs/bobs/chgadminpwd.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- chgadminpwd.php 8 May 2003 05:46:51 -0000 1.1 +++ chgadminpwd.php 25 Feb 2010 20:11:45 -0000 1.2 @@ -29,6 +29,11 @@ $t->assign('PHPSELF', $_SERVER['PHP_SELF']); // Replace PHPSELF with the current URL $t->assign('ERRMSG', " "); +$t->assign('HEADER', implode("", file('inc/header.pinc'))); + // Load the page header +$hostname = gethostname(); +$t->assign('HOSTNAME', $hostname); // Host hame for heading + // What action to take? if (isset($_POST['chg_pwd_OK'])){ // OK button pressed on chg pwd screen @@ -38,7 +43,6 @@ // Output the html -include_once("inc/header.pinc"); // This is the menu bar and main title. $t->parse('CHGPWD', 'chgpwd'); // Parse the template. $t->FastPrint(); // and send it to stdout. Index: excludes.php =================================================================== RCS file: /cvsroot/bobs/bobs/excludes.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- excludes.php 1 Jun 2004 06:18:37 -0000 1.1 +++ excludes.php 25 Feb 2010 20:11:45 -0000 1.2 @@ -85,6 +85,8 @@ // Tell rfasttemplate the template file name $t->assign('HEADER', implode("", file('inc/header.pinc'))); // Load the page header + $hostname = gethostname(); + $t->assign('HOSTNAME', $hostname); // Host hame for heading $t->assign('PHPSELF', $PHPSELF); // Replace PHPSELF with the current URL $t->assign('ERRMSG', $errmsg); // Error message (if any) $t->assign('BORDER', "0"); // No border Index: systemcheck.php =================================================================== RCS file: /cvsroot/bobs/bobs/systemcheck.php,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- systemcheck.php 24 Feb 2010 21:59:22 -0000 1.11 +++ systemcheck.php 25 Feb 2010 20:11:45 -0000 1.12 @@ -11,7 +11,6 @@ require_once ('inc/class_rfasttemplate.php'); // Template class require_once("inc/class_config.php"); // configuration class require_once("inc/class_admin.php"); // Administration interface class -include_once("inc/header.pinc"); // Main menu $config = new config(); // Create instance of configuration class $admin = new admin(); // Create instance of admin class @@ -26,6 +25,11 @@ // Heading +$t->assign('HEADER', implode("", file('inc/header.pinc'))); + // Load the page header +$hostname = gethostname(); +$t->assign('HOSTNAME', $hostname); // Host hame for heading + $t->assign ('TITLE', 'System check'); $t->parse ('CONTENT', 'content'); echo ($t->fetch()); @@ -478,7 +482,7 @@ $server_or_ip = $server; } $rsync_ssh_path = $config['rsync_ssh_path']; - $rsync = "rsync -n -e ssh " . $server_or_ip . ':' . $rsync_ssh_path; + $rsync = "rsync -n --no-dirs -e ssh " . $server_or_ip . ':' . $rsync_ssh_path; $t->assign ('ITEM', "Testing rsync over ssh for backup method \"$method\" using this command:<br> $rsync"); $srvtmpl->assign ('COMMAND', "$rsync"); // the mount command |