Keep some resource files (images) in separate directory

Aleksander Machniak

2012-07-30 cfc27c9b764985f707e8ca8d5ba663b6e4b01ecc

Keep some resource files (images) in separate directory

 plugins/enigma/lib/enigma_ui.php

@@ -129,7 +129,7 @@

        $this->rc->output->set_env('contentframe', $attrib['name']);
        $this->rc->output->set_env('blankpage', $attrib['src'] ? 
            $this->rc->output->abs_url($attrib['src']) : 'program/blank.gif');
            $this->rc->output->abs_url($attrib['src']) : 'program/resources/blank.gif');

        return html::tag('iframe', $attrib);
    }

 plugins/enigma/skins/default/templates/keys.html

@@ -6,7 +6,7 @@
<link rel="stylesheet" type="text/css" href="/this/enigma.css" />
<script type="text/javascript" src="/functions.js"></script>
<script type="text/javascript" src="/splitter.js"></script>
<style type="text/css">                                                                                                                      
<style type="text/css">
#enigmakeyslist { width: <roundcube:exp expression="!empty(cookie:enigmaviewsplitter) ? cookie:enigmaviewsplitter-5 : 210" />px; }
#enigmacontent-box { left: <roundcube:exp expression="!empty(cookie:enigmaviewsplitter) ? cookie:enigmaviewsplitter+5 : 220" />px;
<roundcube:exp expression="browser:ie ? ('width:expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:enigmaeviewsplitter) ? cookie:enigmaviewsplitter+5 : 220).')+\\'px\\');') : ''" />

 plugins/managesieve/managesieve.php

@@ -1026,7 +1026,7 @@

        $this->rc->output->set_env('contentframe', $attrib['name']);
        $this->rc->output->set_env('blankpage', $attrib['src'] ?
        $this->rc->output->abs_url($attrib['src']) : 'program/blank.gif');
        $this->rc->output->abs_url($attrib['src']) : 'program/resources/blank.gif');

        return html::tag('iframe', $attrib);
    }

 program/.htaccess

@@ -1,4 +1,4 @@
<IfModule mod_rewrite.c>
RewriteEngine On
RewriteRule !^js|.*\.[gt]if$ - [F]
RewriteRule !^js|resources$ - [F]
</IfModule>

 program/blank.gif

Binary files differ

 program/js/app.js

@@ -48,7 +48,7 @@
  this.env.request_timeout = 180;  // seconds
  this.env.draft_autosave = 0;     // seconds
  this.env.comm_path = './';
  this.env.blankpage = 'program/blank.gif';
  this.env.blankpage = 'program/resources/blank.gif';

  // set jQuery ajax options
  $.ajaxSetup({
@@ -6210,7 +6210,7 @@
    // have to do it this way for IE
    // otherwise the form will be posted to a new window
    if (document.all) {
      var html = '<iframe name="'+frame_name+'" src="program/blank.gif" style="width:0;height:0;visibility:hidden;"></iframe>';
      var html = '<iframe name="'+frame_name+'" src="program/resources/blank.gif" style="width:0;height:0;visibility:hidden;"></iframe>';
      document.body.insertAdjacentHTML('BeforeEnd', html);
    }
    else { // for standards-compilant browsers
@@ -6548,7 +6548,7 @@

    img.onload = function() { rcmail.env.browser_capabilities.tif = 1; };
    img.onerror = function() { rcmail.env.browser_capabilities.tif = 0; };
    img.src = 'program/blank.tif';
    img.src = 'program/resources/blank.tif';
  };

  this.pdf_support_check = function()

 program/resources/blank.gif

 program/resources/blank.tif

Binary files differ

 program/resources/blocked.gif

 program/steps/addressbook/func.inc

@@ -368,7 +368,7 @@
    $attrib['name'] = $attrib['id'];

    $OUTPUT->set_env('contentframe', $attrib['name']);
    $OUTPUT->set_env('blankpage', $attrib['src'] ? $OUTPUT->abs_url($attrib['src']) : 'program/blank.gif');
    $OUTPUT->set_env('blankpage', $attrib['src'] ? $OUTPUT->abs_url($attrib['src']) : 'program/resources/blank.gif');

    return html::iframe($attrib);
}
@@ -705,7 +705,7 @@
    if ($result = $CONTACTS->get_result())
        $record = $result->first();

    $photo_img = $attrib['placeholder'] ? $CONFIG['skin_path'] . $attrib['placeholder'] : 'program/blank.gif';
    $photo_img = $attrib['placeholder'] ? $CONFIG['skin_path'] . $attrib['placeholder'] : 'program/resources/blank.gif';
    $RCMAIL->output->set_env('photo_placeholder', $photo_img);
    unset($attrib['placeholder']);


 program/steps/addressbook/show.inc

@@ -85,7 +85,7 @@
        $RCMAIL->output->future_expire_header(86400);

    header('Content-Type: ' . rc_image_content_type($data));
    echo $data ? $data : file_get_contents('program/blank.gif');
    echo $data ? $data : file_get_contents('program/resources/blank.gif');
    exit;
}


 program/steps/mail/compose.inc

