Images.php

[Pman.Core] / Images.php

diff --git a/Images.php b/Images.php
index c870c58..929119e 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];
             }
@@ -271,9 +271,9 @@ 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']) {
-//            return true;
-//        }
+        if (($this->authUser && !empty($this->authUser->company_id) && $this->authUser->company()->comptype=='OWNER') || $_SERVER['SERVER_ADDR'] == $_SERVER['REMOTE_ADDR']) {
+            return true;
+        }
         
         
         $ff = HTML_FlexyFramework::get();
@@ -338,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);
@@ -355,6 +356,7 @@ class Pman_Core_Images extends Pman
             if (empty($attr['src'])) {
                 continue;
             }
+            
             if (0 !== strpos($attr['src'], $baseURL)) {
                 // it starts with our 'new' baseURL?
                 $html = self::replaceImgUrl($html, $baseURL, $img, $attr,  'src' );