/[drupal]/contributions/modules/image/image.module
ViewVC logotype

Diff of /contributions/modules/image/image.module

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.294, Sun Feb 1 01:35:17 2009 UTC revision 1.295, Sun Feb 1 03:10:33 2009 UTC
# Line 1  Line 1 
1  <?php  <?php
2  // $Id: image.module,v 1.293 2009/01/19 10:43:30 sun Exp $  // $Id: image.module,v 1.294 2009/02/01 01:35:17 sun Exp $
3    
4  define('IMAGE_ORIGINAL', '_original');  define('IMAGE_ORIGINAL', '_original');
5  define('IMAGE_PREVIEW', 'preview');  define('IMAGE_PREVIEW', 'preview');
# Line 477  function image_load(&$node) { Line 477  function image_load(&$node) {
477      }      }
478      else {      else {
479        // Need to remove an extra derivative image in the database.        // Need to remove an extra derivative image in the database.
480        if (image_access('update', $node)) {        if (image_access('update', $node, $GLOBALS['user'])) {
481          drupal_set_message(t("%title's has an unneeded %key derivative images. The derivatives will be rebuilt to remove it.", array('%title' => $node->title, '%key' => $key)));          drupal_set_message(t("%title's has an unneeded %key derivative images. The derivatives will be rebuilt to remove it.", array('%title' => $node->title, '%key' => $key)));
482        }        }
483        $node->rebuild_images = TRUE;        $node->rebuild_images = TRUE;
# Line 489  function image_load(&$node) { Line 489  function image_load(&$node) {
489      // If the file is missing or created after the last change to the sizes,      // If the file is missing or created after the last change to the sizes,
490      // rebuild the derivatives.      // rebuild the derivatives.
491      if (empty($node->images[$key]) || !file_exists($node->images[$key])) {      if (empty($node->images[$key]) || !file_exists($node->images[$key])) {
492        if (image_access('update', $node)) {        if (image_access('update', $node, $GLOBALS['user'])) {
493          drupal_set_message(t("%title's %key derivative image %filepath was missing. The derivatives will be rebuilt to regenerate it.", array('%title' => $node->title, '%key' => $key, '%filepath' => isset($node->images[$key]) ? $node->images[$key] : '')));          drupal_set_message(t("%title's %key derivative image %filepath was missing. The derivatives will be rebuilt to regenerate it.", array('%title' => $node->title, '%key' => $key, '%filepath' => isset($node->images[$key]) ? $node->images[$key] : '')));
494        }        }
495        $node->rebuild_images = TRUE;        $node->rebuild_images = TRUE;
496      }      }
497      else if (filemtime($node->images[$key]) < variable_get('image_updated', 0)) {      else if (filemtime($node->images[$key]) < variable_get('image_updated', 0)) {
498        if (image_access('update', $node)) {        if (image_access('update', $node, $GLOBALS['user'])) {
499          drupal_set_message(t("%title's %key derivative image had a timestamp (%filetime) that predates the last changes to the image size settings (%vartime). The derivatives will be rebuilt to regenerate it.", array('%title' => $node->title, '%key' => $key, '%filetime' => format_date(filemtime($node->images[$key])), '%vartime' => format_date(variable_get('image_updated', 0)))));          drupal_set_message(t("%title's %key derivative image had a timestamp (%filetime) that predates the last changes to the image size settings (%vartime). The derivatives will be rebuilt to regenerate it.", array('%title' => $node->title, '%key' => $key, '%filetime' => format_date(filemtime($node->images[$key])), '%vartime' => format_date(variable_get('image_updated', 0)))));
500        }        }
501        $node->rebuild_images = TRUE;        $node->rebuild_images = TRUE;
# Line 581  function image_update(&$node) { Line 581  function image_update(&$node) {
581    
582        // Display a message to the user if they're be able to modify the node        // Display a message to the user if they're be able to modify the node
583        // (this might have been called as part of a rebuild by a visitor).        // (this might have been called as part of a rebuild by a visitor).
584        if (image_access('update', $node)) {        if (image_access('update', $node, $GLOBALS['user'])) {
585          drupal_set_message(t('The derivative images for <a href="@link">@title</a> have been regenerated.', array('@link' => url('node/'. $node->nid), '@title' => $node->title)));          drupal_set_message(t('The derivative images for <a href="@link">@title</a> have been regenerated.', array('@link' => url('node/'. $node->nid), '@title' => $node->title)));
586        }        }
587    
Legend:
Removed from v.1.294  
changed lines
  Added in v.1.295
  ViewVC Help
Powered by ViewVC 1.1.2