From d4a40a8841e361ef3ddefcefc871d286090d31bd Mon Sep 17 00:00:00 2001 From: David Anderson Date: Sat, 2 Feb 2013 21:09:30 -0800 Subject: [PATCH] - admin web: remove outdated code that tried to show SVN version in the admin main page --- html/ops/index.php | 40 --------------------------------- html/project.sample/project.inc | 4 ---- tools/upgrade | 1 - 3 files changed, 45 deletions(-) diff --git a/html/ops/index.php b/html/ops/index.php index cf32a44e3d..28b4261d01 100644 --- a/html/ops/index.php +++ b/html/ops/index.php @@ -21,23 +21,6 @@ require_once("../inc/util_ops.inc"); require_once("../inc/uotd.inc"); require_once("../project/project.inc"); -function svn_revision($path) { - $out = array(); - $cmd = "svn info http://boinc.berkeley.edu/svn/$path"; - if (defined("SVN_CONFIG_DIRECTORY")) { - $cmd .= " --config-dir ". SVN_CONFIG_DIRECTORY; - } - exec($cmd, $out); - foreach ($out as $line) { - $x = strstr($line, "Last Changed Rev: "); - if ($x) { - $y = substr($x, strlen("Last Changed Rev: ")); - return (int) $y; - } - } - return null; -} - $config = get_config(); $cgi_url = parse_config($config, ""); $stripchart_cgi_url = parse_config($config, ""); @@ -50,29 +33,6 @@ admin_page_head($title); // Notification area echo "
    \n"; -echo "
  • "; -if (file_exists("../../local.revision")) { - $local_rev = file_get_contents("../../local.revision"); -} -if ($local_rev) { - echo "Using BOINC SVN revision: ".$local_rev."; "; -} - -if (0 -//if (file_exists("../cache/remote.revision") -// && (time() < filemtime("../cache/remote.revision")+(24*60*60)) -) { - $remote_rev = file_get_contents("../cache/remote.revision"); -} else { - $remote_rev = svn_revision("branches/server_stable"); -} - -if ($remote_rev) { - echo "BOINC server_stable SVN revision: $remote_rev"; -} else { - echo "Can't get BOINC server_stable SVN revision"; -} - if (!file_exists(".htaccess")) { echo "
  • The Project Management directory is not protected from public access by a .htaccess file.
  • \n"; diff --git a/html/project.sample/project.inc b/html/project.sample/project.inc index eb2a37f133..a578662d5a 100644 --- a/html/project.sample/project.inc +++ b/html/project.sample/project.inc @@ -29,10 +29,6 @@ define("UOTD_ADMIN_EMAIL", "admin@$master_url"); // offensive forum posts. define("POST_REPORT_EMAILS", "moderator1@$master_url|moderator2@$master_url"); -// set the following if SVN requires specific configuration (e.g. proxy) -// Used on ops/index.php. -// define("SVN_CONFIG_DIRECTORY", "/home/boincadm/.subversion/"); - function project_banner($title, $prefix) { // Put your project title and logo here // If you include any links, prepend URL with $prefix diff --git a/tools/upgrade b/tools/upgrade index 1d1dd7bb8c..b4945c2853 100755 --- a/tools/upgrade +++ b/tools/upgrade @@ -78,7 +78,6 @@ init() install_boinc_files(INSTALL_DIR, not options.server_only, not options.web_only) print "Upgrading files... done" -print "Finding SVN revision" print "Updating translations" try: