Changeset 12958

Timestamp:

Jan 26, 2012, 10:15:16 PM (12 years ago)

Author:

rvelices

Message:

feature 2548 multisize - small fixes

Location:

trunk

Files:

• i.php (modified) (2 diffs)
• picture.php (modified) (2 diffs)
• themes/default/template/picture_content.tpl (modified) (1 diff)
• themes/default/template/thumbnails.tpl (modified) (1 diff)

trunk/i.php

@@ -74 +74 @@
       return;
   }
-  fwrite($ilogfh, date("c") );
+  $line = date("c");
   foreach( func_get_args() as $arg)
   {
-    fwrite($ilogfh, ' ' );
+    $line .= ' ';
     if (is_array($arg))
     {
-      fwrite($ilogfh, implode(' ', $arg) );
+      $line .= implode(' ', $arg);
     }
     else
     {
-      fwrite($ilogfh, $arg);
-    }
-  }
-  fwrite($ilogfh, "\n");
+      $line .= $arg;
+    }
+  }
+  fwrite($ilogfh, $line."\n");
 }
 
@@ -397 +397 @@
 }
 
+if ($d_size[0]*$d_size[1] < 100000)
+{// strip metadata for small images
+  $image->strip();
+}
 $image->set_compression_quality( $params->quality );
 $image->write( $page['derivative_path'] );

trunk/picture.php

@@ -157 +157 @@
   if (isset($_COOKIE['picture_deriv']))
   {
-    pwg_set_session_var('picture_deriv', $_COOKIE['picture_deriv']);
-    setcookie('picture_deriv', false, 0);
+    if ( array_key_exists($_COOKIE['picture_deriv'], ImageStdParams::get_defined_type_map()) )
+    {
+      pwg_set_session_var('picture_deriv', $_COOKIE['picture_deriv']);
+    }
+    setcookie('picture_deriv', false, 0, cookie_path() );
   }
   $deriv_type = pwg_get_session_var('picture_deriv', IMG_LARGE);
@@ -195 +198 @@
   $template->assign( array(
       'ALT_IMG' => $element_info['file'],
+      'COOKIE_PATH' => cookie_path(),
       )
     );

trunk/themes/default/template/picture_content.tpl

@@ -16 +16 @@
                 theImg.useMap = "#map"+typeMap;
         }
-        document.cookie = 'picture_deriv=' + typeSave;
+        document.cookie = 'picture_deriv='+typeSave+';path={/literal}{$COOKIE_PATH}{literal}';
 }
 

trunk/themes/default/template/thumbnails.tpl

@@ -6 +6 @@
 .thumbnails .wrap2 A,
 .thumbnails LABEL{ldelim}
-        width: {$derivative_params->max_width()}px;
+        width: {$derivative_params->max_width()+2}px;
 }
 
 .thumbnails .wrap2{ldelim}
-        height: {$derivative_params->max_height()+2}px;
+        height: {$derivative_params->max_height()+3}px;
 }
 {if $derivative_params->max_width() > 600}