- client: make "wrong URL" message not be a notice

- web: fix caching problem when PHP not installed as Apache module

svn path=/trunk/boinc/; revision=22968

checkin_notes

@@ -411,3 +411,12 @@ Charlie 31 Jan 2011
         GR-ReadMe.rtf
         PTP-ReadMe.rtf
         ReadMe.rtf
+
+David  1 Feb 2011
+    - client: make "wrong URL" message not be a notice
+    - web: fix caching problem when PHP not installed as Apache module
+
+    html/inc/
+        cache.inc
+    client/
+        cs_scheduler.cpp

client/cs_scheduler.cpp

@@ -525,7 +525,7 @@ int CLIENT_STATE::handle_scheduler_reply(PROJECT* project, char* scheduler_url)
                     sr.master_url
                 );
             } else {
-                msg_printf(project, MSG_USER_ALERT,
+                msg_printf(project, MSG_INFO,
                     _("You used the wrong URL for this project.  When convenient, remove this project, then add %s"),
                     sr.master_url
                 );

html/inc/cache.inc

@@ -159,6 +159,10 @@ function cache_need_to_regenerate($path, $max_age){
 
 // Returns cached data or false if nothing was found
 function get_cached_data($max_age, $params=""){
+    global $no_cache;
+
+    if ($no_cache) return;
+
     $path = get_path($params);
     cache_check_diskspace();
     if ($max_age) {