X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=Images.php;h=bfda2826ca553b7843eda775815488e85a9443ac;hp=3a4b741bcf2b1e07a4d9d1488063b038217c19af;hb=refs%2Fheads%2Fwip_alan_T6343_generic_progress_bar_delete;hpb=81b82c12f33746b22863df989c119918a371013e

diff --git a/Images.php b/Images.php
index 3a4b741b..bfda2826 100644
--- a/Images.php
+++ b/Images.php
@@ -42,9 +42,9 @@ class Pman_Core_Images extends Pman
 {
     
     // tables that do not need authentication checks before serving.
-    var $public_image_tables = array();
-    
-    var $is_email = false;
+    var $public_image_tables = array(
+        'crm_mailing_list_message'   // we know these are ok...
+    );
     
     var  $sizes = array(
                 '100', 
@@ -77,6 +77,7 @@ class Pman_Core_Images extends Pman
     var $as_mimetype = false;
     var $method = 'inline';
     var $page = false;
+    var $is_local = false;
     
     function get($s, $opts=array()) // determin what to serve!!!!
     {
@@ -85,9 +86,7 @@ class Pman_Core_Images extends Pman
         //   return $this->post();
         //}
         
-        if(!empty($_REQUEST['is_email'])) {
-            $this->is_email = true;
-        }
+        $this->is_local = (!empty($_SERVER['HTTP_HOST']) && $_SERVER['HTTP_HOST'] == 'localhost') ? true : false;
         
         $this->as_mimetype = empty($_REQUEST['as']) ? '' : $_REQUEST['as'];
         
@@ -188,11 +187,11 @@ class Pman_Core_Images extends Pman
             $this->imgErr("image has been removed or deleted.",$s);
         }
         
+        if($this->is_local) {
+            return $this->serve($img);
+        }
+        
         if (!$this->authUser && !in_array($img->ontable,$this->public_image_tables)) {
-           
-            if($this->is_email) {
-                return $this->serve($img);
-            }
             
             if ($img->ontable != 'core_company') {
                 $this->imgErr("not-authenticated {$img->ontable}",$s);
@@ -230,6 +229,9 @@ class Pman_Core_Images extends Pman
     
     function post($v)
     {
+        if (!empty($_REQUEST['_get'])) {
+            return $this->get($v);
+        }
         
         if (!$this->authUser) {
             $this->jerr("image conversion only allowed by registered users");
@@ -337,6 +339,10 @@ class Pman_Core_Images extends Pman
     }
     function validateSize()
     {
+        if($this->is_local) {
+            return true;
+        }
+        
         if (($this->authUser && !empty($this->authUser->company_id) && $this->authUser->company()->comptype=='OWNER')
             || $_SERVER['SERVER_ADDR'] == $_SERVER['REMOTE_ADDR']) {
             return true;