Merge pull request #6702 from BOINC/dpa_stats

web: get cross-project stats from free-dc.org rather than netsoft-online.com

Author: AenBleidd

html/inc/stats_sites.inc

@@ -26,9 +26,6 @@ $cpid_stats_sites = array(
     array("BOINCstats",
         "http://boincstats.com/en/stats/-1/user/detail/%s"
     ),
-    array("BOINC Combined Statistics",
-        "http://boinc.netsoft-online.com/e107_plugins/boinc/get_user.php?cpid=%s&html=1"
-    ),
 );
 
 $stats_sites = array(
@@ -51,10 +48,6 @@ $stats_sites = array(
         ""
     ),
 */
-    array("http://boinc.netsoft-online.com/",
-        "BOINC Combined Statistics",
-        "developed by James Drews"
-    ),
     array("http://boincstats.com/",
         "BOINCstats",
         "by Willy de Zutter"

html/inc/user.inc

@@ -34,7 +34,7 @@ if (!defined('REMOTE_PROJECTS_TTL')) {
 //
 function get_other_projects($user) {
     $cpid = md5($user->cross_project_id . $user->email_addr);
-    $url = "http://boinc.netsoft-online.com/get_user.php?cpid=".$cpid;
+    $url = "https://api.free-dc.org/get_user.php?cpid=$cpid";
 
     // Check the cache for that URL
     //

html/inc/util.inc

@@ -138,11 +138,6 @@ $caching = false;
     // if set, we're writing to a file rather than to client
 $did_page_head = false;
 
-define('KILO', 1024);
-define('MEGA', 1024*KILO);
-define('GIGA', 1024*MEGA);
-define('TERA', 1024*GIGA);
-
 // return true if this page is HTTPS
 //
 function is_https() {
@@ -420,32 +415,6 @@ function error_page($msg) {
     exit();
 }
 
-// convert time interval in seconds to a string of the form
-// 'D days h hours m min s sec'.
-
-function time_diff($x, $res=3) {
-    $x = (int)$x;
-    $days    = (int)($x/86400);
-    $hours   = (int)(($x-$days*86400)/3600);
-    $minutes = (int)(($x-$days*86400-$hours*3600)/60);
-    $seconds = $x % 60;
-
-    $s = "";
-    if ($days) {
-        $s .= "$days ".tra("days")." ";
-    }
-    if ($res>0 && ($hours || strlen($s))) {
-        $s .= "$hours ".tra("hours")." ";
-    }
-    if ($res>1 && ($minutes || strlen($s))) {
-        $s .= "$minutes ".tra("min")." ";
-    }
-    if ($res>2) {
-        $s .= "$seconds ".tra("sec")." ";
-    }
-    return $s;
-}
-
 function start_table_str($class="", $style="") {
     $s = $style?'style="'.$style.'"':'';
     return '<div class="table">

html/inc/util_basic.inc

@@ -21,6 +21,7 @@
 // Doesn't contain web-specific stuff like translation.inc
 
 require_once("../inc/random_compat/random.inc");
+    // for random_bytes()
 
 // show PHP errors in output (e.g. web pages).
 // Call this from your project.inc if you want.
@@ -215,6 +216,33 @@ function pretty_time_str($x) {
     return time_str($x);
 }
 
+// convert time interval in seconds to a string of the form
+// 'D days h hours m min s sec'.
+
+function time_diff($x, $res=3) {
+    $x = (int)$x;
+    $days    = (int)($x/86400);
+    $hours   = (int)(($x-$days*86400)/3600);
+    $minutes = (int)(($x-$days*86400-$hours*3600)/60);
+    $seconds = $x % 60;
+
+    $s = "";
+    if ($days) {
+        $s .= "$days ".tra("days")." ";
+    }
+    if ($res>0 && ($hours || strlen($s))) {
+        $s .= "$hours ".tra("hours")." ";
+    }
+    if ($res>1 && ($minutes || strlen($s))) {
+        $s .= "$minutes ".tra("min")." ";
+    }
+    if ($res>2) {
+        $s .= "$seconds ".tra("sec")." ";
+    }
+    return $s;
+}
+
+
 // security vulnerabilities and user-supplied strings:
 // sources:
 // GET and POST arguments
@@ -250,4 +278,9 @@ function filename_rules() {
     return 'Names can contain only A-Z a-z 0-9 . - _ space';
 }
 
+define('KILO', 1024);
+define('MEGA', 1024*KILO);
+define('GIGA', 1024*MEGA);
+define('TERA', 1024*GIGA);
+
 ?>

html/ops/clean_cache.php

@@ -17,25 +17,35 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
 
+// delete files from the web cache until free-space criteria are met
+
 $cli_only = true;
 require_once("../inc/cache.inc");
 require_once("../inc/util_ops.inc");
 
 set_time_limit(0);
 
-function cache_check_diskspace2(){
-   $too_old = 86400;
-   while (1) {
-       $f = disk_free_space("../cache");
-       $u = disk_usage("../cache");
-       echo "free: $f used: $u\n";
-       if ($f > MIN_FREE_SPACE && $u < MAX_CACHE_USAGE) {
-           break;
-       }
-       clean_cache($too_old, "../cache");
-       $too_old/=2;
-   }
+function main(){
+    echo "------- Starting at ".time_str(time())."-------\n";
+
+    echo sprintf("max cache usage: %s\n", size_string(MAX_CACHE_USAGE));
+    $too_old = 86400*7;
+    while (1) {
+        $u = disk_usage("../cache");
+        echo sprintf("cache usage: %s\n", size_string($u));
+        if ($u < MAX_CACHE_USAGE) {
+            echo "criteria met; quitting\n";
+            break;
+        }
+        echo sprintf("deleting files older than %s\n", time_diff($too_old));
+        clean_cache($too_old, "../cache");
+        $too_old /= 2;
+        if ($too_old < 60) {
+            break;
+        }
+    }
+    echo "------- Finished at ".time_str(time())."-------\n";
 }
 
-cache_check_diskspace2();
+main();
 ?>

html/project.sample/cache_parameters.inc

@@ -9,6 +9,8 @@
 //
 // TTL = 0 means don't cache that type of page
 
+require_once('../inc/util_basic.inc');
+
 define('TEAM_PAGE_TTL', 3600);
 define('USER_PAGE_TTL', 3600);
 define('USER_PROFILE_TTL', 3600);
@@ -19,13 +21,12 @@ define('INDEX_PAGE_TTL', 3600);
 define('STATUS_PAGE_TTL', 3600);
 define('REMOTE_PROJECTS_TTL', 86400);
 
-// max allowed cache usage, bytes
+// max cache usage, bytes
 //
-define('MAX_CACHE_USAGE', 1e9);
+define('MAX_CACHE_USAGE', 10*MEGA);
 
-// the cache can grow without bound,
-// so every so often we need to check its size and
-// delete old entries.
+// the cache can grow without bound;
+// every so often we need to check its size and delete old entries.
 // We do this randomly, on average every N page views
 
 define('CACHE_SIZE_CHECK_FREQ', 1000);