Merge lp:~mongolito404/ubuntu-drupal-theme/688289_download_tradmaked_css into lp:ubuntu-drupal-theme

[Pierre Buyle]

[Michael Lustfield (michaellustfield)]

This looks to be a solid solution to the bug. Could you please commit this to the main branch for D6 and D7?

review: Approve

=== modified file 'template.php'
--- template.php	2010-12-05 09:58:12 +0000
+++ template.php	2011-01-13 21:30:02 +0000
@@ -31,7 +31,7 @@
   );
 
   $settings = array();
-  $settings = variable_get($theme_key, NULL);
+  $settings = variable_get($theme_key, array());
 
   if (module_exists('node')) {
     foreach (node_get_types() as $type => $name) {
@@ -86,7 +86,6 @@
  * Generate / override exsisting variables
  */
 function udtheme_preprocess_page(&$vars) {
-  $pallette = udtheme_pallette();
 
   $vars['menu']         = udtheme_whichmenu($vars['primary_links']);
   $vars['logo']         = udtheme_buildlogo($vars);
@@ -94,9 +93,12 @@
   $vars['help_text']    = udtheme_help($vars['help']);
   $vars['min_width']    = variable_get('page_minwidth', '1000px');
   $vars['pg_width']     = pagewidth();
-  $vars['trademark']    = udtheme_trademark();
-
-  if ($pallette && !$vars['trademark']) {
+  
+  if ($trademark = udtheme_trademark()) {
+    $vars['css']        = drupal_add_css($trademark);
+    $vars['styles']     = drupal_get_css();
+  }
+  elseif ($pallette = udtheme_pallette()) {
     $vars['css']        = drupal_add_css($pallette);
     $vars['styles']     = drupal_get_css();
   }
@@ -197,20 +199,41 @@
 }
 
 /**
- * Add CSS for trademarked sites.
- * In Drupal 7.x this wil be moved into udtheme_pallette but can't be done at this point.
+ * Add CSS for trademarked sites. Trademarked CSS files are download into the
+ * temporary CSS directory.
  */
 function udtheme_trademark() {
-  global $language;
-
   if (variable_get('udtheme_trademark', FALSE)) {
-    $css = '<link rel="stylesheet" type="text/css" href="http://edge.launchpad.net/ubuntu-drupal-theme/trademark/6.7.0/+download/trademark.css" />' . PHP_EOL;
-    if ($language->direction == LANGUAGE_RTL) {
-      $css = '<link rel="stylesheet" type="text/css" href="http://edge.launchpad.net/ubuntu-drupal-theme/trademark/6.7.0/+download/trademark-rtl.css" />' . PHP_EOL;
+    $csspath = file_create_path('css');
+    foreach (array('trademark-rtl.css', 'trademark.css') as $filename) {
+      $filepath = $csspath .'/'. $filename;
+      $download = !file_exists($filepath);
+      if (!$download) {
+        $stats = stat($filepath);
+        $download = $stats['ctime'] < (time() - 86400);
+      }
+      if ($download) {
+        $url = 'http://launchpad.net/ubuntu-drupal-theme/trademark/6.7.0/+download/'. $filename;
+        $response = drupal_http_request($url);
+        if ($response->code == 303) {
+          //Handle 303 because drupal_http_request doesn't
+          $response = drupal_http_request($response->headers['Location']);
+        }
+        if (isset($response->data)) {
+          file_save_data($response->data, $filepath, FILE_EXISTS_REPLACE);
+        }
+        else {
+          watchdog('udtheme', 'Unabled to download <a href="@url">@filename</a>: @code @status_message', array(
+            '@url' => $url,
+            '@filename' => $filename,
+            '@code' => $response->code,
+            '@status_message' => $response->status_message
+          ), WATCHDOG_ERROR, $url);
+        }
+      }
     }
+    return $filepath;
   }
-
-  return $css;
 }