@@ -663,10 +663,10 @@
  unset($plugin);

  // add blocked.gif attachment (#1486516)
  if ($isHtml && preg_match('#<img src="\./program/blocked\.gif"#', $body)) {
    if ($attachment = rcmail_save_image('program/blocked.gif', 'image/gif')) {
  if ($isHtml && preg_match('#<img src="\./program/resources/blocked\.gif"#', $body)) {
    if ($attachment = rcmail_save_image('program/resources/blocked.gif', 'image/gif')) {
      $COMPOSE['attachments'][$attachment['id']] = $attachment;
      $body = preg_replace('#\./program/blocked\.gif#',
      $body = preg_replace('#\./program/resources/blocked\.gif#',
        $RCMAIL->comm_path.'&_action=display-attachment&_file=rcmfile'.$attachment['id'].'&_id='.$COMPOSE['id'],
        $body);
    }
@@ -860,7 +860,7 @@
    $OUTPUT->set_env('spellcheck_langs', join(',', $editor_lang_set));
  }

  $out .= "\n".'<iframe name="savetarget" src="program/blank.gif" style="width:0;height:0;border:none;visibility:hidden;"></iframe>';
  $out .= "\n".'<iframe name="savetarget" src="program/resources/blank.gif" style="width:0;height:0;border:none;visibility:hidden;"></iframe>';

  return $out;
}

 program/steps/mail/func.inc

@@ -398,7 +398,7 @@

  if ($RCMAIL->config->get('preview_pane'))
    $OUTPUT->set_env('contentframe', $attrib['id']);
  $OUTPUT->set_env('blankpage', $attrib['src'] ? $OUTPUT->abs_url($attrib['src']) : 'program/blank.gif');
  $OUTPUT->set_env('blankpage', $attrib['src'] ? $OUTPUT->abs_url($attrib['src']) : 'program/resources/blank.gif');

  return html::iframe($attrib);
}
@@ -610,7 +610,7 @@
  $wash_opts = array(
    'show_washed' => false,
    'allow_remote' => $p['safe'],
    'blocked_src' => "./program/blocked.gif",
    'blocked_src' => "./program/resources/blocked.gif",
    'charset' => RCMAIL_CHARSET,
    'cid_map' => $cid_replaces,
    'html_elements' => array('body'),

 program/steps/mail/show.inc

@@ -274,7 +274,7 @@
  if ($MESSAGE->sender)
    $photo_img = $RCMAIL->url(array('_task' => 'addressbook', '_action' => 'photo', '_email' => $MESSAGE->sender['mailto'], '_alt' => $placeholder));
  else
    $photo_img = $placeholder ? $placeholder : 'program/blank.gif';
    $photo_img = $placeholder ? $placeholder : 'program/resources/blank.gif';

  return html::img(array('src' => $photo_img) + $attrib);
}

 program/steps/settings/folders.inc

@@ -363,7 +363,7 @@
    $attrib['name'] = $attrib['id'];

    $OUTPUT->set_env('contentframe', $attrib['name']);
    $OUTPUT->set_env('blankpage', $attrib['src'] ? $OUTPUT->abs_url($attrib['src']) : 'program/blank.gif');
    $OUTPUT->set_env('blankpage', $attrib['src'] ? $OUTPUT->abs_url($attrib['src']) : 'program/resources/blank.gif');

    return html::iframe($attrib);
}

 program/steps/settings/func.inc

@@ -34,7 +34,7 @@
  $attrib['name'] = $attrib['id'];

  $OUTPUT->set_env('contentframe', $attrib['name']);
  $OUTPUT->set_env('blankpage', $attrib['src'] ? $OUTPUT->abs_url($attrib['src']) : 'program/blank.gif');
  $OUTPUT->set_env('blankpage', $attrib['src'] ? $OUTPUT->abs_url($attrib['src']) : 'program/resources/blank.gif');

  return html::iframe($attrib);
}

 skins/default/pngbehavior.htc

@@ -24,7 +24,7 @@

var supported = /MSIE ((5\.5)|6)/.test(navigator.userAgent) && navigator.platform == "Win32",
  realSrc,
  blankSrc = "skins/default/images/blank.gif",
  blankSrc = "program/resources/blank.gif",
  isPrinting = false;

if (supported) fixImage();

 tests/mailfunc.php

@@ -48,7 +48,7 @@
    $html = rcmail_html4inline(rcmail_print_body($part, array('safe' => false)), 'foo');

    $this->assertPattern('/src="'.$part->replaces['ex1.jpg'].'"/', $html, "Replace reference to inline image");
    $this->assertPattern('#background="./program/blocked.gif"#', $html, "Replace external background image");
    $this->assertPattern('#background="./program/resources/blocked.gif"#', $html, "Replace external background image");
    $this->assertNoPattern('/ex3.jpg/', $html, "No references to external images");
    $this->assertNoPattern('/<meta [^>]+>/', $html, "No meta tags allowed");
    //$this->assertNoPattern('/<style [^>]+>/', $html, "No style tags allowed");