Changeset cfc27c9 in github

Timestamp:

Jul 30, 2012 4:00:35 AM (10 months ago)

Author:

Aleksander Machniak <alec@…>

Children:

6d12536

Parents:

71ee565

Message:

Keep some resource files (images) in separate directory

Files:

• plugins/enigma/lib/enigma_ui.php (modified) (1 diff)
• plugins/enigma/skins/default/templates/keys.html (modified) (1 diff)
• plugins/managesieve/managesieve.php (modified) (1 diff)
• program/.htaccess (modified) (1 diff)
• program/blank.gif (deleted)
• program/js/app.js (modified) (3 diffs)
• program/resources/blank.gif (moved) (moved from skins/default/images/blank.gif)
• program/resources/blank.tif (moved) (moved from program/blank.tif)
• program/resources/blocked.gif (moved) (moved from program/blocked.gif)
• program/steps/addressbook/func.inc (modified) (2 diffs)
• program/steps/addressbook/show.inc (modified) (1 diff)
• program/steps/mail/compose.inc (modified) (2 diffs)
• program/steps/mail/func.inc (modified) (2 diffs)
• program/steps/mail/show.inc (modified) (1 diff)
• program/steps/settings/folders.inc (modified) (1 diff)
• program/steps/settings/func.inc (modified) (1 diff)
• skins/default/pngbehavior.htc (modified) (1 diff)
• tests/mailfunc.php (modified) (1 diff)

plugins/enigma/lib/enigma_ui.php

@@ -130 +130 @@
         $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

@@ -7 +7 @@
 <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;

plugins/managesieve/managesieve.php

@@ -1027 +1027 @@
         $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 +1 @@
 <IfModule mod_rewrite.c>
 RewriteEngine On
-RewriteRule !^js|.*\.[gt]if$ - [F]
+RewriteRule !^js|resources$ - [F]
 </IfModule>

program/js/app.js

@@ -49 +49 @@
   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
@@ -6211 +6211 @@
     // 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);
     }
@@ -6549 +6549 @@
     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';
   };
 

program/steps/addressbook/func.inc

@@ -369 +369 @@
 
     $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);
@@ -706 +706 @@
         $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

@@ -86 +86 @@
 
     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

@@ -664 +664 @@
 
   // 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);
@@ -861 +861 @@
   }
 
-  $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

@@ -399 +399 @@
   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);
@@ -611 +611 @@
     '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,

program/steps/mail/show.inc

@@ -275 +275 @@
     $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

@@ -364 +364 @@
 
     $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

@@ -35 +35 @@
 
   $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

@@ -25 +25 @@
 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;
 

tests/mailfunc.php

@@ -49 +49 @@
 
     $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");