Images.php

[Pman.Core] / Images.php

diff --git a/Images.php b/Images.php
index 341b7ab..0b2daec 100644 (file)
--- a/Images.php
+++ b/Images.php
@@ -107,7 +107,7 @@ class Pman_Core_Images extends Pman
             if (empty($_REQUEST['anytype'])) {
                 $img->whereAdd("mimetype like 'image/%'");
             }
-            
+            $img->orderBy('title ASC'); /// spurious ordering... (curretnly used by shipping project)
             if (isset($onbits[2])) {
                 $img->imgtype = $onbits[2];
             }
@@ -160,8 +160,6 @@ class Pman_Core_Images extends Pman
                 urlencode("access to this image/file has been denied."));
         }
         
-        print_R($img);exit;
-        
         $this->serve($img);
         exit;
     }
@@ -273,7 +271,7 @@ class Pman_Core_Images extends Pman
     }
     function validateSize()
     {
-        if (($this->authUser && $this->authUser->company_id && $this->authUser->company()->comptype=='OWNER') || $_SERVER['SERVER_ADDR'] == $_SERVER['REMOTE_ADDR']) {
+        if (($this->authUser && !empty($this->authUser->company_id) && $this->authUser->company()->comptype=='OWNER') || $_SERVER['SERVER_ADDR'] == $_SERVER['REMOTE_ADDR']) {
             return true;
         }
         
@@ -340,8 +338,9 @@ class Pman_Core_Images extends Pman
         $baseURL = $ff->Pman_Images['public_baseURL'];
         
         preg_match_all('/<img\s+[^>]+>/i',$html, $result); 
-        //print_r($result);
+        
         $matches = array_unique($result[0]);
+        
         foreach($matches as $img) {
             $imatch = array();
             preg_match_all('/(width|height|src)="([^"]*)"/i',$img, $imatch);
@@ -357,6 +356,9 @@ class Pman_Core_Images extends Pman
             if (empty($attr['src'])) {
                 continue;
             }
+            print_r($attr['src']);
+            print_r($baseURL);
+            print_f(strpos($attr['src'], $baseURL));exit;
             if (0 !== strpos($attr['src'], $baseURL)) {
                 // it starts with our 'new' baseURL?
                 $html = self::replaceImgUrl($html, $baseURL, $img, $attr,  'src' );