View GitHub Repository boinc

Schedule Inspection
Subscribe
Passed
Push — dpa_web26 ( 31eb5d )
by David
09:35
created
Status
Category
Toggle Patches
html/inc/cache.inc 2 patches
Spacing   +29 added lines, -29 removed lines patch added patch discarded remove patch 
@@ -32,8 +32,8 @@  discard block
 
 block discarded – undo
32 32 
         mkdir("../cache", 0770);
33 33 
         chmod("../cache", 0770);
34 34 
     }
35 
-    for ($i=0;$i<256;$i++) {
36 
-        $j=sprintf("%02x",$i);
35 
+    for ($i = 0; $i < 256; $i++) {
36 
+        $j = sprintf("%02x", $i);
37 37 
         if (!@filemtime("../cache/$j")) {
38 38 
             mkdir("../cache/$j", 0770);
39 39 
             chmod("../cache/$j", 0770);
 
@@ -41,7 +41,7 @@  discard block
 
 block discarded – undo
41 41 
     }
42 42 
 }
43 43
44 
-function get_path($params, $phpfile=null) {
44 
+function get_path($params, $phpfile = null) {
45 45 
     if (!@filemtime("../cache/00")) make_cache_dirs();
46 46 
     if ($phpfile) {
47 47 
         $z = $phpfile;
 
@@ -51,7 +51,7 @@  discard block
 
 block discarded – undo
51 51 
     }
52 52
53 53 
     // add a layer of subdirectories for reducing file lookup time
54 
-    $sz = substr(md5($z."_".urlencode($params)),1,2);
54 
+    $sz = substr(md5($z."_".urlencode($params)), 1, 2);
55 55 
     $path = "../cache/".$sz."/".$z;
56 56 
     if ($params) {
57 57 
         $path = $path."_".urlencode($params);
 
@@ -60,14 +60,14 @@  discard block
 
 block discarded – undo
60 60 
 }
61 61
62 62 
 function disk_usage($dir) {
63 
-    $usage=0;
64 
-    if ($handle=@opendir($dir)) {
65 
-        while ($file=readdir($handle)) {
63 
+    $usage = 0;
64 
+    if ($handle = @opendir($dir)) {
65 
+        while ($file = readdir($handle)) {
66 66 
             if (($file != ".") && ($file != "..")) {
67 67 
                 if (@is_dir($dir."/".$file)) {
68 
-                    $usage+=disk_usage($dir."/".$file);
68 
+                    $usage += disk_usage($dir."/".$file);
69 69 
                 } else {
70 
-                    $usage+=@filesize($dir."/".$file);
70 
+                    $usage += @filesize($dir."/".$file);
71 71 
                 }
72 72 
             }
73 73 
         }
 
@@ -81,8 +81,8 @@  discard block
 
 block discarded – undo
81 81 
     if (!chdir($dir)) {
82 82 
         return;
83 83 
     }
84 
-    if ($handle=@opendir(".")) {
85 
-        while ($file=readdir($handle)) {
84 
+    if ($handle = @opendir(".")) {
85 
+        while ($file = readdir($handle)) {
86 86 
             if ($file == ".") continue;
87 87 
             if ($file == "..") continue;
88 88 
 
@@ -93,7 +93,7 @@  discard block
 
 block discarded – undo
93 93 
             if (@is_dir($file)) {
94 94 
                 clean_cache($max_age, $file);
95 95 
             } else {
96 
-                if ((time()-@filemtime($file))>$max_age) {
96 
+                if ((time() - @filemtime($file)) > $max_age) {
97 97 
                     //echo "unlinking ".getcwd()."/$file\n";
98 98 
                     @unlink($file);
99 99 
                 }
 
@@ -107,8 +107,8 @@  discard block
 
 block discarded – undo
107 107
108 108 
 // check cache size every once in a while, purge if too big
109 109 
 //
110 
-function cache_check_diskspace(){
111 
-    if ((rand() % CACHE_SIZE_CHECK_FREQ)) return;
110 
+function cache_check_diskspace() {
111 
+    if ((rand()%CACHE_SIZE_CHECK_FREQ)) return;
112 112 
     if (disk_usage("../cache") < MAX_CACHE_USAGE) return;
113 113 
     $x = max(TEAM_PAGE_TTL, USER_PAGE_TTL, USER_HOST_TTL,
114 114 
         USER_PROFILE_TTL, TOP_PAGES_TTL, INDEX_PAGE_TTL
 
@@ -116,7 +116,7 @@  discard block
 
 block discarded – undo
116 116 
     clean_cache($x, "../cache");
117 117 
 }
118 118
119 
-function cache_need_to_regenerate($path, $max_age){
119 
+function cache_need_to_regenerate($path, $max_age) {
120 120 
     $regenerate = false;
121 121 
     $request = apache_request_headers();
122 122 
 
@@ -128,7 +128,7 @@  discard block
 
 block discarded – undo
128 128 
         // and touch the cached copy so other processes
129 129 
         // don't regenerate at the same time
130 130 
         //
131 
-        if ($lastmodified<time()-$max_age) {
131 
+        if ($lastmodified < time() - $max_age) {
132 132 
             $regenerate = true;
133 133 
             @touch($path);
134 134 
         }
 
@@ -139,7 +139,7 @@  discard block
 
 block discarded – undo
139 139 
 }
140 140
141 141 
 // Returns cached data or false if nothing was found
142 
-function get_cached_data($max_age, $params=""){
142 
+function get_cached_data($max_age, $params = "") {
143 143 
     global $no_cache;
144 144
145 145 
     if ($no_cache) return false;
 
@@ -155,7 +155,7 @@  discard block
 
 block discarded – undo
155 155 
             }
156 156 
         } else {
157 157 
             cache_check_diskspace();
158 
-            $regenerate=cache_need_to_regenerate($path, $max_age);
158 
+            $regenerate = cache_need_to_regenerate($path, $max_age);
159 159 
             if (!$regenerate) {
160 160 
                 return file_get_contents($path);
161 161 
             }
 
@@ -165,7 +165,7 @@  discard block
 
 block discarded – undo
165 165 
 }
166 166
167 167 
 // DEPRECATED
168 
-function start_cache($max_age, $params=""){
168 
+function start_cache($max_age, $params = "") {
169 169 
     global $no_cache, $caching, $memcache;
170 170
171 171 
     if ($no_cache) return;
 
@@ -188,15 +188,15 @@  discard block
 
 block discarded – undo
188 188 
             $regenerate = cache_need_to_regenerate($path, $max_age);
189 189 
         }
190 190 
         //Is the stored version too old, do we need to regenerate it?
191 
-        if ($regenerate){
191 
+        if ($regenerate) {
192 192 
             // If cached version is too old (or non-existent)
193 193 
             // generate the page and write to cache
194 194 
             //
195 195 
             ob_start();
196 196 
             ob_implicit_flush(0);
197 
-            Header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
198 
-            Header("Expires: " . gmdate("D, d M Y H:i:s",time()+$max_age) . " GMT");
199 
-            Header("Cache-Control: public, max-age=" . $max_age);
197 
+            Header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
198 
+            Header("Expires: ".gmdate("D, d M Y H:i:s", time() + $max_age)." GMT");
199 
+            Header("Cache-Control: public, max-age=".$max_age);
200 200
201 201 
             // allow the calling page to see cache period
202 202 
             //
 
@@ -208,9 +208,9 @@  discard block
 
 block discarded – undo
208 208 
             if (strstr($params, "format=xml")) {
209 209 
                 header('Content-type: text/xml');
210 210 
             }
211 
-            Header("Last-Modified: " . gmdate("D, d M Y H:i:s",$lastmodified) . " GMT");
212 
-            Header("Expires: " . gmdate("D, d M Y H:i:s",$lastmodified+$max_age) . " GMT");
213 
-            Header("Cache-Control: public, max-age=" . $max_age );
211 
+            Header("Last-Modified: ".gmdate("D, d M Y H:i:s", $lastmodified)." GMT");
212 
+            Header("Expires: ".gmdate("D, d M Y H:i:s", $lastmodified + $max_age)." GMT");
213 
+            Header("Cache-Control: public, max-age=".$max_age);
214 214 
             if ($cache && $cache->content) {
215 215 
                 echo $cache->content;
216 216 
                 exit;
 
@@ -228,7 +228,7 @@  discard block
 
 block discarded – undo
228 228
229 229 
 // write output buffer both to client and to cache
230 230 
 // DEPRECATED
231 
-function end_cache($max_age,$params=""){
231 
+function end_cache($max_age, $params = "") {
232 232 
     global $no_cache;
233 233 
     if ($no_cache) return;
234 234 
 
@@ -253,7 +253,7 @@  discard block
 
 block discarded – undo
253 253 
     }
254 254 
 }
255 255
256 
-function set_cached_data($max_age, $data, $params=""){
256 
+function set_cached_data($max_age, $data, $params = "") {
257 257 
     // for the benefit of hackers
258 258 
     if (strstr($params, "..")) {
259 259 
         return "bad params";
 
@@ -295,7 +295,7 @@  discard block
 
 block discarded – undo
295 295 
         }
296 296 
         $server_arr = array();
297 297 
         $servers = explode('|', MEMCACHE_SERVERS);
298 
-        foreach($servers as &$server) {
298 
+        foreach ($servers as &$server) {
299 299 
             list($ip, $port, $weight) = explode(':', $server);
300 300 
             if (!$port) { $port = 11211; }
301 301 
             $server_arr[] = array($ip, $port, $weight);
Please login to merge, or discard this patch.
Braces   +7 added lines, -7 removed lines patch added patch discarded remove patch 
@@ -107,7 +107,7 @@  discard block
 
 block discarded – undo
107 107
108 108 
 // check cache size every once in a while, purge if too big
109 109 
 //
110 
-function cache_check_diskspace(){
110 
+function cache_check_diskspace() {
111 111 
     if ((rand() % CACHE_SIZE_CHECK_FREQ)) return;
112 112 
     if (disk_usage("../cache") < MAX_CACHE_USAGE) return;
113 113 
     $x = max(TEAM_PAGE_TTL, USER_PAGE_TTL, USER_HOST_TTL,
 
@@ -116,7 +116,7 @@  discard block
 
 block discarded – undo
116 116 
     clean_cache($x, "../cache");
117 117 
 }
118 118
119 
-function cache_need_to_regenerate($path, $max_age){
119 
+function cache_need_to_regenerate($path, $max_age) {
120 120 
     $regenerate = false;
121 121 
     $request = apache_request_headers();
122 122 
 
@@ -139,7 +139,7 @@  discard block
 
 block discarded – undo
139 139 
 }
140 140
141 141 
 // Returns cached data or false if nothing was found
142 
-function get_cached_data($max_age, $params=""){
142 
+function get_cached_data($max_age, $params="") {
143 143 
     global $no_cache;
144 144
145 145 
     if ($no_cache) return false;
 
@@ -165,7 +165,7 @@  discard block
 
 block discarded – undo
165 165 
 }
166 166
167 167 
 // DEPRECATED
168 
-function start_cache($max_age, $params=""){
168 
+function start_cache($max_age, $params="") {
169 169 
     global $no_cache, $caching, $memcache;
170 170
171 171 
     if ($no_cache) return;
 
@@ -188,7 +188,7 @@  discard block
 
 block discarded – undo
188 188 
             $regenerate = cache_need_to_regenerate($path, $max_age);
189 189 
         }
190 190 
         //Is the stored version too old, do we need to regenerate it?
191 
-        if ($regenerate){
191 
+        if ($regenerate) {
192 192 
             // If cached version is too old (or non-existent)
193 193 
             // generate the page and write to cache
194 194 
             //
 
@@ -228,7 +228,7 @@  discard block
 
 block discarded – undo
228 228
229 229 
 // write output buffer both to client and to cache
230 230 
 // DEPRECATED
231 
-function end_cache($max_age,$params=""){
231 
+function end_cache($max_age,$params="") {
232 232 
     global $no_cache;
233 233 
     if ($no_cache) return;
234 234 
 
@@ -253,7 +253,7 @@  discard block
 
 block discarded – undo
253 253 
     }
254 254 
 }
255 255
256 
-function set_cached_data($max_age, $data, $params=""){
256 
+function set_cached_data($max_age, $data, $params="") {
257 257 
     // for the benefit of hackers
258 258 
     if (strstr($params, "..")) {
259 259 
         return "bad params";
Please login to merge, or discard this patch.