From 307b4538d6ba1cd2c62d956a4310303cdb99847c Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Wed, 8 Jan 2014 17:17:07 -0800
Subject: [PATCH] get_project_config.php: use DB abstraction layer.  From
 Janus.

---
 html/user/get_project_config.php | 60 ++++++++++++--------------------
 html/user/server_status.php      | 19 +++++-----
 2 files changed, 33 insertions(+), 46 deletions(-)

diff --git a/html/user/get_project_config.php b/html/user/get_project_config.php
index a52ac6eba0..9e89d867a5 100644
--- a/html/user/get_project_config.php
+++ b/html/user/get_project_config.php
@@ -26,34 +26,24 @@ xml_header();
 // and update it every hour if possible.
 //
 function show_platforms() {
-    $path = "../cache/platform_list.xml";
-    $mtime = @filemtime($path);
-    if ($mtime && (time() - $mtime) < 3600) {
-        @readfile($path);
-    } else {
-        require_once("../inc/db.inc");
-        $retval = db_init_aux(true);
-        if (!$retval) {
-            $query = 'select name, user_friendly_name, plan_class from platform, app_version where app_version.platformid = platform.id and app_version.deprecated=0 group by name, plan_class';
-            $result = mysql_query($query);
-            $f = fopen($path, "w");
-            fwrite($f, "<platforms>\n");
-            while ($p = mysql_fetch_object($result)) {
-                if ($p->plan_class) {
-                    $pc = "   <plan_class>$p->plan_class</plan_class>\n";
-                } else {
-                    $pc = "";
-                }
-                fwrite($f,
-                    "  <platform>\n    <platform_name>$p->name</platform_name>\n    <user_friendly_name>$p->user_friendly_name</user_friendly_name>\n$pc  </platform>\n"
-                );
-            }
-            mysql_free_result($result);
-            fwrite($f, "</platforms>\n");
-            fclose($f);
-            @readfile($path);
+    $xmlFragment = unserialize(get_cached_data(3600, "project_config_platform_xml"));
+    if ($xmlFragment==false){
+        $platforms = BoincDB::get()->enum_fields("platform, app_version", "BoincPlatform", "name, user_friendly_name, plan_class", "app_version.platformid = platform.id and app_version.deprecated=0 group by name, plan_class", "");
+        $xmlFragment = "    <platforms>";
+        foreach ($platforms as $platform){
+            $xmlFragment .= "
+            <platform>
+                <platform_name>$platform->name</platform_name>
+                <user_friendly_name>$platform->user_friendly_name</user_friendly_name>";
+            if ($platform->plan_class) $xmlFragment .= "
+                <plan_class>$platform->plan_class</plan_class>\n"; 
+            $xmlFragment .= "
+            </platform>";
         }
+        $xmlFragment .= "\n    </platforms>\n";
+        set_cached_data(3600, serialize($xmlFragment), "project_config_platform_xml");
     }
+    echo $xmlFragment;
 }
 
 $config = get_config();
@@ -71,7 +61,7 @@ echo "<project_config>
     <master_url>$master_url</master_url>
 ";
 
-$local_revision = trim(file_get_contents("../../local.revision"));
+$local_revision = @trim(file_get_contents("../../local.revision"));
 if ($local_revision) {
     echo "<local_revision>$local_revision</local_revision>\n";
 }
@@ -82,7 +72,7 @@ if (web_stopped()) {
         <web_stopped>1</web_stopped>
     ";
 } else {
-    echo "<web_stopped>0</web_stopped>\n";
+    echo "    <web_stopped>0</web_stopped>\n";
 }
 
 if ($disable_account_creation || defined('INVITE_CODES')) {
@@ -93,14 +83,12 @@ if (defined('INVITE_CODES')) {
 	echo "    <invite_code_required/>\n";
 }
 
-echo "
-    <min_passwd_length>$min_passwd_length</min_passwd_length>
-";
+echo "    <min_passwd_length>$min_passwd_length</min_passwd_length>\n";
 
 if (sched_stopped()) {
-    echo "<sched_stopped>1</sched_stopped>\n";
+    echo "    <sched_stopped>1</sched_stopped>\n";
 } else {
-    echo "<sched_stopped>0</sched_stopped>\n";
+    echo "    <sched_stopped>0</sched_stopped>\n";
 }
 
 $min_core_client_version = parse_config($config, "<min_core_client_version>");
@@ -114,12 +102,10 @@ $tou_file = "../../terms_of_use.txt";
 if (file_exists($tou_file)) {
     $terms_of_use = trim(file_get_contents($tou_file));
     if ($terms_of_use) {
-        echo "<terms_of_use>\n$terms_of_use\n</terms_of_use>\n";
+        echo "    <terms_of_use>\n$terms_of_use\n</terms_of_use>\n";
     }
 }
 
-echo "
-</project_config>
-";
+echo "</project_config>";
 
 ?>
diff --git a/html/user/server_status.php b/html/user/server_status.php
index d65f193c1d..762a808296 100644
--- a/html/user/server_status.php
+++ b/html/user/server_status.php
@@ -160,16 +160,17 @@ function get_runtime_info($appid) {
     $info = unserialize(get_cached_data(3600, "get_runtime_info".$appid));
     if ($info == false) {
         $info = BoincDB::get()->lookup_fields("result", "stdClass",
-                  "ceil(avg(elapsed_time)/3600*100)/100 as avg,
-                   ceil(min(elapsed_time)/3600*100)/100 as min,
-                   ceil(max(elapsed_time)/3600*100)/100 as max,
-                   count(distinct userid) as users",
-                   "appid = $appid 
-                   AND validate_state=1 
-                   AND received_time > (unix_timestamp()-(3600*24)) 
-                   GROUP BY appid");
+            "ceil(avg(elapsed_time)/3600*100)/100 as avg,
+            ceil(min(elapsed_time)/3600*100)/100 as min,
+            ceil(max(elapsed_time)/3600*100)/100 as max,
+            count(distinct userid) as users",
+            "appid = $appid 
+            AND validate_state=1 
+            AND received_time > (unix_timestamp()-(3600*24)) 
+            "
+        );
         if (!$info){
-            // No workunits found recently
+            // No recent jobs sound
             $info = new stdClass;
             $info->avg = $info->min = $info->max = $info->users = 0;
         }