Images.php

[Pman.Core] / Images.php

diff --git a/Images.php b/Images.php
index eab4b3a..52611e0 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];
             }
@@ -171,7 +171,7 @@ class Pman_Core_Images extends Pman
     
     function post()
     {
-        
+        print_r('run???');exit;
         if (!$this->authUser) {
             $this->jerr("image conversion only allowed by registered users");
         }
@@ -224,7 +224,6 @@ class Pman_Core_Images extends Pman
         $this->sessionState(0); // turn off session... - locking...
         
         require_once 'File/Convert.php';
-        print_R($img->getStoreName());exit;
         if (!file_exists($img->getStoreName())) {
 //            print_r($img);exit;
             header('Location: ' . $this->rootURL . '/Pman/templates/images/file-broken.png?reason=' .
@@ -272,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;
         }
         
@@ -361,7 +360,7 @@ class Pman_Core_Images extends Pman
                 $html = self::replaceImgUrl($html, $baseURL, $img, $attr,  'src' );
                 continue;
             }
-            if (false !== strpos($attr['src'], '//')) {
+            if (false !== strpos($attr['src'], '//') && false === strpos($attr['src'], $baseURL)) {
                 // contains an absolute path.. that is probably not us...
                 continue;
             }
@@ -369,8 +368,6 @@ class Pman_Core_Images extends Pman
             
             $html = self::replaceImgUrl($html, $baseURL, $img, $attr,  'src' );
             
-            
-            
         }